From 341d61458e55594e6ad2700990f0e7075421beea Mon Sep 17 00:00:00 2001
From: Viktor Ashirov <vashirov@redhat.com>
Date: Apr 03 2020 15:15:12 +0000
Subject: Issue 50337 - Replace exec() with setattr()


Bug Description:
Instance IDs now include superfluous quotes that break
calling CLI tools from lib389.

Fix Description:
Remove the quotes.

Fixes: https://pagure.io/389-ds-base/issue/50337

Reviewed by: spichugi (Thanks!)

---

diff --git a/src/lib389/lib389/_constants.py b/src/lib389/lib389/_constants.py
index 58d6c4e..dd44a3a 100644
--- a/src/lib389/lib389/_constants.py
+++ b/src/lib389/lib389/_constants.py
@@ -293,7 +293,7 @@ for i in range(port_start, port_start + number_of_instances):
     setattr(mod, "HOST_STANDALONE{0}".format(N), "LOCALHOST")
     setattr(mod, "PORT_STANDALONE{0}".format(N), i)
     setattr(mod, "SECUREPORT_STANDALONE{0}".format(N), i + 24700)
-    setattr(mod, "SERVERID_STANDALONE{0}".format(N), "\"standalone{0}\"".format(N))
+    setattr(mod, "SERVERID_STANDALONE{0}".format(N), "standalone{0}".format(N))
     setattr(mod, "REPLICAID_STANDALONE_{0}".format(N), 65535)
 
 # For compatibility
@@ -310,7 +310,7 @@ for i in range(port_start, port_start + number_of_instances):
     setattr(mod, "HOST_MASTER_{0}".format(N), "LOCALHOST")
     setattr(mod, "PORT_MASTER_{0}".format(N), i)
     setattr(mod, "SECUREPORT_MASTER_{0}".format(N), i + 24700)
-    setattr(mod, "SERVERID_MASTER_{0}".format(N), "\"master{0}\"".format(N))
+    setattr(mod, "SERVERID_MASTER_{0}".format(N), "master{0}".format(N))
     setattr(mod, "REPLICAID_MASTER_{0}".format(N), N)
 
 # Replication topology - hubs
@@ -321,7 +321,7 @@ for i in range(port_start, port_start + number_of_instances):
     setattr(mod, "HOST_HUB_{0}".format(N), "LOCALHOST")
     setattr(mod, "PORT_HUB_{0}".format(N), i)
     setattr(mod, "SECUREPORT_HUB_{0}".format(N), i + 24700)
-    setattr(mod, "SERVERID_HUB_{0}".format(N), "\"hub{0}\"".format(N))
+    setattr(mod, "SERVERID_HUB_{0}".format(N), "hub{0}".format(N))
     setattr(mod, "REPLICAID_HUB_{0}".format(N), 65535)
 
 # Replication topology - consumers
@@ -332,7 +332,7 @@ for i in range(port_start, port_start + number_of_instances):
     setattr(mod, "HOST_CONSUMER_{0}".format(N), "LOCALHOST")
     setattr(mod, "PORT_CONSUMER_{0}".format(N), i)
     setattr(mod, "SECUREPORT_CONSUMER_{0}".format(N), i + 24700)
-    setattr(mod, "SERVERID_CONSUMER_{0}".format(N), "\"consumer{0}\"".format(N))
+    setattr(mod, "SERVERID_CONSUMER_{0}".format(N), "consumer{0}".format(N))
 
 # Cleanup, we don't need to export that
 del N, port_start, number_of_instances