diff options
author | lzhecheng <lzhecheng@vmware.com> | 2020-08-06 04:23:39 +0000 |
---|---|---|
committer | Ilya Maximets <i.maximets@ovn.org> | 2020-08-17 18:32:27 +0200 |
commit | 8a09c2590ef2ea0edc250ec46e3d41bd5874b4ab (patch) | |
tree | 036f8be2404797ed4ebfe255c926d5cac8aa9047 /ipsec | |
parent | 023f257852f6b26da6b3362e507a1a9df2a30c44 (diff) | |
download | openvswitch-8a09c2590ef2ea0edc250ec46e3d41bd5874b4ab.tar.gz |
ovs-monitor-ipsec: Convert Python2 code to Python3.
Submitted-at: https://github.com/openvswitch/ovs/pull/331
Reported-at: https://github.com/openvswitch/ovs-issues/issues/192
Fixes: 1ca0323e7c29 ("Require Python 3 and remove support for Python 2.")
Signed-off-by: lzhecheng <lzhecheng@vmware.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
Diffstat (limited to 'ipsec')
-rwxr-xr-x | ipsec/ovs-monitor-ipsec.in | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ipsec/ovs-monitor-ipsec.in b/ipsec/ovs-monitor-ipsec.in index 37e370324..1c185bbd8 100755 --- a/ipsec/ovs-monitor-ipsec.in +++ b/ipsec/ovs-monitor-ipsec.in @@ -101,7 +101,7 @@ class XFRM(object): proc = subprocess.Popen([self.IP, 'xfrm', 'policy'], stdout=subprocess.PIPE) while True: - line = proc.stdout.readline().strip() + line = proc.stdout.readline().strip().decode() if line == '': break a = line.split(" ") @@ -124,7 +124,7 @@ class XFRM(object): proc = subprocess.Popen([self.IP, 'xfrm', 'state'], stdout=subprocess.PIPE) while True: - line = proc.stdout.readline().strip() + line = proc.stdout.readline().strip().decode() if line == '': break a = line.split(" ") @@ -246,7 +246,7 @@ conn prevent_unencrypted_vxlan proc = subprocess.Popen([self.IPSEC, 'status'], stdout=subprocess.PIPE) while True: - line = proc.stdout.readline().strip() + line = proc.stdout.readline().strip().decode() if line == '': break tunnel_name = line.split(":") @@ -340,7 +340,7 @@ conn prevent_unencrypted_vxlan # about possibility of ovs-monitor-ipsec to block for each tunnel # while strongSwan sends IKE messages over Internet. conns_dict = self.get_active_conns() - for ifname, conns in conns_dict.iteritems(): + for ifname, conns in conns_dict.items(): tunnel = monitor.tunnels.get(ifname) for conn in conns: # IPsec "connection" names that we choose in strongswan @@ -536,7 +536,7 @@ conn prevent_unencrypted_vxlan # Delete old connections conns_dict = self.get_active_conns() - for ifname, conns in conns_dict.iteritems(): + for ifname, conns in conns_dict.items(): tunnel = monitor.tunnels.get(ifname) for conn in conns: @@ -608,7 +608,7 @@ conn prevent_unencrypted_vxlan proc = subprocess.Popen([self.IPSEC, 'status'], stdout=subprocess.PIPE) while True: - line = proc.stdout.readline().strip() + line = proc.stdout.readline().strip().decode() if line == '': break @@ -989,7 +989,7 @@ class IPsecMonitor(object): skb_mark = None is_valid = False - for row in data["Open_vSwitch"].rows.itervalues(): + for row in data["Open_vSwitch"].rows.values(): pki[0] = row.other_config.get("certificate") pki[1] = row.other_config.get("private_key") pki[2] = row.other_config.get("ca_cert") @@ -1016,7 +1016,7 @@ class IPsecMonitor(object): table.""" ifaces = set() - for row in data["Interface"].rows.itervalues(): + for row in data["Interface"].rows.values(): if not self.is_tunneling_type_supported(row.type): continue if not self.is_ipsec_required(row.options): @@ -1047,7 +1047,7 @@ class IPsecMonitor(object): return s = "" conns = self.ike_helper.get_active_conns() - for name, tunnel in self.tunnels.iteritems(): + for name, tunnel in self.tunnels.items(): s += tunnel.show(policies, securities, conns) unix_conn.reply(s) @@ -1064,7 +1064,7 @@ class IPsecMonitor(object): if self.ike_helper.config_global(self): needs_refresh = True - for name, tunnel in self.tunnels.iteritems(): + for name, tunnel in self.tunnels.items(): if tunnel.last_refreshed_version != tunnel.version: tunnel.last_refreshed_version = tunnel.version needs_refresh = True @@ -1094,7 +1094,7 @@ class IPsecMonitor(object): proc.wait() if proc.returncode: raise Exception(proc.stderr.read()) - m = re.search(r"CN=(.+?),", proc.stdout.readline()) + m = re.search(r"CN=(.+?),", proc.stdout.readline().decode()) if not m: raise Exception("No CN in the certificate subject.") except Exception as e: |