From fc5a8ee1b893a85b7cb3d9fac010c28714e9c50e Mon Sep 17 00:00:00 2001
From: Rodolfo Alonso Hernandez <ralonsoh@redhat.com>
Date: Tue, 28 Jul 2020 15:43:45 +0000
Subject: [PATCH] Use "replace" to remove a section of a string
From "strip" documentation:
Return a copy of the string with leading whitespace removed.
If chars is given and not None, remove characters in chars instead.
Change-Id: Ia1bf0a98b327b4deaa4ff87da79b70d27314434a
Closes-Bug: #1888828
---
.../plugins/ml2/drivers/ovn/mech_driver/ovsdb/maintenance.py | 2 +-
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/maintenance.py b/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/maintenance.py
index ccaab02ce81..dd8f92125ed 100644
--- a/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/maintenance.py
+++ b/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/maintenance.py
@@ -617,7 +617,7 @@ class DBInconsistenciesPeriodics(SchemaAwarePeriodicsBase):
admin_context = n_context.get_admin_context()
cmds = []
for ls in self._nb_idl.ls_list().execute(check_error=True):
- network_id = ls.name.strip('neutron-')
+ network_id = ls.name.replace('neutron-', '')
legacy_name = utils.ovn_provnet_port_name(network_id)
legacy_port = None
segment_id = None
diff --git a/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py b/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py
index 4bff714529a..fd348f24d1c 100644
--- a/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py
+++ b/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py
@@ -570,7 +570,7 @@ class OVNClient(object):
ovn_network_name = ovn_port.external_ids.get(
ovn_const.OVN_NETWORK_NAME_EXT_ID_KEY)
- network_id = ovn_network_name.strip('neutron-')
+ network_id = ovn_network_name.replace('neutron-', '')
with self._nb_idl.transaction(check_error=True) as txn:
txn.add(self._nb_idl.delete_lswitch_port(