From patchwork Mon Nov 14 09:24:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nickcooper-zhangtonghao X-Patchwork-Id: 694429 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tHQBv3R4tz9t0G for ; Mon, 14 Nov 2016 20:26:47 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 969C7C05; Mon, 14 Nov 2016 09:24:44 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 9015FBE0 for ; Mon, 14 Nov 2016 09:24:43 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from smtpbg65.qq.com (smtpbg65.qq.com [103.7.28.233]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 6668C214 for ; Mon, 14 Nov 2016 09:24:41 +0000 (UTC) X-QQ-mid: bizesmtp9t1479115468t7ouc6c8h Received: from localhost.localdomain.localdoma (unknown [106.120.127.11]) by esmtp4.qq.com (ESMTP) with id ; Mon, 14 Nov 2016 17:24:27 +0800 (CST) X-QQ-SSF: 01100000002000209350B00A0000000 X-QQ-FEAT: QX/rXDl9P1uEGt6NGAXEYAc7QfBPijIoh1mSN4JGWndE+Tt48acp+Jmw5Fbg1 ts3qmeigvmjZ8wgbLpxcd+VLY36w0WE7Agx78CqAsmozW2OW9Ai8LQ6ozdbnu7Sb1uDnbDd 9A7csI4fRAoVqjsg+zN7sOhJg42D78R2WJR3fjUhVQpBx89/v7iCRniHZiZk+nZ2Qs+RRvg c0m+DFsQp/xTrgYMXQo/ns8BvkRPFP+uN77jnvrik5hRBefo6f1GFuzFOfC2YnE4eM8GktM PZqWXS/01z6sb3 X-QQ-GoodBg: 0 From: nickcooper-zhangtonghao To: ovs-dev@openvswitch.org Date: Mon, 14 Nov 2016 01:24:13 -0800 Message-Id: <1479115454-48163-4-git-send-email-nic@opencloud.tech> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1479115454-48163-1-git-send-email-nic@opencloud.tech> References: <1479115454-48163-1-git-send-email-nic@opencloud.tech> X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: nickcooper-zhangtonghao Subject: [ovs-dev] [PATCH v2 3/4] ovs-tcpdump: destroy_mirror should really destroy the mirror. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Signed-off-by: nickcooper-zhangtonghao Acked-by: Aaron Conole --- utilities/ovs-tcpdump.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utilities/ovs-tcpdump.in b/utilities/ovs-tcpdump.in index c189bc8..96aa1e2 100755 --- a/utilities/ovs-tcpdump.in +++ b/utilities/ovs-tcpdump.in @@ -230,7 +230,8 @@ class OVSDB(object): (port_name, txn.get_error())) self._txn = None - def destroy_mirror(self, mirror_name, bridge_name): + def destroy_mirror(self, intf_name, bridge_name): + mirror_name = 'm_%s' % intf_name if not self.mirror_exists(mirror_name): return txn = self._start_txn() @@ -433,7 +434,7 @@ def main(): raise KeyboardInterrupt except KeyboardInterrupt: pipes.terminate() - ovsdb.destroy_mirror('m%s' % interface, ovsdb.port_bridge(interface)) + ovsdb.destroy_mirror(interface, ovsdb.port_bridge(interface)) ovsdb.destroy_port(mirror_interface, ovsdb.port_bridge(interface)) except Exception: print("Unable to tear down the ports and mirrors.")