openstack/neutron
Code Issues Proposed changes

Enable no-else-return pylint check

Browse Source 
Change-Id: I338863b5f14f5ea5b4d478cbb5db8625a5675aac
This commit is contained in:
Ihar Hrachyshka 2024-11-06 02:18:26 -05:00
parent 5e63b512ea
commit 6183792316
135 changed files with 655 additions and 877 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.pylintrc
View File

@ -64,7 +64,6 @@ disable=
# "R" Refactor recommendations
duplicate-code,
inconsistent-return-statements,
no-else-return,
no-self-use,
redefined-argument-from-local,
too-few-public-methods,

12
neutron/agent/common/ovs_lib.py
View File

@ -816,9 +816,8 @@ class OVSBridge(BaseOVS):
address = ip_lib.IPDevice(self.br_name).link.address
if address:
return address
else:
msg = _('Unable to determine mac address for %s') % self.br_name
raise Exception(msg)
msg = _('Unable to determine mac address for %s') % self.br_name
raise Exception(msg)
def set_controllers_inactivity_probe(self, interval):
"""Set bridge controllers inactivity probe interval.
@ -1264,7 +1263,7 @@ class OVSBridge(BaseOVS):
if_exists=True) or []
if port_type is None:
return ports
elif not isinstance(port_type, list):
if not isinstance(port_type, list):
port_type = [port_type]
return [port['name'] for port in ports if port['type'] in port_type]
@ -1438,9 +1437,8 @@ def generate_random_cookie():
def check_cookie_mask(cookie):
cookie = str(cookie)
if '/' not in cookie:
return cookie + '/-1'
else:
return cookie
cookie += '/-1'
return cookie
def is_a_flow_line(line):

7
neutron/agent/common/placement_report.py
View File

@ -212,14 +212,13 @@ class PlacementState:
# That means the RP for tunnelled networks is not associated
# to a physical bridge interface.
return [n_const.TRAIT_NETWORK_TUNNEL]
elif device == self._rp_tun_name and device in physical_bridges:
if device == self._rp_tun_name and device in physical_bridges:
# The physical network and the tunnelled networks share the
# same physical interface.
return [n_const.TRAIT_NETWORK_TUNNEL,
physnet_trait_mappings[device]]
else:
# Just the physical interface.
return [physnet_trait_mappings.get(device)]
# Just the physical interface.
return [physnet_trait_mappings.get(device)]
rp_traits = []
physical_bridges = {br for brs in self._device_mappings.values() for

13
neutron/agent/dhcp/agent.py
View File

@ -223,10 +223,8 @@ class DhcpAgent(manager.Manager):
action, network, segment=sid_segment.get(seg_id),
**action_kwargs))
return all(ret)
else:
# In case subnets are not attached to segments. default behavior.
return self._call_driver(
action, network, **action_kwargs)
# In case subnets are not attached to segments. default behavior.
return self._call_driver(action, network, **action_kwargs)
def _call_driver(self, action, network, segment=None, **action_kwargs):
"""Invoke an action on a DHCP driver instance."""
@ -248,11 +246,12 @@ class DhcpAgent(manager.Manager):
self.dhcp_version,
self.plugin_rpc,
segment)
# NOTE(ihrachys) It's important that we always call the action
# before deciding what to return!
rv = getattr(driver, action)(**action_kwargs)
if action == 'get_metadata_bind_interface':
return rv
else:
return True
return True
except exceptions.Conflict:
# No need to resync here, the agent will receive the event related
# to a status update for the network
@ -635,7 +634,7 @@ class DhcpAgent(manager.Manager):
self.schedule_resync("Agent port was modified",
port.network_id)
return
elif old_ips != new_ips:
if old_ips != new_ips:
LOG.debug("Agent IPs on network %s changed from %s to %s",
network.id, old_ips, new_ips)
driver_action = 'restart'

4
neutron/agent/l2/extensions/dhcp/ipv6.py
View File

@ -110,7 +110,7 @@ class DHCPIPv6Responder(dhcp_base.DHCPResponderBase):
# Get request Valid Lifetime for IA_NA.
# Get request IAID for IA_NA.
return opt.data[start:end]
elif iaid:
if iaid:
# default IAID
return struct.pack('!I', 1)
# default time or interval
@ -243,7 +243,7 @@ class DHCPIPv6Responder(dhcp_base.DHCPResponderBase):
def get_ret_type(self, req_type):
if req_type == 'SOLICIT':
return dhcp6.DHCPV6_ADVERTISE
elif req_type in REQ_TYPES_FOR_REPLY:
if req_type in REQ_TYPES_FOR_REPLY:
return dhcp6.DHCPV6_REPLY
return REQ_TYPE_UNKNOWN

7
neutron/agent/l3/agent.py
View File

@ -794,15 +794,14 @@ class L3NATAgent(ha.AgentMixin,
routers = [r for r in routers if r['id'] == update.id]
if not routers:
removed = self._safe_router_removed(update.id)
if not removed:
self._resync_router(update)
else:
if self._safe_router_removed(update.id):
# need to update timestamp of removed router in case
# there are older events for the same router in the
# processing queue (like events from fullsync) in order to
# prevent deleted router re-creation
rp.fetched_and_processed(update.timestamp)
else:
self._resync_router(update)
LOG.info("Finished a router delete for %s, update_id %s. "
"Time elapsed: %.3f",
update.id, update.update_id,

18
neutron/agent/l3/dvr_edge_ha_router.py
View File

@ -31,8 +31,7 @@ class DvrEdgeHaRouter(dvr_edge_router.DvrEdgeRouter,
"""
def __init__(self, host, *args, **kwargs):
super().__init__(host,
*args, **kwargs)
super().__init__(host, *args, **kwargs)
self.enable_snat = None
@property
@ -85,16 +84,13 @@ class DvrEdgeHaRouter(dvr_edge_router.DvrEdgeRouter,
self.set_ha_port()
if (self.is_router_primary() and self.ha_port and
self.ha_port['status'] == constants.PORT_STATUS_ACTIVE):
return super().add_centralized_floatingip(
fip, fip_cidr)
else:
return constants.FLOATINGIP_STATUS_ACTIVE
return super().add_centralized_floatingip(fip, fip_cidr)
return constants.FLOATINGIP_STATUS_ACTIVE
def remove_centralized_floatingip(self, fip_cidr):
self._remove_vip(fip_cidr)
if self.is_router_primary():
super().remove_centralized_floatingip(
fip_cidr)
super().remove_centralized_floatingip(fip_cidr)
def get_centralized_fip_cidr_set(self):
ex_gw_port = self.get_ex_gw_port()
@ -105,8 +101,7 @@ class DvrEdgeHaRouter(dvr_edge_router.DvrEdgeRouter,
return set(self._get_cidrs_from_keepalived(interface_name))
def external_gateway_added(self, ex_gw_port, interface_name):
super().external_gateway_added(
ex_gw_port, interface_name)
super().external_gateway_added(ex_gw_port, interface_name)
for port in self.get_snat_interfaces():
snat_interface_name = self._get_snat_int_device_name(port['id'])
self._disable_ipv6_addressing_on_interface(snat_interface_name)
@ -124,8 +119,7 @@ class DvrEdgeHaRouter(dvr_edge_router.DvrEdgeRouter,
namespace=self.ha_namespace,
prefix=constants.SNAT_INT_DEV_PREFIX)
self._clear_vips(snat_interface)
super()._external_gateway_removed(
ex_gw_port, interface_name)
super()._external_gateway_removed(ex_gw_port, interface_name)
self._clear_vips(interface_name)
def external_gateway_updated(self, ex_gw_port, interface_name):

14
neutron/agent/l3/dvr_edge_router.py
View File

@ -81,12 +81,9 @@ class DvrEdgeRouter(dvr_local_router.DvrLocalRouter):
# SNAT might be rescheduled to this agent; need to process like
# newly created gateway
return self.external_gateway_added(ex_gw_port, interface_name)
else:
preserve_ips = self._list_centralized_floating_ip_cidrs()
self._external_gateway_added(ex_gw_port,
interface_name,
self.snat_namespace.name,
preserve_ips)
preserve_ips = self._list_centralized_floating_ip_cidrs()
self._external_gateway_added(
ex_gw_port, interface_name, self.snat_namespace.name, preserve_ips)
def _external_gateway_removed(self, ex_gw_port, interface_name):
super().external_gateway_removed(ex_gw_port,
@ -250,9 +247,8 @@ class DvrEdgeRouter(dvr_local_router.DvrLocalRouter):
# namespace and Router Namespace, to reduce the complexity.
if self.snat_namespace.exists():
return True
else:
LOG.error("The SNAT namespace %s does not exist for "
"the router.", self.snat_namespace.name)
LOG.error("The SNAT namespace %s does not exist for the router.",
self.snat_namespace.name)
return False
def update_routing_table(self, operation, route):

20
neutron/agent/l3/dvr_local_router.py
View File

@ -326,15 +326,14 @@ class DvrLocalRouter(dvr_router_base.DvrRouterBase):
elif operation == 'delete':
device.neigh.delete(ip, mac)
return True
else:
if operation == 'add':
LOG.warning("Device %s does not exist so ARP entry "
"cannot be updated, will cache "
"information to be applied later "
"when the device exists",
device)
self._cache_arp_entry(ip, mac, subnet_id, operation)
return False
if operation == 'add':
LOG.warning("Device %s does not exist so ARP entry "
"cannot be updated, will cache "
"information to be applied later "
"when the device exists",
device)
self._cache_arp_entry(ip, mac, subnet_id, operation)
return False
except Exception:
with excutils.save_and_reraise_exception():
LOG.exception("DVR: Failed updating arp entry")
@ -493,8 +492,7 @@ class DvrLocalRouter(dvr_router_base.DvrRouterBase):
if is_add:
exc = 'DVR: error adding redirection logic'
else:
exc = ('DVR: snat remove failed to clear the rule '
'and device')
exc = 'DVR: snat remove failed to clear the rule and device'
LOG.exception(exc)
def _snat_redirect_add(self, gateway, sn_port, sn_int):

3
neutron/agent/l3/fip_rule_priority_allocator.py
View File

@ -28,8 +28,7 @@ class FipPriority:
def __eq__(self, other):
if isinstance(other, FipPriority):
return (self.index == other.index)
else:
return False
return False
def __int__(self):
return int(self.index)

14
neutron/agent/l3/ha_router.py
View File

@ -326,12 +326,11 @@ class HaRouter(router.RouterInfo):
"""
manager = self.keepalived_manager
if manager.get_process().active:
if self.ha_state != 'primary':
conf = manager.get_conf_on_disk()
managed_by_keepalived = conf and ipv6_lladdr in conf
if managed_by_keepalived:
return False
else:
if self.ha_state == 'primary':
return False
conf = manager.get_conf_on_disk()
managed_by_keepalived = conf and ipv6_lladdr in conf
if managed_by_keepalived:
return False
return True
@ -510,8 +509,7 @@ class HaRouter(router.RouterInfo):
self._clear_vips(interface_name)
if self.ha_state == 'primary':
super().external_gateway_removed(ex_gw_port,
interface_name)
super().external_gateway_removed(ex_gw_port, interface_name)
else:
# We are not the primary node, so no need to delete ip addresses.
self.driver.unplug(interface_name,

3
neutron/agent/l3/l3_agent_extension_api.py
View File

@ -55,8 +55,7 @@ class L3AgentExtensionAPI:
if project_id:
return [ri for ri in self._router_info.values()
if ri.router['project_id'] == project_id]
else:
return []
return []
def is_router_in_namespace(self, router_id):
"""Given a router_id, make sure that the router is in a local

8
neutron/agent/linux/bridge_lib.py
View File

@ -54,8 +54,7 @@ def catch_exceptions(function):
def is_bridged_interface(interface):
if not interface:
return False
else:
return os.path.exists(BRIDGE_PORT_FS_FOR_DEVICE % interface)
return os.path.exists(BRIDGE_PORT_FS_FOR_DEVICE % interface)
def get_interface_ifindex(interface):
@ -87,9 +86,8 @@ class BridgeDevice(ip_lib.IPDevice):
path = os.readlink(BRIDGE_PATH_FOR_DEVICE % interface)
except OSError:
return None
else:
name = path.rpartition('/')[-1]
return cls(name)
name = path.rpartition('/')[-1]
return cls(name)
def delbr(self):
return self.link.delete()

3
neutron/agent/linux/dhcp.py
View File

@ -97,8 +97,7 @@ class DictModel(collections.abc.MutableMapping):
"""Upgrade item if it needs to be upgraded."""
if needs_upgrade(item):
return DictModel(item)
else:
return item
return item
for key, value in itertools.chain(temp_dict.items(), kwargs.items()):
if isinstance(value, (list, tuple)):

6
neutron/agent/linux/external_process.py
View File

@ -157,10 +157,8 @@ class ProcessManager(MonitoredProcess):
"""Returns the file name for a given kind of config file."""
if self.pid_file:
return self.pid_file
else:
return utils.get_conf_file_name(self.pids_path,
self.uuid,
self.service_pid_fname)
return utils.get_conf_file_name(
self.pids_path, self.uuid, self.service_pid_fname)
@property
def pid(self):

28
neutron/agent/linux/ip_lib.py
View File

@ -125,12 +125,11 @@ class SubProcessBase:
def _run(self, options, command, args):
if self.namespace:
return self._as_root(options, command, args)
elif self.force_root:
if self.force_root:
# Force use of the root helper to ensure that commands
# will execute in dom0 when running under XenServer/XCP.
return self._execute(options, command, args, run_as_root=True)
else:
return self._execute(options, command, args)
return self._execute(options, command, args)
def _as_root(self, options, command, args, use_root_namespace=False):
namespace = self.namespace if not use_root_namespace else None
@ -580,7 +579,7 @@ class IpAddrCommand(IpDeviceCommandBase):
for filter in filters:
if filter == 'permanent' and device['dynamic']:
return False
elif not device[filter]:
if not device[filter]:
return False
return True
@ -803,7 +802,8 @@ def device_exists(device_name, namespace=None):
return IPDevice(device_name, namespace=namespace).exists()
def device_exists_with_ips_and_mac(device_name, ip_cidrs, mac, namespace=None):
def device_exists_with_ips_and_mac(device_name, ip_cidrs,
mac, namespace=None) -> bool:
"""Return True if the device with the given IP addresses and MAC address
exists in the namespace.
"""
@ -811,14 +811,10 @@ def device_exists_with_ips_and_mac(device_name, ip_cidrs, mac, namespace=None):
device = IPDevice(device_name, namespace=namespace)
if mac and mac != device.link.address:
return False
device_ip_cidrs = [ip['cidr'] for ip in device.addr.list()]
for ip_cidr in ip_cidrs:
if ip_cidr not in device_ip_cidrs:
return False
device_ip_cidrs = {ip['cidr'] for ip in device.addr.list()}
except RuntimeError:
return False
else:
return True
return not bool(set(ip_cidrs) - device_ip_cidrs)
def get_device_mac(device_name, namespace=None):
@ -986,8 +982,7 @@ def list_network_namespaces(**kwargs):
"""
if cfg.CONF.AGENT.use_helper_for_ns_read:
return privileged.list_netns(**kwargs)
else:
return netns.listnetns(**kwargs)
return netns.listnetns(**kwargs)
def network_namespace_exists(namespace, try_is_ready=False, **kwargs):
@ -1006,8 +1001,7 @@ def network_namespace_exists(namespace, try_is_ready=False, **kwargs):
nspath += '/' + namespace
if cfg.CONF.AGENT.use_helper_for_ns_read:
return priv_utils.path_exists(nspath)
else:
return path.exists(nspath)
return path.exists(nspath)
try:
privileged.open_namespace(namespace)
@ -1601,9 +1595,9 @@ def list_ip_routes(namespace, ip_version, scope=None, via=None, table=None,
def get_proto(proto_number):
if isinstance(proto_number, int) and proto_number in rtnl.rt_proto:
return rtnl.rt_proto[proto_number]
elif isinstance(proto_number, str) and proto_number.isnumeric():
if isinstance(proto_number, str) and proto_number.isnumeric():
return rtnl.rt_proto[int(proto_number)]
elif str(proto_number) in constants.IP_PROTOCOL_NUM_TO_NAME_MAP:
if str(proto_number) in constants.IP_PROTOCOL_NUM_TO_NAME_MAP:
return constants.IP_PROTOCOL_NUM_TO_NAME_MAP[str(proto_number)]
table = table if table else 'main'

3
neutron/agent/linux/iptables_firewall.py
View File

@ -735,8 +735,7 @@ class IptablesFirewallDriver(firewall.FirewallDriver):
remote_gid = self._get_any_remote_group_id_in_rule(sg_rule)
if self.enable_ipset and remote_gid:
return self._generate_ipset_rule_args(sg_rule, remote_gid)
else:
return self._generate_plain_rule_args(sg_rule)
return self._generate_plain_rule_args(sg_rule)
def _convert_sgr_to_iptables_rules(self, security_group_rules):
iptables_rules = []

6
neutron/agent/linux/iptables_manager.py
View File

@ -88,8 +88,7 @@ def comment_rule(rule, comment):
def get_chain_name(chain_name, wrap=True):
if wrap:
return chain_name[:constants.MAX_IPTABLES_CHAIN_LEN_WRAP]
else:
return chain_name[:constants.MAX_IPTABLES_CHAIN_LEN_NOWRAP]
return chain_name[:constants.MAX_IPTABLES_CHAIN_LEN_NOWRAP]
class IptablesRule:
@ -162,8 +161,7 @@ class IptablesTable:
def _select_chain_set(self, wrap):
if wrap:
return self.chains
else:
return self.unwrapped_chains
return self.unwrapped_chains
def remove_chain(self, name, wrap=True):
"""Remove named chain.

2
neutron/agent/linux/openvswitch_firewall/firewall.py
View File

@ -785,7 +785,7 @@ class OVSFirewallDriver(firewall.FirewallDriver):
self.remove_port_filter(port)
self._initialize_egress_no_port_security(port['device'])
return
elif not self.is_port_managed(port):
if not self.is_port_managed(port):
try:
self._remove_egress_no_port_security(port['device'])
except exceptions.OVSFWPortNotHandled as e:

2
neutron/agent/linux/openvswitch_firewall/rules.py
View File

@ -171,7 +171,7 @@ def flow_priority_offset(rule, conjunction=False):
if protocol in [n_consts.PROTO_NUM_ICMP, n_consts.PROTO_NUM_IPV6_ICMP]:
if 'port_range_min' not in rule:
return conj_offset + 1
elif 'port_range_max' not in rule:
if 'port_range_max' not in rule:
return conj_offset + 2
return conj_offset + 3

5
neutron/agent/linux/tc_lib.py
View File

@ -96,9 +96,8 @@ def convert_to_kilobits(value, base):
value = int(value)
if input_in_bits:
return utils.bits_to_kilobits(value, base)
else:
bits_value = utils.bytes_to_bits(value)
return utils.bits_to_kilobits(bits_value, base)
bits_value = utils.bytes_to_bits(value)
return utils.bits_to_kilobits(bits_value, base)
unit = value[-1:]
if unit not in UNITS.keys():
raise InvalidUnit(unit=unit)

3
neutron/agent/linux/utils.py
View File

@ -409,8 +409,7 @@ def read_if_exists(path: str, run_as_root=False) -> str:
"""
if run_as_root:
return priv_utils.read_file(path)
else:
return utils.read_file(path)
return utils.read_file(path)
class UnixDomainHTTPConnection(httplib.HTTPConnection):

2
neutron/agent/metadata/agent.py
View File

@ -139,7 +139,7 @@ class MetadataProxyHandler(proxy_base.MetadataProxyHandlerBase):
num_ports = len(ports)
if num_ports == 1:
return ports[0]['device_id'], ports[0]['tenant_id']
elif num_ports == 0:
if num_ports == 0:
LOG.error("No port found in network %s with IP address %s",
network_id, remote_address)
return None, None

13
neutron/agent/metadata/proxy_base.py
View File

@ -82,8 +82,7 @@ class MetadataProxyHandlerBase(metaclass=abc.ABCMeta):
if instance_id:
res = self._proxy_request(instance_id, project_id, req)
return res
else:
return webob.exc.HTTPNotFound()
return webob.exc.HTTPNotFound()
except Exception:
LOG.exception("Unexpected error.")
@ -175,25 +174,23 @@ class MetadataProxyHandlerBase(metaclass=abc.ABCMeta):
req.response.body = resp.content
LOG.debug(str(resp))
return req.response
elif resp.status_code == 403:
if resp.status_code == 403:
LOG.warning(
'The remote metadata server responded with Forbidden. This '
'response usually occurs when shared secrets do not match.'
)
return webob.exc.HTTPForbidden()
elif resp.status_code == 500:
if resp.status_code == 500:
msg = _(
'Remote metadata server experienced an internal server error.'
)
LOG.warning(msg)
explanation = str(msg)
return webob.exc.HTTPInternalServerError(explanation=explanation)
elif resp.status_code in (400, 404, 409, 502, 503, 504):
if resp.status_code in (400, 404, 409, 502, 503, 504):
webob_exc_cls = webob.exc.status_map.get(resp.status_code)
return webob_exc_cls()
else:
raise Exception(_('Unexpected response code: %s') %
resp.status_code)
raise Exception(_('Unexpected response code: %s') % resp.status_code)
class UnixDomainMetadataProxyBase(metaclass=abc.ABCMeta):

5
neutron/agent/ovn/extensions/qos_hwol.py
View File

@ -251,10 +251,9 @@ class QoSHardwareOffloadExtension(extension_manager.OVNAgentExtension):
def _kbps_2_mbps(rate_kbps):
if rate_kbps == 0: # Delete the BW setting.
return 0
elif 0 < rate_kbps < 1000: # Any value under 1000kbps --> 1Mbps
if 0 < rate_kbps < 1000: # Any value under 1000kbps --> 1Mbps
return 1
else:
return int(rate_kbps / 1000.0)
return int(rate_kbps / 1000.0)
def _get_port_representor(self, port_id):
port_name = self.get_port(port_id)

2
neutron/agent/ovn/metadata/server.py
View File

@ -76,7 +76,7 @@ class MetadataProxyHandler(proxy_base.MetadataProxyHandlerBase):
external_ids = ports[0].external_ids
return (external_ids[ovn_const.OVN_DEVID_EXT_ID_KEY],
external_ids[ovn_const.OVN_PROJID_EXT_ID_KEY])
elif num_ports == 0:
if num_ports == 0:
LOG.error("No port found in network %s with IP address %s",
network_id, remote_address)
elif num_ports > 1:

4
neutron/agent/ovsdb/api.py
View File

@ -21,8 +21,8 @@ def val_to_py(val):
if isinstance(val, abc.Sequence) and len(val) == 2:
if val[0] == "uuid":
return uuid.UUID(val[1])
elif val[0] == "set":
if val[0] == "set":
return [val_to_py(x) for x in val[1]]
elif val[0] == "map":
if val[0] == "map":
return {val_to_py(x): val_to_py(y) for x, y in val[1]}
return val

39
neutron/api/api_common.py
View File

@ -165,8 +165,7 @@ def get_path_url(request):
parsed.path, parsed.params,
parsed.query, parsed.fragment)
return urllib.parse.urlunparse(new_parsed)
else:
return request.path_url
return request.path_url
def get_limit_and_marker(request):
@ -347,11 +346,10 @@ class PaginationEmulatedHelper(PaginationHelper):
if self.page_reverse:
# don't wrap
return items[max(i - self.limit, 0):i]
else:
if self.marker:
# skip the matched marker
i += 1
return items[i:i + self.limit]
if self.marker:
# skip the matched marker
i += 1
return items[i:i + self.limit]
def get_links(self, items):
return get_pagination_links(
@ -456,20 +454,19 @@ def convert_exception_to_http_exc(e, faults, language):
new_body['NeutronError']['message'] = joined_msg
converted_exceptions[0].body = serializer.serialize(new_body)
return converted_exceptions[0]
else:
# multiple error types so we turn it into a Conflict with the
# inner codes and bodies packed in
new_exception = exceptions.Conflict()
inner_error_strings = []
for c in converted_exceptions:
c_body = jsonutils.loads(c.body)
err = ('HTTP {} {}: {}'.format(
c.code, c_body['NeutronError']['type'],
c_body['NeutronError']['message']))
inner_error_strings.append(err)
new_exception.msg = "\n".join(inner_error_strings)
return convert_exception_to_http_exc(
new_exception, faults, language)
# multiple error types so we turn it into a Conflict with the
# inner codes and bodies packed in
new_exception = exceptions.Conflict()
inner_error_strings = []
for c in converted_exceptions:
c_body = jsonutils.loads(c.body)
err = 'HTTP {} {}: {}'.format(
c.code, c_body['NeutronError']['type'],
c_body['NeutronError']['message'])
inner_error_strings.append(err)
new_exception.msg = "\n".join(inner_error_strings)
return convert_exception_to_http_exc(new_exception, faults,
language)
e = translate(e, language)
body = serializer.serialize(

9
neutron/api/rpc/handlers/dhcp_rpc.py
View File

@ -116,11 +116,9 @@ class DhcpRpcCallback:
try:
if action == 'create_port':
return p_utils.create_port(plugin, context, port)
elif action == 'update_port':
if action == 'update_port':
return plugin.update_port(context, port['id'], port)
else:
msg = _('Unrecognized action')
raise exceptions.Invalid(message=msg)
raise exceptions.Invalid(message=_('Unrecognized action'))
except (db_exc.DBReferenceError,
exceptions.NetworkNotFound,
exceptions.SubnetNotFound,
@ -134,10 +132,9 @@ class DhcpRpcCallback:
try:
subnet_id = port['port']['fixed_ips'][0]['subnet_id']
plugin.get_subnet(context, subnet_id)
ctxt.reraise = True
except exceptions.SubnetNotFound:
pass
else:
ctxt.reraise = True
if ctxt.reraise:
net_id = port['port']['network_id']
LOG.warning("Action %(action)s for network %(net_id)s "

9
neutron/api/rpc/handlers/l3_rpc.py
View File

@ -143,12 +143,9 @@ class L3RpcCallback:
def _routers_to_sync(self, context, router_ids, host=None):
if extensions.is_extension_supported(
self.l3plugin, constants.L3_AGENT_SCHEDULER_EXT_ALIAS):
routers = (
self.l3plugin.list_active_sync_routers_on_active_l3_agent(
context, host, router_ids))
else:
routers = self.l3plugin.get_sync_data(context, router_ids)
return routers
return self.l3plugin.list_active_sync_routers_on_active_l3_agent(
context, host, router_ids)
return self.l3plugin.get_sync_data(context, router_ids)
def _ensure_host_set_on_ports(self, context, host, routers):
for router in routers:

35
neutron/api/v2/base.py
View File

@ -262,14 +262,13 @@ class Controller:
return ret_value
return _handle_action
else:
raise AttributeError()
raise AttributeError()
def _get_pagination_helper(self, request):
if self._allow_pagination and self._native_pagination:
return api_common.PaginationNativeHelper(request,
self._primary_key)
elif self._allow_pagination:
if self._allow_pagination:
return api_common.PaginationEmulatedHelper(request,
self._primary_key)
return api_common.NoPaginationHelper(request, self._primary_key)
@ -277,7 +276,7 @@ class Controller:
def _get_sorting_helper(self, request):
if self._allow_sorting and self._native_sorting:
return api_common.SortingNativeHelper(request, self._attr_info)
elif self._allow_sorting:
if self._allow_sorting:
return api_common.SortingEmulatedHelper(request, self._attr_info)
return api_common.NoSortingHelper(request, self._attr_info)
@ -530,14 +529,13 @@ class Controller:
if emulated:
return self._emulate_bulk_create(obj_creator, request,
body, parent_id)
if self._collection in body:
# This is weird but fixing it requires changes to the
# plugin interface
kwargs.update({self._collection: body})
else:
if self._collection in body:
# This is weird but fixing it requires changes to the
# plugin interface
kwargs.update({self._collection: body})
else:
kwargs.update({self._resource: body})
return obj_creator(request.context, **kwargs)
kwargs.update({self._resource: body})
return obj_creator(request.context, **kwargs)
except Exception:
# In case of failure the plugin will always raise an
# exception. Cancel the reservation
@ -557,15 +555,12 @@ class Controller:
[self._filter_attributes(
obj, fields_to_strip=fields_to_strip)
for obj in objs]})
else:
if self._collection in body:
# Emulate atomic bulk behavior
objs = do_create(body, bulk=True, emulated=True)
return notify({self._collection: objs})
else:
obj = do_create(body)
return notify({self._resource: self._view(request.context,
obj)})
if self._collection in body:
# Emulate atomic bulk behavior
objs = do_create(body, bulk=True, emulated=True)
return notify({self._collection: objs})
obj = do_create(body)
return notify({self._resource: self._view(request.context, obj)})
def delete(self, request, id, **kwargs):
"""Deletes the specified entity."""

3
neutron/api/wsgi.py
View File

@ -730,8 +730,7 @@ class Controller:
LOG.debug("%(url)s returned with HTTP %(status)d",
dict(url=req.url, status=response.status_int))
return response
else:
return result
return result
def _serialize(self, data, content_type):
"""Serialize the given dict to the provided content_type.

5
neutron/cmd/sanity/checks.py
View File

@ -182,8 +182,7 @@ def ofctl_arg_supported(cmd, **kwargs):
LOG.exception("Unexpected exception while checking supported"
" feature via command: %s", full_args)
return False
else:
return True
return True
def arp_responder_supported():
@ -258,7 +257,7 @@ def dnsmasq_local_service_supported():
LOG.debug("Exception while checking dnsmasq version. "
"dnsmasq: No such file or directory")
return False
elif returncode == 1:
if returncode == 1:
return False
return True

51
neutron/cmd/upgrade_checks/checks.py
View File

@ -235,13 +235,12 @@ class CoreChecks(base.BaseChecks):
return upgradecheck.Result(
upgradecheck.Code.SUCCESS, _("Number of workers already "
"defined in config"))
else:
return upgradecheck.Result(
upgradecheck.Code.WARNING,
_("The default number of workers "
"has changed. Please see release notes for the new values, "
"but it is strongly encouraged for deployers to manually "
"set the values for api_workers and rpc_workers."))
return upgradecheck.Result(
upgradecheck.Code.WARNING,
_("The default number of workers "
"has changed. Please see release notes for the new values, "
"but it is strongly encouraged for deployers to manually "
"set the values for api_workers and rpc_workers."))
@staticmethod
def network_mtu_check(checker):
@ -263,10 +262,9 @@ class CoreChecks(base.BaseChecks):
upgradecheck.Code.WARNING,
_("The 'mtu' attribute of networks %s are not set "
"This attribute can't be null now.") % networks_list)
else:
return upgradecheck.Result(
upgradecheck.Code.SUCCESS,
_("The 'mtu' attribute of all networks are set."))
return upgradecheck.Result(
upgradecheck.Code.SUCCESS,
_("The 'mtu' attribute of all networks are set."))
@staticmethod
def ovn_db_revision_check(checker):
@ -313,10 +311,8 @@ class CoreChecks(base.BaseChecks):
upgradecheck.Code.WARNING,
_("NIC Switch agents detected on hosts %s, please ensure the "
"hosts run with a kernel version 3.13 or newer.") % hosts)
else:
return upgradecheck.Result(
upgradecheck.Code.SUCCESS,
_("No NIC Switch agents detected."))
return upgradecheck.Result(
upgradecheck.Code.SUCCESS, _("No NIC Switch agents detected."))
@staticmethod
def vlan_allocations_segid_check(checker):
@ -558,19 +554,18 @@ class CoreChecks(base.BaseChecks):
return upgradecheck.Result(
upgradecheck.Code.SUCCESS,
_('Version of OVN supports iPXE over IPv6.'))
else:
return upgradecheck.Result(
upgradecheck.Code.WARNING,
_('Version of OVN does not support iPXE over IPv6 but '
'``disable_ovn_dhcp_for_baremetal_ports`` is set to '
'``False``. In case if provisioning of baremetal nodes '
'is required, please make sure that either '
'``disable_ovn_dhcp_for_baremetal_ports`` option is set to '
'``True`` and Neutron DHCP agent is available or use '
'OVN with patch https://github.com/ovn-org/ovn/commit/'
'c5fd51bd154147a567097eaf61fbebc0b5b39e28 which added '
'support for iPXE over IPv6. It is available in '
'OVN >= 23.06.0.'))
return upgradecheck.Result(
upgradecheck.Code.WARNING,
_('Version of OVN does not support iPXE over IPv6 but '
'``disable_ovn_dhcp_for_baremetal_ports`` is set to '
'``False``. In case if provisioning of baremetal nodes '
'is required, please make sure that either '
'``disable_ovn_dhcp_for_baremetal_ports`` option is set to '
'``True`` and Neutron DHCP agent is available or use '
'OVN with patch https://github.com/ovn-org/ovn/commit/'
'c5fd51bd154147a567097eaf61fbebc0b5b39e28 which added '
'support for iPXE over IPv6. It is available in '
'OVN >= 23.06.0.'))
@staticmethod
def ml2_ovs_igmp_flood_check(checker):

3
neutron/common/cache_utils.py
View File

@ -33,8 +33,7 @@ def get_cache(conf):
"""Used to get cache client"""
if conf.cache.enabled:
return _get_cache_region(conf)
else:
return False
return False
def _get_cache_region(conf):

30
neutron/common/ovn/acl.py
View File

@ -194,33 +194,29 @@ def add_sg_rule_acl_for_port_group(port_group, r, stateful, match):
def _get_subnet_from_cache(plugin, admin_context, subnet_cache, subnet_id):
if subnet_id in subnet_cache:
return subnet_cache[subnet_id]
else:
subnet = plugin.get_subnet(admin_context, subnet_id)
if subnet:
subnet_cache[subnet_id] = subnet
return subnet
subnet = plugin.get_subnet(admin_context, subnet_id)
if subnet:
subnet_cache[subnet_id] = subnet
return subnet
def _get_sg_ports_from_cache(plugin, admin_context, sg_ports_cache, sg_id):
if sg_id in sg_ports_cache:
return sg_ports_cache[sg_id]
else:
filters = {'security_group_id': [sg_id]}
sg_ports = plugin._get_port_security_group_bindings(
admin_context, filters)
if sg_ports:
sg_ports_cache[sg_id] = sg_ports
return sg_ports
filters = {'security_group_id': [sg_id]}
sg_ports = plugin._get_port_security_group_bindings(admin_context, filters)
if sg_ports:
sg_ports_cache[sg_id] = sg_ports
return sg_ports
def _get_sg_from_cache(plugin, admin_context, sg_cache, sg_id):
if sg_id in sg_cache:
return sg_cache[sg_id]
else:
sg = plugin.get_security_group(admin_context, sg_id)
if sg:
sg_cache[sg_id] = sg
return sg
sg = plugin.get_security_group(admin_context, sg_id)
if sg:
sg_cache[sg_id] = sg
return sg
def acl_remote_group_id(r, ip_version):

14
neutron/common/ovn/utils.py
View File

@ -190,8 +190,7 @@ def ovn_context(txn_var_name='txn', idl_var_name='idl'):
else:
kwargs[txn_var_name] = new_txn
return f(*args, **kwargs)
else:
return f(*args, **kwargs)
return f(*args, **kwargs)
return wrapped
return decorator
@ -561,8 +560,7 @@ def get_revision_number(resource, resource_type):
constants.TYPE_ADDRESS_GROUPS,
constants.TYPE_FLOATINGIPS, constants.TYPE_SUBNETS):
return resource['revision_number']
else:
raise ovn_exc.UnknownResourceType(resource_type=resource_type)
raise ovn_exc.UnknownResourceType(resource_type=resource_type)
def remove_macs_from_lsp_addresses(addresses):
@ -635,7 +633,7 @@ def sort_ips_by_version(addresses):
def is_lsp_router_port(neutron_port=None, lsp=None):
if neutron_port:
return neutron_port.get('device_owner') in const.ROUTER_PORT_OWNERS
elif lsp:
if lsp:
return (lsp.external_ids.get(constants.OVN_DEVICE_OWNER_EXT_ID_KEY) in
const.ROUTER_PORT_OWNERS)
return False
@ -760,11 +758,11 @@ def is_gateway_chassis_invalid(chassis_name, gw_chassis,
"""
if chassis_name not in chassis_physnets:
return True
elif physnet and physnet not in chassis_physnets.get(chassis_name):
if physnet and physnet not in chassis_physnets.get(chassis_name):
return True
elif gw_chassis and chassis_name not in gw_chassis:
if gw_chassis and chassis_name not in gw_chassis:
return True
elif az_hints and not set(az_hints) & set(chassis_with_azs.get(
if az_hints and not set(az_hints) & set(chassis_with_azs.get(
chassis_name, [])):
return True
return False

2
neutron/common/utils.py
View File

@ -1021,7 +1021,7 @@ def get_sql_random_method(sql_dialect_name):
if sql_dialect_name == sqlite_dialect.name:
return sql_func.random
# https://dev.mysql.com/doc/refman/8.0/en/mathematical-functions.html
elif sql_dialect_name == mysql_dialect.name:
if sql_dialect_name == mysql_dialect.name:
return sql_func.rand

3
neutron/db/_utils.py
View File

@ -35,8 +35,7 @@ def context_if_transaction(context, transaction, writer=True):
if transaction:
return (db_api.CONTEXT_WRITER.using(context) if writer else
db_api.CONTEXT_READER.using(context))
else:
return _noop_context_manager()
return _noop_context_manager()
def safe_creation(context, create_fn, delete_fn, create_bindings,

15
neutron/db/agents_db.py
View File

@ -149,14 +149,13 @@ class AgentAvailabilityZoneMixin(az_ext.AvailabilityZonePluginBase):
for k, v in self._list_availability_zones(
context, filters).items()
if not filter_states or v in filter_states]
else:
# NOTE(hichihara): 'tenant_id' is dummy for policy check.
# it is not visible via API.
return [{'state': v,
'name': k[0], 'resource': k[1],
'tenant_id': context.tenant_id}
for k, v in self._list_availability_zones(
context, filters).items()]
# NOTE(hichihara): 'tenant_id' is dummy for policy check. it is not
# visible via API.
return [{'state': v,
'name': k[0], 'resource': k[1],
'tenant_id': context.tenant_id}
for k, v in self._list_availability_zones(
context, filters).items()]
@db_api.retry_if_session_inactive()
def validate_availability_zones(self, context, resource_type,

38
neutron/db/agentschedulers_db.py
View File

@ -66,19 +66,18 @@ class AgentSchedulerDbMixin(agents_db.AgentDbMixin):
if active is None:
# filtering by activeness is disabled, all agents are eligible
return True
else:
# note(rpodolyaka): original behaviour is saved here: if active
# filter is set, only agents which are 'up'
# (i.e. have a recent heartbeat timestamp)
# are eligible, even if active is False
if agent_utils.is_agent_down(agent['heartbeat_timestamp']):
LOG.warning('Agent %(agent)s is down. Type: %(type)s, host: '
'%(host)s, heartbeat: %(heartbeat)s',
{'agent': agent['id'], 'type': agent['agent_type'],
'host': agent['host'],
'heartbeat': agent['heartbeat_timestamp']})
return False
return True
# note(rpodolyaka): original behaviour is saved here: if active
# filter is set, only agents which are 'up'
# (i.e. have a recent heartbeat timestamp)
# are eligible, even if active is False
if agent_utils.is_agent_down(agent['heartbeat_timestamp']):
LOG.warning('Agent %(agent)s is down. Type: %(type)s, host: '
'%(host)s, heartbeat: %(heartbeat)s',
{'agent': agent['id'], 'type': agent['agent_type'],
'host': agent['host'],
'heartbeat': agent['heartbeat_timestamp']})
return False
return True
def update_agent(self, context, id, agent):
original_agent = self.get_agent(context, id)
@ -442,10 +441,9 @@ class DhcpAgentSchedulerDbMixin(dhcpagentscheduler
if net_ids:
return {'networks':
self.get_networks(context, filters={'id': net_ids})}
else:
# Exception will be thrown if the requested agent does not exist.
self._get_agent(context, id)
return {'networks': []}
# Exception will be thrown if the requested agent does not exist.
self._get_agent(context, id)
return {'networks': []}
def list_active_networks_on_active_dhcp_agent(self, context, host):
try:
@ -465,8 +463,7 @@ class DhcpAgentSchedulerDbMixin(dhcpagentscheduler
if net_ids:
return network.Network.get_objects(context, id=net_ids,
admin_state_up=[True])
else:
return []
return []
def list_dhcp_agents_hosting_network(self, context, network_id):
dhcp_agents = self.get_dhcp_agents_hosting_networks(
@ -475,8 +472,7 @@ class DhcpAgentSchedulerDbMixin(dhcpagentscheduler
if agent_ids:
return {
'agents': self.get_agents(context, filters={'id': agent_ids})}
else:
return {'agents': []}
return {'agents': []}
def schedule_network(self, context, created_network):
if self.network_scheduler and cfg.CONF.network_auto_schedule:

13
neutron/db/db_base_plugin_common.py
View File

@ -50,10 +50,9 @@ def convert_result_to_dict(f):
if result is None:
return None
elif isinstance(result, list):
if isinstance(result, list):
return [r.to_dict() for r in result]
else:
return result.to_dict()
return result.to_dict()
return inner
@ -74,8 +73,7 @@ def filter_fields(f):
if isinstance(result, list):
return [_do_filter(obj) for obj in result]
else:
return _do_filter(result)
return _do_filter(result)
return inner_filter
@ -86,10 +84,9 @@ def make_result_with_fields(f):
result = f(*args, **kwargs)
if fields is None:
return result
elif isinstance(result, list):
if isinstance(result, list):
return [db_utils.resource_fields(r, fields) for r in result]
else:
return db_utils.resource_fields(result, fields)
return db_utils.resource_fields(result, fields)
return inner

27
neutron/db/dns_db.py
View File

@ -134,21 +134,20 @@ class DNSDbMixin:
self._get_requested_state_for_external_dns_service_update(
context, floatingip_data))
if dns_data_db:
if (dns_data_db['published_dns_name'] != current_dns_name or
dns_data_db['published_dns_domain'] != current_dns_domain):
dns_actions_data = DNSActionsData(
previous_dns_name=dns_data_db['published_dns_name'],
previous_dns_domain=dns_data_db['published_dns_domain'])
if current_dns_name and current_dns_domain:
dns_data_db['published_dns_name'] = current_dns_name
dns_data_db['published_dns_domain'] = current_dns_domain
dns_actions_data.current_dns_name = current_dns_name
dns_actions_data.current_dns_domain = current_dns_domain
else:
dns_data_db.delete()
return dns_actions_data
else:
if (dns_data_db['published_dns_name'] == current_dns_name and
dns_data_db['published_dns_domain'] == current_dns_domain):
return
dns_actions_data = DNSActionsData(
previous_dns_name=dns_data_db['published_dns_name'],
previous_dns_domain=dns_data_db['published_dns_domain'])
if current_dns_name and current_dns_domain:
dns_data_db['published_dns_name'] = current_dns_name
dns_data_db['published_dns_domain'] = current_dns_domain
dns_actions_data.current_dns_name = current_dns_name
dns_actions_data.current_dns_domain = current_dns_domain
else:
dns_data_db.delete()
return dns_actions_data
if current_dns_name and current_dns_domain:
fip_obj.FloatingIPDNS(
context,

29
neutron/db/dvr_mac_db.py
View File

@ -204,25 +204,26 @@ class DVRDbMixin(ext_dvr.DVRMacAddressPluginBase):
subnet_data = fixed_ips[0]['subnet_id']
else:
subnet_data = subnet
try:
subnet_info = self.plugin.get_subnet(
context, subnet_data)
except n_exc.SubnetNotFound:
return {}
# retrieve the gateway port on this subnet
if fixed_ips:
ip_address = fixed_ips[0]['ip_address']
else:
# retrieve the gateway port on this subnet
if fixed_ips:
ip_address = fixed_ips[0]['ip_address']
else:
ip_address = subnet_info['gateway_ip']
ip_address = subnet_info['gateway_ip']
internal_gateway_ports = get_ports_query_by_subnet_and_ip(
context, subnet, [ip_address])
internal_gateway_ports = get_ports_query_by_subnet_and_ip(
context, subnet, [ip_address])
if not internal_gateway_ports:
LOG.error("Could not retrieve gateway port "
"for subnet %s", subnet_info)
return {}
internal_port = internal_gateway_ports[0]
subnet_info['gateway_mac'] = internal_port['mac_address']
return subnet_info
if not internal_gateway_ports:
LOG.error("Could not retrieve gateway port for subnet %s",
subnet_info)
return {}
internal_port = internal_gateway_ports[0]
subnet_info['gateway_mac'] = internal_port['mac_address']
return subnet_info

7
neutron/db/l3_agentschedulers_db.py
View File

@ -290,10 +290,9 @@ class L3AgentSchedulerDbMixin(l3agentscheduler.L3AgentSchedulerPluginBase,
if router_ids:
return {'routers':
self.get_routers(context, filters={'id': router_ids})}
else:
# Exception will be thrown if the requested agent does not exist.
self._get_agent(context, agent_id)
return {'routers': []}
# Exception will be thrown if the requested agent does not exist.
self._get_agent(context, agent_id)
return {'routers': []}
def _get_active_l3_agent_routers_sync_data(self, context, host, agent,
router_ids):

8
neutron/db/l3_db.py
View File

@ -1179,7 +1179,7 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase,
self._core_plugin.update_port(
context, p['id'], {'port': {'fixed_ips': fixed_ips}})
return (p, [subnet])
elif subnet_id in port_subnets:
if subnet_id in port_subnets:
# only one subnet on port - delete the port
self._core_plugin.delete_port(context, p['id'],
l3_port_check=False)
@ -1874,11 +1874,9 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase,
def _get_floatingips_by_port_id(self, context, port_id):
"""Helper function to retrieve the fips associated with a port_id."""
if l3_obj.FloatingIP.objects_exist(context, fixed_port_id=port_id):
return l3_obj.FloatingIP.get_objects(
context, fixed_port_id=port_id)
else:
if not l3_obj.FloatingIP.objects_exist(context, fixed_port_id=port_id):
return []
return l3_obj.FloatingIP.get_objects(context, fixed_port_id=port_id)
def _build_routers_list(self, context, routers, gw_ports):
"""Subclasses can override this to add extra gateway info"""

2
neutron/db/l3_dvrscheduler_db.py
View File

@ -669,7 +669,7 @@ def _notify_l3_agent_port_update(resource, event, trigger, payload):
_dvr_handle_unbound_allowed_addr_pair_add(
l3plugin, context, new_port, address_pair)
return
elif original_port_state:
if original_port_state:
# Case were we deactivate the port from active state.
for address_pair in allowed_address_pairs_list:
_dvr_handle_unbound_allowed_addr_pair_del(

5
neutron/db/l3_hamode_db.py
View File

@ -826,8 +826,7 @@ def is_ha_router(router):
def is_ha_router_port(context, device_owner, router_id):
if device_owner == constants.DEVICE_OWNER_HA_REPLICATED_INT:
return True
elif device_owner == constants.DEVICE_OWNER_ROUTER_SNAT:
if device_owner == constants.DEVICE_OWNER_ROUTER_SNAT:
return l3_obj.RouterExtraAttributes.objects_exist(
context, router_id=router_id, ha=True)
else:
return False
return False

5
neutron/db/local_ip_db.py
View File

@ -99,14 +99,13 @@ class LocalIPDbMixin(lip_ext.LocalIPPluginBase):
raise lip_exc.LocalIPRequestedIPNotFound(
port_id=port.id, ip=requested_ip)
return fixed_ip
elif validators.is_attr_set(requested_ip):
if validators.is_attr_set(requested_ip):
for fixed_ip in fixed_ips:
if str(fixed_ip.ip_address) == requested_ip:
return requested_ip
raise lip_exc.LocalIPRequestedIPNotFound(
port_id=port.id, ip=requested_ip)
else:
raise lip_exc.LocalIPNoRequestedIP(port_id=port.id)
raise lip_exc.LocalIPNoRequestedIP(port_id=port.id)
@db_api.retry_if_session_inactive()
def create_local_ip(self, context, local_ip):

30
neutron/db/metering/metering_rpc.py
View File

@ -40,20 +40,18 @@ class MeteringRpcCallbacks:
if not extensions.is_extension_supported(
l3_plugin, consts.L3_AGENT_SCHEDULER_EXT_ALIAS) or not host:
return metering_data
else:
agents = l3_plugin.get_l3_agents(context, filters={'host': [host]})
if not agents:
LOG.error('Unable to find agent on host %s.', host)
return
agents = l3_plugin.get_l3_agents(context, filters={'host': [host]})
if not agents:
LOG.error('Unable to find agent on host %s.', host)
return
router_ids = []
for agent in agents:
routers = l3_plugin.list_routers_on_l3_agent(context, agent.id)
router_ids += [router['id'] for router in routers['routers']]
if not router_ids:
return
else:
return [
router for router in metering_data
if router['id'] in router_ids
]
router_ids = []
for agent in agents:
routers = l3_plugin.list_routers_on_l3_agent(context, agent.id)
router_ids += [router['id'] for router in routers['routers']]
if not router_ids:
return
return [
router for router in metering_data
if router['id'] in router_ids
]

5
neutron/db/migration/alembic_migrations/env.py
View File

@ -56,12 +56,11 @@ def set_mysql_engine():
def include_object(object_, name, type_, reflected, compare_to):
if type_ == 'table' and name in external.TABLES:
return False
elif type_ == 'index' and reflected and name.startswith("idx_autoinc_"):
if type_ == 'index' and reflected and name.startswith("idx_autoinc_"):
# skip indexes created by SQLAlchemy autoincrement=True
# on composite PK integer columns
return False
else:
return True
return True
def run_migrations_offline():

3
neutron/db/migration/alembic_migrations/versions/newton/contract/7d9d8eeec6ad_rename_tenant_to_project.py
View File

@ -40,8 +40,7 @@ def get_inspector():
if _INSPECTOR:
return _INSPECTOR
else:
_INSPECTOR = sa.inspect(op.get_bind())
_INSPECTOR = sa.inspect(op.get_bind())
return _INSPECTOR

4
neutron/db/migration/alembic_migrations/versions/yoga/expand/1ffef8d6f371_rbac_target_tenant_to_target_project.py
View File

@ -45,8 +45,8 @@ def get_inspector():
global _INSPECTOR
if _INSPECTOR:
return _INSPECTOR
else:
_INSPECTOR = sa.inspect(op.get_bind())
_INSPECTOR = sa.inspect(op.get_bind())
return _INSPECTOR

4
neutron/db/migration/alembic_migrations/versions/yoga/expand/ba859d649675_add_indexes_to_rbacs.py
View File

@ -39,8 +39,8 @@ def get_inspector():
global _INSPECTOR
if _INSPECTOR:
return _INSPECTOR
else:
_INSPECTOR = sa.inspect(op.get_bind())
_INSPECTOR = sa.inspect(op.get_bind())
return _INSPECTOR

13
neutron/db/migration/autogen.py
View File

@ -76,8 +76,6 @@ def _migration_script_ops(context, directive, phase):
def _expands(context, directive, phase):
if phase == 'expand':
return directive
else:
return None
@_ec_dispatcher.dispatch_for(ops.DropConstraintOp)
@ -87,8 +85,6 @@ def _expands(context, directive, phase):
def _contracts(context, directive, phase):
if phase == 'contract':
return directive
else:
return None
@_ec_dispatcher.dispatch_for(ops.AlterColumnOp)
@ -97,12 +93,11 @@ def _alter_column(context, directive, phase):
if is_expand and directive.modify_nullable is True:
return directive
elif not is_expand and directive.modify_nullable is False:
if not is_expand and directive.modify_nullable is False:
return directive
else:
raise NotImplementedError(
_("Don't know if operation is an expand or "
"contract at the moment: %s") % directive)
raise NotImplementedError(
_("Don't know if operation is an expand or "
"contract at the moment: %s") % directive)
@_ec_dispatcher.dispatch_for(ops.ModifyTableOps)

5
neutron/db/port_numa_affinity_policy_db.py
View File

@ -53,9 +53,8 @@ class PortNumaAffinityPolicyDbMixin:
obj.update_fields(
{pnap.NUMA_AFFINITY_POLICY: data[pnap.NUMA_AFFINITY_POLICY]})
obj.update()
else:
if obj:
obj.delete()
elif obj:
obj.delete()
result[pnap.NUMA_AFFINITY_POLICY] = data[pnap.NUMA_AFFINITY_POLICY]

14
neutron/db/securitygroups_db.py
View File

@ -101,13 +101,13 @@ class SecurityGroupDbMixin(
tenant_id = s['tenant_id']
stateful = s.get('stateful', True)
if not default_sg:
self._ensure_default_security_group(context, tenant_id)
else:
if default_sg:
existing_def_sg_id = self._get_default_sg_id(context, tenant_id)
if existing_def_sg_id is not None:
# default already exists, return it
return self.get_security_group(context, existing_def_sg_id)
else:
self._ensure_default_security_group(context, tenant_id)
with db_api.CONTEXT_WRITER.using(context):
if default_sg:
@ -727,7 +727,7 @@ class SecurityGroupDbMixin(
protocol = str(constants.PROTO_NUM_IPV6_ICMP)
if protocol in constants.IP_PROTOCOL_MAP:
return [protocol, str(constants.IP_PROTOCOL_MAP.get(protocol))]
elif protocol in constants.IP_PROTOCOL_NUM_TO_NAME_MAP:
if protocol in constants.IP_PROTOCOL_NUM_TO_NAME_MAP:
return [constants.IP_PROTOCOL_NUM_TO_NAME_MAP.get(protocol),
protocol]
return [protocol, protocol]
@ -754,13 +754,11 @@ class SecurityGroupDbMixin(
ip_proto in const.SG_PORT_PROTO_NAMES):
if rule['port_range_min'] == 0 or rule['port_range_max'] == 0:
raise ext_sg.SecurityGroupInvalidPortValue(port=0)
if (rule['port_range_min'] is not None and
if not (rule['port_range_min'] is not None and
rule['port_range_max'] is not None and
rule['port_range_min'] <= rule['port_range_max']):
# When min/max are the same it is just a single port
pass
else:
raise ext_sg.SecurityGroupInvalidPortRange()
# When min/max are the same it is just a single port
elif ip_proto in [constants.PROTO_NUM_ICMP,
constants.PROTO_NUM_IPV6_ICMP]:
for attr, field in [('port_range_min', 'type'),

28
neutron/db/segments_db.py
View File

@ -124,14 +124,13 @@ def get_dynamic_segment(context, network_id, physical_network=None,
if objs:
return _make_segment_dict(objs[0])
else:
LOG.debug("No dynamic segment found for "
"Network:%(network_id)s, "
"Physical network:%(physnet)s, "
"segmentation_id:%(segmentation_id)s",
{'network_id': network_id,
'physnet': physical_network,
'segmentation_id': segmentation_id})
LOG.debug("No dynamic segment found for "
"Network:%(network_id)s, "
"Physical network:%(physnet)s, "
"segmentation_id:%(segmentation_id)s",
{'network_id': network_id,
'physnet': physical_network,
'segmentation_id': segmentation_id})
def delete_network_segment(context, segment_id):
@ -185,10 +184,9 @@ def min_max_actual_segments_in_range(context, network_type, physical_network,
if segment_objs:
return (segment_objs[0].segmentation_id,
segment_objs[-1].segmentation_id)
else:
LOG.debug("No existing segment found for "
"Network type:%(network_type)s, "
"Physical network:%(physical_network)s",
{'network_type': network_type,
'physical_network': physical_network})
return None, None
LOG.debug(
"No existing segment found for Network type:%(network_type)s, "
"Physical network:%(physical_network)s",
{'network_type': network_type,
'physical_network': physical_network})
return None, None

3
neutron/extensions/qos_bw_limit_direction.py
View File

@ -76,5 +76,4 @@ class Qos_bw_limit_direction(api_extensions.ExtensionDescriptor):
def get_extended_resources(self, version):
if version == "2.0":
return SUB_RESOURCE_ATTRIBUTE_MAP
else:
return {}
return {}

3
neutron/extensions/quota_check_limit_default.py
View File

@ -62,5 +62,4 @@ class Quota_check_limit_default(extensions.APIExtensionDescriptor):
def get_extended_resources(cls, version):
if version == "2.0":
return RESOURCE_ATTRIBUTE_MAP
else:
return {}
return {}

3
neutron/extensions/quotasv2.py
View File

@ -213,5 +213,4 @@ class Quotasv2(api_extensions.ExtensionDescriptor):
def get_extended_resources(self, version):
if version == "2.0":
return EXTENDED_ATTRIBUTES_2_0
else:
return {}
return {}

6
neutron/extensions/securitygroup.py
View File

@ -183,8 +183,7 @@ def convert_validate_port_value(port):
if netutils.is_valid_port(port):
return int(port)
else:
raise SecurityGroupInvalidPortValue(port=port)
raise SecurityGroupInvalidPortValue(port=port)
def convert_ip_prefix_to_cidr(ip_prefix):
@ -349,8 +348,7 @@ class Securitygroup(api_extensions.ExtensionDescriptor):
if version == "2.0":
return dict(list(EXTENDED_ATTRIBUTES_2_0.items()) +
list(RESOURCE_ATTRIBUTE_MAP.items()))
else:
return {}
return {}
def get_required_extensions(self):
return [stdattr_ext.Standardattrdescription.get_alias()]

40
neutron/ipam/requests.py
View File

@ -304,15 +304,14 @@ class AddressRequestFactory:
"""
if ip_dict.get('ip_address'):
return SpecificAddressRequest(ip_dict['ip_address'])
elif ip_dict.get('eui64_address'):
if ip_dict.get('eui64_address'):
return AutomaticAddressRequest(prefix=ip_dict['subnet_cidr'],
mac=ip_dict['mac'])
elif (port['device_owner'] == constants.DEVICE_OWNER_DHCP or
port['device_owner'] == constants.DEVICE_OWNER_DISTRIBUTED):
if (port['device_owner'] == constants.DEVICE_OWNER_DHCP or
port['device_owner'] == constants.DEVICE_OWNER_DISTRIBUTED):
# preserve previous behavior of DHCP ports choosing start of pool
return PreferNextAddressRequest()
else:
return AnyAddressRequest()
return AnyAddressRequest()
class SubnetRequestFactory:
@ -337,21 +336,18 @@ class SubnetRequestFactory:
subnet_id,
common_utils.ip_version_from_int(subnetpool['ip_version']),
prefixlen)
else:
alloc_pools = subnet.get('allocation_pools')
alloc_pools = (alloc_pools if validators.is_attr_set(alloc_pools)
else None)
if not cidr and gateway_ip:
prefixlen = subnet['prefixlen']
if not validators.is_attr_set(prefixlen):
prefixlen = int(subnetpool['default_prefixlen'])
gw_ip_net = netaddr.IPNetwork('%s/%s' %
(gateway_ip, prefixlen))
cidr = gw_ip_net.cidr
alloc_pools = subnet.get('allocation_pools')
alloc_pools = (
alloc_pools if validators.is_attr_set(alloc_pools) else None)
if not cidr and gateway_ip:
prefixlen = subnet['prefixlen']
if not validators.is_attr_set(prefixlen):
prefixlen = int(subnetpool['default_prefixlen'])
gw_ip_net = netaddr.IPNetwork('%s/%s' % (gateway_ip, prefixlen))
cidr = gw_ip_net.cidr
return SpecificSubnetRequest(
subnet['tenant_id'],
subnet_id,
cidr,
gateway_ip=gateway_ip,
allocation_pools=alloc_pools)
return SpecificSubnetRequest(subnet['tenant_id'],
subnet_id,
cidr,
gateway_ip=gateway_ip,
allocation_pools=alloc_pools)

