From patchwork Tue May 24 01:11:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 625455 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3rDHRc0cSzz9sxb for ; Tue, 24 May 2016 11:11:24 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 9B1BE108C5; Mon, 23 May 2016 18:11:22 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 971641057D for ; Mon, 23 May 2016 18:11:20 -0700 (PDT) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id 22C53420439 for ; Mon, 23 May 2016 19:11:20 -0600 (MDT) X-ASG-Debug-ID: 1464052278-09eadd02f1580880001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar5.cudamail.com with ESMTP id RdIlSzI5ySbGQOca (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 23 May 2016 19:11:18 -0600 (MDT) X-Barracuda-Envelope-From: joe@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO relay3-d.mail.gandi.net) (217.70.183.195) by mx1-pf2.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 24 May 2016 01:11:18 -0000 Received-SPF: pass (mx1-pf2.cudamail.com: SPF record at ovn.org designates 217.70.183.195 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.195 X-Barracuda-RBL-IP: 217.70.183.195 Received: from mfilter23-d.gandi.net (mfilter23-d.gandi.net [217.70.178.151]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id 20826A80C7; Tue, 24 May 2016 03:11:17 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter23-d.gandi.net Received: from relay3-d.mail.gandi.net ([IPv6:::ffff:217.70.183.195]) by mfilter23-d.gandi.net (mfilter23-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id jQ6qlDxDkcPr; Tue, 24 May 2016 03:11:15 +0200 (CEST) X-Originating-IP: 208.91.1.34 Received: from archer.eng.vmware.com (unknown [208.91.1.34]) (Authenticated sender: joe@ovn.org) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id BF821A80C0; Tue, 24 May 2016 03:11:14 +0200 (CEST) X-CudaMail-Envelope-Sender: joe@ovn.org From: Joe Stringer To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E2-522070289 X-CudaMail-DTE: 052316 X-CudaMail-Originating-IP: 217.70.183.195 Date: Mon, 23 May 2016 18:11:03 -0700 X-ASG-Orig-Subj: [##CM-E2-522070289##][PATCH] ovs-vtep: Make compatible with python2.7 and 3. Message-Id: <1464052263-15063-1-git-send-email-joe@ovn.org> X-Mailer: git-send-email 2.8.2 X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1464052278 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH] ovs-vtep: Make compatible with python2.7 and 3. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Translate commandline calls to UTF-8, appease flake8 and use six's integer types. This allows the testsuite to pass when using python3 as your default system python version. Signed-off-by: Joe Stringer --- CC: Darrell Ball --- vtep/ovs-vtep | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/vtep/ovs-vtep b/vtep/ovs-vtep index 61079491b254..e52c66f26614 100755 --- a/vtep/ovs-vtep +++ b/vtep/ovs-vtep @@ -22,7 +22,6 @@ import shlex import subprocess import sys import time -import types import ovs.dirs import ovs.util @@ -58,7 +57,7 @@ def call_prog(prog, args_list): if len(output) == 0 or output[0] is None: output = "" else: - output = output[0].strip() + output = output[0].decode().strip() return output @@ -101,9 +100,9 @@ class Logical_Switch(object): def setup_ls(self): column = vtep_ctl("--columns=tunnel_key find logical_switch " - "name=%s" % self.name) + "name=%s" % self.name) tunnel_key = column.partition(":")[2].strip() - if tunnel_key and isinstance(eval(tunnel_key), types.IntType): + if tunnel_key and isinstance(eval(tunnel_key), six.integer_types): self.tunnel_key = tunnel_key vlog.info("using tunnel key %s in %s" % (self.tunnel_key, self.name)) @@ -140,7 +139,7 @@ class Logical_Switch(object): for tunnel in self.unknown_dsts: port_no = self.tunnels[tunnel][0] ovs_ofctl("add-flow %s table=1,priority=1,in_port=%s,action=%s" - % (self.short_name, port_no, ",".join(flood_ports))) + % (self.short_name, port_no, ",".join(flood_ports))) # Traffic coming from a VTEP physical port should always be flooded to # all the other physical ports that belong to that VTEP device and @@ -217,7 +216,7 @@ class Logical_Switch(object): port_no, tun_name, remote_ip = self.tunnels[tunnel] ovs_ofctl("del-flows %s table=0,in_port=%s" - % (self.short_name, port_no)) + % (self.short_name, port_no)) ovs_vsctl("del-port %s %s" % (self.short_name, tun_name)) del_bfd(remote_ip) @@ -349,9 +348,9 @@ class Logical_Switch(object): for mapfrom, mapto in six.iteritems(stats_map): value = ovs_vsctl("get interface %s statistics:%s" - % (interface, mapfrom)).strip('"') + % (interface, mapfrom)).strip('"') vtep_ctl("set logical_binding_stats %s %s=%s" - % (uuid, mapto, value)) + % (uuid, mapto, value)) def run(self): self.update_local_macs() @@ -465,7 +464,7 @@ def run_bfd(): for key, default in six.iteritems(bfd_params_default): column = vtep_ctl("--if-exists get tunnel %s %s" - % (tunnel, key)) + % (tunnel, key)) if not column: bfd_params_values[key] = default else: @@ -492,7 +491,7 @@ def run_bfd(): # Add the defaults as described in VTEP schema to make it explicit. bfd_lconf_default = {'bfd_config_local:bfd_dst_ip': '169.254.1.0', 'bfd_config_local:bfd_dst_mac': - '00:23:20:00:00:01'} + '00:23:20:00:00:01'} for key, value in six.iteritems(bfd_lconf_default): vtep_ctl("set tunnel %s %s=%s" % (tunnel, key, value)) @@ -504,15 +503,15 @@ def run_bfd(): bfd_dst_ip = "169.254.1.1" bfd_dst_mac = vtep_ctl("--if-exists get tunnel %s " - "bfd_config_remote:bfd_dst_mac" % (tunnel)) + "bfd_config_remote:bfd_dst_mac" % (tunnel)) if not bfd_dst_mac: bfd_dst_mac = "00:23:20:00:00:01" ovs_vsctl("set interface %s bfd:bfd_dst_ip=%s " "bfd:bfd_remote_dst_mac=%s bfd:bfd_local_dst_mac=%s" % (port, bfd_dst_ip, - bfd_lconf_default['bfd_config_local:bfd_dst_mac'], - bfd_dst_mac)) + bfd_lconf_default['bfd_config_local:bfd_dst_mac'], + bfd_dst_mac)) def add_binding(binding, ls):