From cf9093ec580806d973a11220dd8a87f3d5b95ad7 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Fri, 10 Feb 2017 17:01:42 -0500 Subject: [PATCH] rename set_local_raw to set_local set_local_raw is the new set_local, adjust the code to use the better name. Change-Id: I0f16ca647ada37049bdaf570b4695a73b60007ec --- devstack/cmd.py | 4 ++-- devstack/dsconf.py | 17 ++--------------- devstack/tests/test_localconf_set_local.py | 8 ++++---- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/devstack/cmd.py b/devstack/cmd.py index 837866b..5c97523 100644 --- a/devstack/cmd.py +++ b/devstack/cmd.py @@ -43,11 +43,11 @@ def extract_config(local_conf, args): def setlc(local_conf, args): - local_conf.set_local(args.name, args.value) + local_conf.set_local("%s=%s" % (args.name, args.value)) def setlc_raw(local_conf, args): - local_conf.set_raw(" ".join(args.items)) + local_conf.set_local(" ".join(args.items)) def setlc_conf(local_conf, args): diff --git a/devstack/dsconf.py b/devstack/dsconf.py index 8b4d6f3..217db1c 100644 --- a/devstack/dsconf.py +++ b/devstack/dsconf.py @@ -209,7 +209,7 @@ class LocalConf(object): if not done: func(writer, None) - def set_local_raw(self, line): + def set_local(self, line): if not os.path.exists(self.fname): with open(self.fname, "w+") as writer: writer.write("[[local|localrc]]\n") @@ -292,20 +292,7 @@ class LocalConf(object): for group, conf in groups: if group == "local": for line in lc._section(group, conf): - self.set_local_raw(line) - # if line.startswith('#'): - # continue - # m = re.match(r"([^#=\s]+)\s*\=\s*(.+)", line) - - # if m: - # self.set_local(m.group(1), m.group(2)) - # elif re.match("(enable|disable)", line): - # # special case appending enable* disable* - # # function lines - # self.set_local_raw(line) - # else: - # print("SKIPPING ``%s`` from '%s'" % - # (line.lstrip(), lcfile)) + self.set_local(line) else: for section, name, value in lc._conf(group, conf): self.set(group, conf, section, name, value) diff --git a/devstack/tests/test_localconf_set_local.py b/devstack/tests/test_localconf_set_local.py index 8e9f019..8ba6003 100644 --- a/devstack/tests/test_localconf_set_local.py +++ b/devstack/tests/test_localconf_set_local.py @@ -90,22 +90,22 @@ class TestLcSet(testtools.TestCase): def test_set_new(self): conf = dsconf.LocalConf(self._path) - conf.set_local_raw("g=2") + conf.set_local("g=2") with open(self._path) as f: content = f.read() self.assertEqual(content, RESULT1) def test_set_existing(self): conf = dsconf.LocalConf(self._path) - conf.set_local_raw("a=2") + conf.set_local("a=2") with open(self._path) as f: content = f.read() self.assertEqual(content, RESULT2) def test_set_raw(self): conf = dsconf.LocalConf(self._path) - conf.set_local_raw("enable_plugin foo http://foo branch") - conf.set_local_raw("enable_plugin bar http://foo branch") + conf.set_local("enable_plugin foo http://foo branch") + conf.set_local("enable_plugin bar http://foo branch") with open(self._path) as f: content = f.read() self.assertEqual(content, RESULT3)