7
neutron/ipam/subnet_alloc.py
View File

@ -175,11 +175,10 @@ class SubnetAllocator(driver.Pool):
if isinstance(request, ipam_req.AnySubnetRequest):
return self._allocate_any_subnet(request)
elif isinstance(request, ipam_req.SpecificSubnetRequest):
if isinstance(request, ipam_req.SpecificSubnetRequest):
return self._allocate_specific_subnet(request)
else:
msg = _("Unsupported request type")
raise exceptions.SubnetAllocationError(reason=msg)
msg = _("Unsupported request type")
raise exceptions.SubnetAllocationError(reason=msg)
def get_subnet(self, subnet_id):
raise NotImplementedError()

15
neutron/ipam/utils.py
View File

@ -23,15 +23,14 @@ def check_subnet_ip(cidr, ip_address, port_owner=''):
net = netaddr.IPNetwork(cidr)
# Check that the IP is valid on subnet. In IPv4 this cannot be the
# network or the broadcast address
if net.version == constants.IP_VERSION_6:
# NOTE(njohnston): In some cases the code cannot know the owner of the
# port. In these cases port_owner should an empty string, and we pass
# it through here.
return ((port_owner in (constants.ROUTER_PORT_OWNERS + ('', )) or
ip != net.network) and
ip in net)
else:
if net.version == constants.IP_VERSION_4:
return ip != net.network and ip != net.broadcast and ip in net
# NOTE(njohnston): In some cases the code cannot know the owner of the
# port. In these cases port_owner should an empty string, and we pass it
# through here.
return (
(port_owner in (constants.ROUTER_PORT_OWNERS + ('', )) or
ip != net.network) and ip in net)
def check_gateway_invalid_in_subnet(cidr, gateway):

