From 02f33380a827bd900eb3f34fb7d84d266227a725 Mon Sep 17 00:00:00 2001 From: Cedric Brandily Date: Wed, 25 Nov 2015 22:17:52 +0100 Subject: [PATCH] Move a note to bridge_lib This change moves a note from linuxbridge agent[1] to bridge_lib which was forgotten in a previous change[2]. [1] neutron.plugins.ml2.drivers.linuxbridge.agent.linuxbridge_neutron_agent [2] Ieccb8f77fc833467a166557e227023f5c2a50d1b Partial-Bug: #1514548 Change-Id: I1562b75ce07eec280824cdfe6b8aba80c9d9170c --- neutron/agent/linux/bridge_lib.py | 2 ++ .../ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neutron/agent/linux/bridge_lib.py b/neutron/agent/linux/bridge_lib.py index 6a093da01..13610f4cf 100644 --- a/neutron/agent/linux/bridge_lib.py +++ b/neutron/agent/linux/bridge_lib.py @@ -20,6 +20,8 @@ import os from neutron.agent.linux import ip_lib +# NOTE(toabctl): Don't use /sys/devices/virtual/net here because not all tap +# devices are listed here (i.e. when using Xen) BRIDGE_FS = "/sys/class/net/" BRIDGE_INTERFACE_FS = BRIDGE_FS + "%(bridge)s/brif/%(interface)s" BRIDGE_INTERFACES_FS = BRIDGE_FS + "%s/brif/" diff --git a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py index 9036e27fb..3d0a3c31b 100644 --- a/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py +++ b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py @@ -58,8 +58,6 @@ from neutron.plugins.ml2.drivers.linuxbridge.agent.common \ LOG = logging.getLogger(__name__) BRIDGE_NAME_PREFIX = "brq" -# NOTE(toabctl): Don't use /sys/devices/virtual/net here because not all tap -# devices are listed here (i.e. when using Xen) VXLAN_INTERFACE_PREFIX = "vxlan-" -- 2.45.2