3
neutron/manager.py
View File

@ -181,8 +181,7 @@ class NeutronManager(metaclass=profiler.TracedMeta):
core_plugin = directory.get_plugin()
if core_plugin.has_native_datastore():
return constants.DEFAULT_SERVICE_PLUGINS.keys()
else:
return []
return []
def _load_service_plugins(self):
"""Loads service plugins.

3
neutron/notifiers/nova.py
View File

@ -180,8 +180,7 @@ class Notifier:
if port and self._is_compute_port(port):
if action == 'delete_port':
return self._get_port_delete_event(port)
else:
return self._get_network_changed_event(port)
return self._get_network_changed_event(port)
def _can_notify(self, port):
if getattr(_notifier_store, 'enable', None) is None:

12
neutron/objects/base.py
View File

@ -733,13 +733,11 @@ class NeutronDbObject(NeutronObject, metaclass=DeclarativeObject):
if cls.has_standard_attributes():
return super().update_object(
context, values, validate_filters=False, **kwargs)
else:
with cls.db_context_writer(context):
db_obj = obj_db_api.update_object(
cls, context,
cls.modify_fields_to_db(values),
**cls.modify_fields_to_db(kwargs))
return cls._load_object(context, db_obj)
with cls.db_context_writer(context):
db_obj = obj_db_api.update_object(
cls, context, cls.modify_fields_to_db(values),
**cls.modify_fields_to_db(kwargs))
return cls._load_object(context, db_obj)
@classmethod
def update_objects(cls, context, values, validate_filters=True, **kwargs):

14
neutron/objects/ports.py
View File

@ -281,8 +281,7 @@ class IPAllocation(base.NeutronDbObject):
if first:
return alloc_qry.first()
else:
return alloc_qry.all()
return alloc_qry.all()
@base.NeutronObjectRegistry.register
@ -785,13 +784,12 @@ class Port(base.NeutronDbObject):
if not ports:
return
elif not pci_slot:
if not pci_slot:
return ports.pop()
else:
for port in ports:
for _binding in port.bindings:
if _binding.get('profile', {}).get('pci_slot') == pci_slot:
return port
for port in ports:
for _binding in port.bindings:
if _binding.get('profile', {}).get('pci_slot') == pci_slot:
return port
@classmethod
@db_api.CONTEXT_READER

2
neutron/objects/qos/policy.py
View File

@ -97,7 +97,7 @@ class QosPolicy(rbac_db.NeutronRbacObject):
def obj_load_attr(self, attrname):
if attrname == 'rules':
return self._reload_rules()
elif attrname == 'is_default':
if attrname == 'is_default':
return self._reload_is_default()
return super().obj_load_attr(attrname)

5
neutron/pecan_wsgi/controllers/utils.py
View File

@ -307,12 +307,11 @@ class ShimItemController(NeutronPecanController):
result = method(shim_request, **kwargs)
self._set_response_code(result, self.item)
return result
elif not self.controller_show:
pecan.abort(405)
else:
if self.controller_show:
result = self.controller_show(shim_request, self.item, **kwargs)
self._set_response_code(result, 'show')
return result
pecan.abort(405)
@when_delete(index)
def delete(self):

8
neutron/pecan_wsgi/hooks/policy_enforcement.py
View File

@ -62,11 +62,9 @@ def fetch_resource(method, neutron_context, controller,
if parent_id:
getter_args.append(parent_id)
return getter(*getter_args, fields=field_list)
else:
# Some legit resources, like quota, do not have a plugin yet.
# Retrieving the original object is nevertheless important
# for policy checks.
return _custom_getter(resource, resource_id)
# Some legit resources, like quota, do not have a plugin yet. Retrieving
# the original object is nevertheless important for policy checks.
return _custom_getter(resource, resource_id)
class PolicyHook(hooks.PecanHook):

2
neutron/plugins/ml2/db.py
View File

@ -240,7 +240,7 @@ def generate_distributed_port_status(context, port_id):
for bind in query.filter(models.DistributedPortBinding.port_id == port_id):
if bind.status == n_const.PORT_STATUS_ACTIVE:
return bind.status
elif bind.status == n_const.PORT_STATUS_DOWN:
if bind.status == n_const.PORT_STATUS_DOWN:
final_status = bind.status
return final_status

5
neutron/plugins/ml2/driver_context.py
View File

@ -271,9 +271,8 @@ class PortContext(MechanismDriverContext, api.PortContext):
# resolving bug 1367391?
if self._port['device_owner'] == constants.DEVICE_OWNER_DVR_INTERFACE:
return self._original_port and self._binding.host
else:
return (self._original_port and
self._original_port.get(portbindings.HOST_ID))
return (self._original_port and
self._original_port.get(portbindings.HOST_ID))
@property
def vif_type(self):

39
neutron/plugins/ml2/drivers/helpers.py
View File

@ -81,28 +81,25 @@ class SegmentTypeDriver(BaseTypeDriver):
if alloc.allocated:
# Segment already allocated
return
else:
# Segment not allocated
LOG.debug("%(type)s segment %(segment)s allocate "
"started ",
{"type": network_type,
"segment": raw_segment})
count = (context.session.query(self.model).
filter_by(allocated=False, **raw_segment).
update({"allocated": True}))
if count:
LOG.debug("%(type)s segment %(segment)s allocate "
"done ",
{"type": network_type,
"segment": raw_segment})
return alloc
# Segment not allocated
LOG.debug("%(type)s segment %(segment)s allocate started ",
{"type": network_type,
"segment": raw_segment})
count = (context.session.query(self.model).
filter_by(allocated=False, **raw_segment).
update({"allocated": True}))
if count:
LOG.debug(
"%(type)s segment %(segment)s allocate done ",
{"type": network_type, "segment": raw_segment})
return alloc
# Segment allocated or deleted since select
LOG.debug("%(type)s segment %(segment)s allocate "
"failed: segment has been allocated or "
"deleted",
{"type": network_type,
"segment": raw_segment})
# Segment allocated or deleted since select
LOG.debug("%(type)s segment %(segment)s allocate "
"failed: segment has been allocated or "
"deleted",
{"type": network_type,
"segment": raw_segment})
# Segment to create or already allocated
LOG.debug("%(type)s segment %(segment)s create started",

60
neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
View File

@ -210,9 +210,8 @@ class LinuxBridgeManager(amb.CommonAgentManagerBase):
def get_vxlan_device_name(segmentation_id):
if 0 <= int(segmentation_id) <= constants.MAX_VXLAN_VNI:
return VXLAN_INTERFACE_PREFIX + str(segmentation_id)
else:
LOG.warning("Invalid Segmentation ID: %s, will lead to "
"incorrect vxlan device name", segmentation_id)
LOG.warning("Invalid Segmentation ID: %s, will lead to "
"incorrect vxlan device name", segmentation_id)
@staticmethod
def _match_multicast_range(segmentation_id):
@ -249,10 +248,9 @@ class LinuxBridgeManager(amb.CommonAgentManagerBase):
interface = self.ensure_vlan(physical_interface, vlan_id)
if phy_bridge_name:
return self.ensure_bridge(phy_bridge_name)
else:
bridge_name = self.get_bridge_name(network_id)
if self.ensure_bridge(bridge_name, interface):
return interface
bridge_name = self.get_bridge_name(network_id)
if self.ensure_bridge(bridge_name, interface):
return interface
def ensure_vxlan_bridge(self, network_id, segmentation_id, mtu):
"""Create a vxlan and bridge unless they already exist."""
@ -281,10 +279,9 @@ class LinuxBridgeManager(amb.CommonAgentManagerBase):
"""Create a non-vlan bridge unless it already exists."""
if phy_bridge_name:
return self.ensure_bridge(phy_bridge_name)
else:
bridge_name = self.get_bridge_name(network_id)
if self.ensure_bridge(bridge_name, physical_interface):
return physical_interface
bridge_name = self.get_bridge_name(network_id)
if self.ensure_bridge(bridge_name, physical_interface):
return physical_interface
def ensure_local_bridge(self, network_id, phy_bridge_name):
"""Create a local bridge unless it already exists."""
@ -494,14 +491,13 @@ class LinuxBridgeManager(amb.CommonAgentManagerBase):
if network_type == constants.TYPE_FLAT:
return self.ensure_flat_bridge(network_id, physical_bridge,
physical_interface)
elif network_type == constants.TYPE_VLAN:
if network_type == constants.TYPE_VLAN:
return self.ensure_vlan_bridge(network_id, physical_bridge,
physical_interface,
segmentation_id)
else:
LOG.error("Unknown network_type %(network_type)s for network "
"%(network_id)s.", {network_type: network_type,
network_id: network_id})
LOG.error("Unknown network_type %(network_type)s for network "
"%(network_id)s.", {network_type: network_type,
network_id: network_id})
def add_tap_interface(self, network_id, network_type, physical_network,
segmentation_id, tap_device_name, device_owner, mtu):
@ -642,23 +638,21 @@ class LinuxBridgeManager(amb.CommonAgentManagerBase):
{'interface_name': interface_name,
'bridge_name': bridge_name})
return True
else:
if not bridge_device.owns_interface(interface_name):
LOG.debug("Cannot remove %(interface_name)s from "
"%(bridge_name)s. It is not on the bridge.",
{'interface_name': interface_name,
'bridge_name': bridge_name})
return False
msg = _("Error deleting %(interface_name)s from bridge "
"%(bridge_name)s") % {'interface_name': interface_name,
'bridge_name': bridge_name}
raise RuntimeError(msg)
else:
LOG.debug("Cannot remove device %(interface_name)s bridge "
"%(bridge_name)s does not exist",
{'interface_name': interface_name,
'bridge_name': bridge_name})
return False
if not bridge_device.owns_interface(interface_name):
LOG.debug("Cannot remove %(interface_name)s from "
"%(bridge_name)s. It is not on the bridge.",
{'interface_name': interface_name,
'bridge_name': bridge_name})
return False
msg = _("Error deleting %(interface_name)s from bridge "
"%(bridge_name)s") % {'interface_name': interface_name,
'bridge_name': bridge_name}
raise RuntimeError(msg)
LOG.debug("Cannot remove device %(interface_name)s bridge "
"%(bridge_name)s does not exist",
{'interface_name': interface_name,
'bridge_name': bridge_name})
return False
def delete_interface(self, interface):
device = self.ip.device(interface)

3
neutron/plugins/ml2/drivers/macvtap/mech_driver/mech_macvtap.py
View File

@ -76,8 +76,7 @@ class MacvtapMechanismDriver(mech_agent.SimpleAgentMechanismDriverBase):
if port_profile and port_profile.get('migrating_to', None):
LOG.debug("Live migration with profile %s detected.", port_profile)
return True
else:
return False
return False
def try_to_bind_segment_for_agent(self, context, segment, agent):
if self.check_segment_for_agent(segment, agent):

3
neutron/plugins/ml2/drivers/mech_agent.py
View File

@ -331,8 +331,7 @@ class SimpleAgentMechanismDriverBase(AgentMechanismDriverBase,
self.get_vif_type(context, agent, segment),
self.get_vif_details(context, agent, segment))
return True
else:
return False
return False
def get_vif_details(self, context, agent, segment):
return self.vif_details

7
neutron/plugins/ml2/drivers/mech_sriov/agent/eswitch_manager.py
View File

@ -471,10 +471,9 @@ class ESwitchManager:
LOG.info("Device %s has 0 VFs configured. Skipping "
"for now to let the device initialize", dev_name)
return
else:
# looks like device indeed has 0 VFs configured
# it is probably used just as direct-physical
LOG.info("Device %s has 0 VFs configured", dev_name)
# looks like device indeed has 0 VFs configured it is probably used
# just as direct-physical
LOG.info("Device %s has 0 VFs configured", dev_name)
numvfs_cur = len(embedded_switch.scanned_pci_list)
if numvfs >= 0 and numvfs > numvfs_cur:

6
neutron/plugins/ml2/drivers/mech_sriov/mech_driver/mech_driver.py
View File

@ -110,9 +110,9 @@ class SriovNicSwitchMechanismDriver(mech_agent.SimpleAgentMechanismDriverBase):
"""
if 'device_mappings' in agent['configurations']:
return agent['configurations']['device_mappings']
else:
raise ValueError(_('Cannot standardize device mappings of agent '
'type: %s'), agent['agent_type'])
raise ValueError(
_('Cannot standardize device mappings of agent type: %s'),
agent['agent_type'])
def bind_port(self, context):
LOG.debug("Attempting to bind port %(port)s on "

2
neutron/plugins/ml2/drivers/openvswitch/agent/extension_drivers/qos_driver.py
View File

@ -433,7 +433,7 @@ class QosOVSAgentDriver(qos.QosLinuxAgentDriver,
'vif_port was not found. It seems that port is already '
'deleted', port.get('port_id'))
return
elif not port.get('physical_network'):
if not port.get('physical_network'):
LOG.debug('update_minimum_bandwidth was received for port %s but '
'has no physical network associated',
port.get('port_id'))

6
neutron/plugins/ml2/drivers/openvswitch/agent/openflow/native/br_int.py
View File

@ -225,8 +225,7 @@ class OVSIntegrationBridge(ovs_bridge.OVSAgentBridge,
def _dvr_dst_mac_table_id(network_type):
if network_type in constants.DVR_PHYSICAL_NETWORK_TYPES:
return constants.ARP_DVR_MAC_TO_DST_MAC_PHYSICAL
else:
return constants.ARP_DVR_MAC_TO_DST_MAC
return constants.ARP_DVR_MAC_TO_DST_MAC
def install_dvr_dst_mac_for_arp(self, network_type,
vlan_tag, gateway_mac, dvr_mac, rtr_port):
@ -262,8 +261,7 @@ class OVSIntegrationBridge(ovs_bridge.OVSAgentBridge,
def _dvr_to_src_mac_table_id(network_type):
if network_type in constants.DVR_PHYSICAL_NETWORK_TYPES:
return constants.DVR_TO_SRC_MAC_PHYSICAL
else:
return constants.DVR_TO_SRC_MAC
return constants.DVR_TO_SRC_MAC
def install_dvr_to_src_mac(self, network_type,
vlan_tag, gateway_mac, dst_mac, dst_port):

22
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
View File

@ -1412,14 +1412,13 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin,
except vlanmanager.VifIdNotFound:
LOG.info('net_uuid %s not managed by VLAN manager',
net_uuid)
if net_uuid:
# TODO(sahid); This needs to be fixed. It supposes a segment
# per network per host. Basically this code is to avoid
# changing logic which is not the aim of this commit.
segs = self.vlan_manager.get_segments(net_uuid)
lvm = self.vlan_manager.get(net_uuid, list(segs.keys())[0])
else:
if not net_uuid:
return None, None, None
# TODO(sahid); This needs to be fixed. It supposes a segment per
# network per host. Basically this code is to avoid changing logic
# which is not the aim of this commit.
segs = self.vlan_manager.get_segments(net_uuid)
lvm = self.vlan_manager.get(net_uuid, list(segs.keys())[0])
if vif_id in lvm.vif_ports:
vif_port = lvm.vif_ports[vif_id]
@ -2443,11 +2442,10 @@ class OVSNeutronAgent(l2population_rpc.L2populationRpcCallBackTunnelMixin,
# We cannot change this from 8, since it could break
# backwards-compatibility
return '%08x' % addr
else:
# Create 32-bit Base32 encoded hash
blake2b = hashlib.blake2b(ip_address.encode(), digest_size=20)
iphash = base64.b32encode(blake2b.digest())
return iphash[:hashlen].decode().lower()
# Create 32-bit Base32 encoded hash
blake2b = hashlib.blake2b(ip_address.encode(), digest_size=20)
iphash = base64.b32encode(blake2b.digest())
return iphash[:hashlen].decode().lower()
except Exception:
LOG.warning("Invalid remote IP: %s", ip_address)
return

6
neutron/plugins/ml2/drivers/openvswitch/mech_driver/mech_openvswitch.py
View File

@ -105,9 +105,9 @@ class OpenvswitchMechanismDriver(mech_agent.SimpleAgentMechanismDriverBase):
if 'bridge_mappings' in agent['configurations']:
return {k: [v] for k, v in
agent['configurations']['bridge_mappings'].items()}
else:
raise ValueError(_('Cannot standardize bridge mappings of agent '
'type: %s'), agent['agent_type'])
raise ValueError(
_('Cannot standardize bridge mappings of agent type: %s'),
agent['agent_type'])
def check_vlan_transparency(self, context):
"""Currently Openvswitch driver doesn't support vlan transparency."""

14
neutron/plugins/ml2/drivers/ovn/mech_driver/mech_driver.py
View File

@ -1431,7 +1431,7 @@ class OVNMechanismDriver(api.MechanismDriver):
LOG.debug('Chassis %s is reponsible of the resource provider '
'%s', ch_name, ch_rp)
return True
elif len(states) > 1:
if len(states) > 1:
rps = {state[0]: placement_ext.dict_chassis_config(state[1])
for state in states}
LOG.error('Several chassis reported the requested resource '
@ -1464,17 +1464,13 @@ def update_agent(self, context, id, agent, _driver=None):
# and we can just fall through to raising in the case that admin_state_up
# is being set to False, otherwise the end-state will be fine
if not agent.get('admin_state_up', True):
pass
elif 'description' in agent:
raise n_exc.BadRequest(resource='agent',
msg='OVN agent status cannot be updated')
if 'description' in agent:
_driver.sb_ovn.set_chassis_neutron_description(
chassis_name, agent['description'],
agent_type).execute(check_error=True)
return agent
else:
# admin_state_up=True w/o description
return agent
raise n_exc.BadRequest(resource='agent',
msg='OVN agent status cannot be updated')
return agent
def delete_agent(self, context, id, _driver=None):

42
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/commands.py
View File

@ -77,31 +77,27 @@ def get_lsp_dhcp_options_uuids(lsp, lsp_name):
def _add_gateway_chassis(api, txn, lrp_name, val):
gateway_chassis = api._tables.get('Gateway_Chassis')
if gateway_chassis:
prio = len(val)
uuid_list = []
for chassis in val:
gwc_name = '{}_{}'.format(lrp_name, chassis)
try:
gwc = idlutils.row_by_value(api.idl,
'Gateway_Chassis',
'name', gwc_name)
except idlutils.RowNotFound:
gwc = txn.insert(gateway_chassis)
gwc.name = gwc_name
gwc.chassis_name = chassis
gwc.priority = prio
LOG.info(
"Schedule LRP %(lrp)s on gateway %(gtw)s with priority"
" %(prio)s",
{"lrp": lrp_name, "gtw": chassis, "prio": prio},
)
prio = prio - 1
uuid_list.append(gwc.uuid)
return 'gateway_chassis', uuid_list
else:
if not gateway_chassis:
chassis = {ovn_const.OVN_GATEWAY_CHASSIS_KEY: val[0]}
return 'options', chassis
prio = len(val)
uuid_list = []
for chassis in val:
gwc_name = '{}_{}'.format(lrp_name, chassis)
try:
gwc = idlutils.row_by_value(
api.idl, 'Gateway_Chassis', 'name', gwc_name)
except idlutils.RowNotFound:
gwc = txn.insert(gateway_chassis)
gwc.name = gwc_name
gwc.chassis_name = chassis
gwc.priority = prio
LOG.info(
"Schedule LRP %(lrp)s on gateway %(gtw)s with priority %(prio)s",
{"lrp": lrp_name, "gtw": chassis, "prio": prio})
prio = prio - 1
uuid_list.append(gwc.uuid)
return 'gateway_chassis', uuid_list
class CheckLivenessCommand(command.BaseCommand):

4
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/extensions/placement.py
View File

@ -132,9 +132,9 @@ class ChassisBandwidthConfigEvent(row_event.RowEvent):
if (not self.placement_extension or
not self.placement_extension.enabled):
return False
elif event == self.ROW_CREATE:
if event == self.ROW_CREATE:
return True
elif event == self.ROW_UPDATE and old and hasattr(old, 'other_config'):
if event == self.ROW_UPDATE and old and hasattr(old, 'other_config'):
row_bw = _parse_ovn_cms_options(row)
old_bw = _parse_ovn_cms_options(old)
if row_bw != old_bw:

3
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/extensions/qos.py
View File

@ -241,8 +241,7 @@ class OVNClientQosExtension:
if port.get('qos_policy_id'):
return port['qos_policy_id'], 'port'
else:
return port['qos_network_policy_id'], 'network'
return port['qos_network_policy_id'], 'network'
def _delete_port_qos_rules(self, txn, port_id, network_id, lsp=None,
port_deleted=False):

9
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/impl_idl_ovn.py
View File

@ -294,9 +294,7 @@ class OvsdbNbOvnIdl(nb_impl_idl.OvnNbApiIdlImpl, Backend):
if lport_name is not None:
return cmd.DelLSwitchPortCommand(self, lport_name,
lswitch_name, if_exists)
else:
raise RuntimeError(_("Currently only supports "
"delete by lport-name"))
raise RuntimeError(_("Currently only supports delete by lport-name"))
def get_all_logical_switches_with_ports(self):
result = []
@ -1045,9 +1043,8 @@ class OvsdbSbOvnIdl(sb_impl_idl.OvnSbApiIdlImpl, Backend):
return [r for r in rows
if r.chassis and r.chassis[0].name == chassis or
chassis in [ch.name for ch in r.additional_chassis]]
else:
return [r for r in rows
if r.chassis and r.chassis[0].name == chassis]
return [r for r in rows
if r.chassis and r.chassis[0].name == chassis]
def get_chassis_host_for_port(self, port_id):
chassis = set()

2
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py
View File

@ -1379,7 +1379,7 @@ class OVNClient:
route_bfd = getattr(route, 'bfd', [])
if router_default_route_bfd and not route_bfd:
return True
elif route_bfd and not router_default_route_bfd:
if route_bfd and not router_default_route_bfd:
return True
return False

2
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovsdb_monitor.py
View File

@ -151,7 +151,7 @@ class ChassisEvent(row_event.RowEvent):
self.driver.nb_ovn.ha_chassis_group_del_chassis(
hcg.name, row.name, if_exists=True))
return
elif not is_gw_chassis and is_old_gw:
if not is_gw_chassis and is_old_gw:
# Chassis is not a gateway anymore, treat it as deletion
event = self.ROW_DELETE
elif is_gw_chassis and not is_old_gw:

102
neutron/plugins/ml2/drivers/type_tunnel.py
View File

@ -429,58 +429,7 @@ class TunnelRpcCallbackMixin:
raise exc.InvalidInput(error_message=msg)
driver = self._type_manager.drivers.get(tunnel_type)
if driver:
# The given conditional statements will verify the following
# things:
# 1. If host is not passed from an agent, it is a legacy mode.
# 2. If passed host and tunnel_ip are not found in the DB,
# it is a new endpoint.
# 3. If host is passed from an agent and it is not found in DB
# but the passed tunnel_ip is found, delete the endpoint
# from DB and add the endpoint with (tunnel_ip, host),
# it is an upgrade case.
# 4. If passed host is found in DB and passed tunnel ip is not
# found, delete the endpoint belonging to that host and
# add endpoint with latest (tunnel_ip, host), it is a case
# where local_ip of an agent got changed.
# 5. If the passed host had another ip in the DB the host-id has
# roamed to a different IP then delete any reference to the new
# local_ip or the host id. Don't notify tunnel_delete for the
# old IP since that one could have been taken by a different
# agent host-id (neutron-ovs-cleanup should be used to clean up
# the stale endpoints).
# Finally create a new endpoint for the (tunnel_ip, host).
if host:
host_endpoint = driver.obj.get_endpoint_by_host(host)
ip_endpoint = driver.obj.get_endpoint_by_ip(tunnel_ip)
if (ip_endpoint and ip_endpoint.host is None and
host_endpoint is None):
driver.obj.delete_endpoint(ip_endpoint.ip_address)
elif (ip_endpoint and ip_endpoint.host != host):
LOG.info(
"Tunnel IP %(ip)s was used by host %(host)s and "
"will be assigned to %(new_host)s",
{'ip': ip_endpoint.ip_address,
'host': ip_endpoint.host,
'new_host': host})
driver.obj.delete_endpoint_by_host_or_ip(
host, ip_endpoint.ip_address)
elif (host_endpoint and host_endpoint.ip_address != tunnel_ip):
# Notify all other listening agents to delete stale tunnels
self._notifier.tunnel_delete(
rpc_context, host_endpoint.ip_address, tunnel_type)
driver.obj.delete_endpoint(host_endpoint.ip_address)
tunnel = driver.obj.add_endpoint(tunnel_ip, host)
tunnels = driver.obj.get_endpoints()
entry = {'tunnels': tunnels}
# Notify all other listening agents
self._notifier.tunnel_update(rpc_context, tunnel.ip_address,
tunnel_type)
# Return the list of tunnels IP's to the agent
return entry
else:
if not driver:
msg = (_("Network type value %(type)s not supported, "
"host: %(host)s with tunnel IP: %(ip)s") %
{'type': tunnel_type,
@ -488,6 +437,55 @@ class TunnelRpcCallbackMixin:
'ip': tunnel_ip})
raise exc.InvalidInput(error_message=msg)
# The given conditional statements will verify the following things:
# 1. If host is not passed from an agent, it is a legacy mode.
# 2. If passed host and tunnel_ip are not found in the DB, it is a new
# endpoint.
# 3. If host is passed from an agent and it is not found in DB but the
# passed tunnel_ip is found, delete the endpoint from DB and add the
# endpoint with (tunnel_ip, host), it is an upgrade case.
# 4. If passed host is found in DB and passed tunnel ip is not found,
# delete the endpoint belonging to that host and add endpoint with
# latest (tunnel_ip, host), it is a case where local_ip of an agent
# got changed.
# 5. If the passed host had another ip in the DB the host-id has roamed
# to a different IP then delete any reference to the new local_ip or
# the host id. Don't notify tunnel_delete for the old IP since that
# one could have been taken by a different agent host-id
# (neutron-ovs-cleanup should be used to clean up the stale
# endpoints). Finally create a new endpoint for the (tunnel_ip,
# host).
if host:
host_endpoint = driver.obj.get_endpoint_by_host(host)
ip_endpoint = driver.obj.get_endpoint_by_ip(tunnel_ip)
if (ip_endpoint and ip_endpoint.host is None and
host_endpoint is None):
driver.obj.delete_endpoint(ip_endpoint.ip_address)
elif (ip_endpoint and ip_endpoint.host != host):
LOG.info(
"Tunnel IP %(ip)s was used by host %(host)s and "
"will be assigned to %(new_host)s",
{'ip': ip_endpoint.ip_address,
'host': ip_endpoint.host,
'new_host': host})
driver.obj.delete_endpoint_by_host_or_ip(
host, ip_endpoint.ip_address)
elif (host_endpoint and host_endpoint.ip_address != tunnel_ip):
# Notify all other listening agents to delete stale tunnels
self._notifier.tunnel_delete(
rpc_context, host_endpoint.ip_address, tunnel_type)
driver.obj.delete_endpoint(host_endpoint.ip_address)
tunnel = driver.obj.add_endpoint(tunnel_ip, host)
tunnels = driver.obj.get_endpoints()
entry = {'tunnels': tunnels}
# Notify all other listening agents
self._notifier.tunnel_update(rpc_context, tunnel.ip_address,
tunnel_type)
# Return the list of tunnels IP's to the agent
return entry
class TunnelAgentRpcApiMixin:

3
neutron/plugins/ml2/extensions/dns_integration.py
View File

@ -461,8 +461,7 @@ def _filter_by_subnet(context, fixed_ips):
subnet_filtered.append(str(ip['ip_address']))
if filter_fixed_ips:
return subnet_filtered
else:
return [str(ip['ip_address']) for ip in fixed_ips]
return [str(ip['ip_address']) for ip in fixed_ips]
def _create_port_in_external_dns_service(resource, event,

41
neutron/plugins/ml2/managers.py
View File

@ -76,12 +76,11 @@ class TypeManager(stevedore.named.NamedExtensionManager):
def _check_tenant_network_types(self, types):
self.tenant_network_types = []
for network_type in types:
if network_type in self.drivers:
self.tenant_network_types.append(network_type)
else:
if network_type not in self.drivers:
LOG.error("No type driver for tenant network_type: %s. "
"Service terminated!", network_type)
raise SystemExit(1)
self.tenant_network_types.append(network_type)
LOG.info("Tenant network_types: %s", self.tenant_network_types)
def _check_external_network_type(self, ext_network_type):
@ -114,11 +113,11 @@ class TypeManager(stevedore.named.NamedExtensionManager):
raise mpnet_exc.SegmentsSetInConjunctionWithProviders()
segment = self._get_provider_segment(network)
return [self._process_provider_segment(segment)]
elif validators.is_attr_set(network.get(mpnet_apidef.SEGMENTS)):
if validators.is_attr_set(network.get(mpnet_apidef.SEGMENTS)):
segments = [self._process_provider_segment(s)
for s in network[mpnet_apidef.SEGMENTS]]
mpnet_apidef.check_duplicate_segments(
segments, self.is_partial_segment)
mpnet_apidef.check_duplicate_segments(segments,
self.is_partial_segment)
return segments
def _match_segment(self, segment, filters):
@ -290,20 +289,18 @@ class TypeManager(stevedore.named.NamedExtensionManager):
def is_partial_segment(self, segment):
network_type = segment[api.NETWORK_TYPE]
driver = self.drivers.get(network_type)
if driver:
return driver.obj.is_partial_segment(segment)
else:
if not driver:
msg = _("network_type value '%s' not supported") % network_type
raise exc.InvalidInput(error_message=msg)
return driver.obj.is_partial_segment(segment)
def validate_provider_segment(self, segment):
network_type = segment[api.NETWORK_TYPE]
driver = self.drivers.get(network_type)
if driver:
driver.obj.validate_provider_segment(segment)
else:
if not driver:
msg = _("network_type value '%s' not supported") % network_type
raise exc.InvalidInput(error_message=msg)
driver.obj.validate_provider_segment(segment)
def reserve_provider_segment(self, context, segment, filters=None):
network_type = segment.get(api.NETWORK_TYPE)
@ -311,16 +308,13 @@ class TypeManager(stevedore.named.NamedExtensionManager):
if isinstance(driver.obj, api.TypeDriver):
return driver.obj.reserve_provider_segment(context.session,
segment, filters)
else:
return driver.obj.reserve_provider_segment(context,
segment, filters)
return driver.obj.reserve_provider_segment(context, segment, filters)
def _allocate_segment(self, context, network_type, filters=None):
driver = self.drivers.get(network_type)
if isinstance(driver.obj, api.TypeDriver):
return driver.obj.allocate_tenant_segment(context.session, filters)
else:
return driver.obj.allocate_tenant_segment(context, filters)
return driver.obj.allocate_tenant_segment(context, filters)
def _allocate_tenant_net_segment(self, context, filters=None):
for network_type in self.tenant_network_types:
@ -887,13 +881,12 @@ class MechanismManager(stevedore.named.NamedExtensionManager):
if self._bind_port_level(context, level + 1,
next_segments):
return True
else:
LOG.warning("Failed to bind port %(port)s on "
"host %(host)s at level %(lvl)s",
{'port': context.current['id'],
'host': context.host,
'lvl': level + 1})
context._pop_binding_level()
LOG.warning("Failed to bind port %(port)s on "
"host %(host)s at level %(lvl)s",
{'port': context.current['id'],
'host': context.host,
'lvl': level + 1})
context._pop_binding_level()
else:
# NOTE(bence romsics): Consider: "In case of
# hierarchical port binding binding_profile.allocation

15
neutron/plugins/ml2/plugin.py
View File

@ -490,8 +490,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
orig_port['device_id'] != ''):
port['mac_address'] = self._generate_macs()[0]
return True
else:
return False
return False
@registry.receives(resources.AGENT, [events.AFTER_UPDATE])
def _retry_binding_revived_agents(self, resource, event, trigger,
@ -2507,13 +2506,11 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
return port
LOG.debug("No binding found for DVR port %s", port['id'])
return
else:
port_host = db.get_port_binding_host(context, port_id)
ret_val = port if (port_host == host) else None
if not ret_val:
LOG.debug('The host %s is not matching for port %s host %s!',
host, port_id, port_host)
return ret_val
port_host = db.get_port_binding_host(context, port_id)
if port_host == host:
return port
LOG.debug('The host %s is not matching for port %s host %s!',
host, port_id, port_host)
@db_api.retry_if_session_inactive()
def get_ports_from_devices(self, context, devices):

19
neutron/plugins/ml2/rpc.py
View File

@ -313,16 +313,15 @@ class RpcCallbacks(type_tunnel.TunnelRpcCallbackMixin):
if not port:
LOG.debug("Port %s not found, will not notify nova.", port_id)
return
else:
if port.device_owner.startswith(
n_const.DEVICE_OWNER_COMPUTE_PREFIX):
# NOTE(haleyb): It is possible for a test to override a
# config option after the plugin has been initialized so
# the nova_notifier attribute is not set on the plugin.
if (cfg.CONF.notify_nova_on_port_status_changes and
hasattr(plugin, 'nova_notifier')):
plugin.nova_notifier.notify_port_active_direct(port)
return
if port.device_owner.startswith(
n_const.DEVICE_OWNER_COMPUTE_PREFIX):
# NOTE(haleyb): It is possible for a test to override a
# config option after the plugin has been initialized so
# the nova_notifier attribute is not set on the plugin.
if (cfg.CONF.notify_nova_on_port_status_changes and
hasattr(plugin, 'nova_notifier')):
plugin.nova_notifier.notify_port_active_direct(port)
return
else:
self.update_port_status_to_active(port, rpc_context, port_id, host)
self.notify_l2pop_port_wiring(port_id, rpc_context,

8
neutron/privileged/agent/linux/__init__.py
View File

@ -45,13 +45,13 @@ def make_serializable(value):
if isinstance(value, list):
return [make_serializable(item) for item in value]
elif isinstance(value, netlink.nla_slot):
if isinstance(value, netlink.nla_slot):
return [_ensure_string(value[0]), make_serializable(value[1])]
elif isinstance(value, netlink.nla_base):
if isinstance(value, netlink.nla_base):
return make_serializable(value.dump())
elif isinstance(value, dict):
if isinstance(value, dict):
return {_ensure_string(key): make_serializable(data)
for key, data in value.items()}
elif isinstance(value, tuple):
if isinstance(value, tuple):
return tuple(make_serializable(item) for item in value)
return _ensure_string(value)

12
neutron/privileged/agent/linux/ip_lib.py
View File

@ -147,8 +147,7 @@ def get_iproute(namespace):
if namespace:
# do not try and create the namespace
return nslink.NetNS(namespace, flags=0, libc=priv_linux.get_cdll())
else:
return iproute.IPRoute()
return iproute.IPRoute()
@privileged.default.entrypoint
@ -338,9 +337,7 @@ def delete_ip_addresses(cidrs, device, namespace):
# NetlinkError with code EADDRNOTAVAIL (99, 'Cannot assign
# requested address')
# this shouldn't raise an error
if e.code == errno.EADDRNOTAVAIL:
pass
else:
if e.code != errno.EADDRNOTAVAIL:
raise
@ -588,9 +585,8 @@ def create_netns(name, **kwargs):
except Exception:
os._exit(1)
os._exit(0)
else:
if os.waitpid(pid, 0)[1]:
raise RuntimeError(_('Error creating namespace %s' % name))
if os.waitpid(pid, 0)[1]:
raise RuntimeError(_('Error creating namespace %s' % name))
@privileged.namespace_cmd.entrypoint

12
neutron/quota/resource_registry.py
View File

@ -173,13 +173,11 @@ class ResourceRegistry:
return resource.CountableResource(
resource_name, resource._count_resource,
'quota_%s' % resource_name)
else:
LOG.info("Creating instance of TrackedResource for "
"resource:%s", resource_name)
return resource.TrackedResource(
resource_name,
self._tracked_resource_mappings[resource_name],
'quota_%s' % resource_name)
LOG.info("Creating instance of TrackedResource for resource:%s",
resource_name)
return resource.TrackedResource(
resource_name, self._tracked_resource_mappings[resource_name],
'quota_%s' % resource_name)
def set_tracked_resource(self, resource_name, model_class, override=False):
# Do not do anything if tracking is disabled by config

2
neutron/scheduler/l3_agent_scheduler.py
View File

@ -222,7 +222,7 @@ class L3Scheduler(metaclass=abc.ABCMeta):
plugin, context, sync_router)
if not candidates:
return
elif sync_router.get('ha', False):
if sync_router.get('ha', False):
chosen_agents = self._bind_ha_router(plugin, context,
router_id,
sync_router.get('tenant_id'),

Some files were not shown because too many files have changed in this diff Show More