8a9057a4e2
Previously the logic around hitting the end of the file without having found the insertion point didn't account for the fact that you might be in roughly the right area, and would not need to duplicate the meta section or section headers. This takes that into account during the else phase. It will help with the neutron functional jobs that merge a lot of snippets together. Change-Id: Ifaa1176e9fdfbc4fdb43192ed2f85e7306823848
208 lines
4.5 KiB
Python
208 lines
4.5 KiB
Python
# Copyright 2017 IBM
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
# Implementation of ini add / remove for devstack. We don't use the
|
|
# python ConfigFile parser because that ends up rewriting the entire
|
|
# file and doesn't ensure comments remain.
|
|
|
|
import fixtures
|
|
import os.path
|
|
import testtools
|
|
|
|
from devstack import dsconf
|
|
|
|
|
|
BASIC = """
|
|
[[local|localrc]]
|
|
a=b
|
|
c=d
|
|
f=1
|
|
[[post-config|$NEUTRON_CONF]]
|
|
[DEFAULT]
|
|
global_physnet_mtu=1450
|
|
[[post-config|$NOVA_CONF]]
|
|
[upgrade_levels]
|
|
compute = auto
|
|
"""
|
|
|
|
BASIC2 = """
|
|
[[local|localrc]]
|
|
a=b
|
|
c=d
|
|
f=1
|
|
[[post-config|$NEUTRON_CONF]]
|
|
[quotas]
|
|
quota_network = 100
|
|
"""
|
|
|
|
LC1 = """
|
|
[[local|localrc]]
|
|
a=5
|
|
g=2
|
|
[[post-config|$NEUTRON_CONF]]
|
|
[DEFAULT]
|
|
global_physnet_mtu=1400
|
|
[[post-config|$GLANCE_CONF]]
|
|
[upgrade_levels]
|
|
compute = auto
|
|
"""
|
|
|
|
LC2 = """
|
|
[[local|localrc]]
|
|
# some other comment
|
|
enable_plugin ironic https://github.com/openstack/ironic
|
|
TEMPEST_PLUGINS+=" /opt/stack/new/ironic"
|
|
"""
|
|
|
|
LC3 = """
|
|
[[post-config|$NEUTRON_CONF]]
|
|
[quotas]
|
|
quota_port = 500
|
|
"""
|
|
|
|
LC4 = """
|
|
[[post-config|$NEUTRON_CONF]]
|
|
[DEFAULT]
|
|
global_physnet_mtu=1400
|
|
"""
|
|
|
|
RESULT1 = """
|
|
[[local|localrc]]
|
|
a=b
|
|
c=d
|
|
f=1
|
|
a=5
|
|
g=2
|
|
[[post-config|$NEUTRON_CONF]]
|
|
[DEFAULT]
|
|
global_physnet_mtu = 1400
|
|
[[post-config|$NOVA_CONF]]
|
|
[upgrade_levels]
|
|
compute = auto
|
|
[[post-config|$GLANCE_CONF]]
|
|
[upgrade_levels]
|
|
compute = auto
|
|
"""
|
|
|
|
RESULT2 = """
|
|
[[local|localrc]]
|
|
a=b
|
|
c=d
|
|
f=1
|
|
# some other comment
|
|
enable_plugin ironic https://github.com/openstack/ironic
|
|
TEMPEST_PLUGINS+=" /opt/stack/new/ironic"
|
|
[[post-config|$NEUTRON_CONF]]
|
|
[DEFAULT]
|
|
global_physnet_mtu=1450
|
|
[[post-config|$NOVA_CONF]]
|
|
[upgrade_levels]
|
|
compute = auto
|
|
"""
|
|
|
|
RESULT3 = """
|
|
[[local|localrc]]
|
|
a=b
|
|
c=d
|
|
f=1
|
|
[[post-config|$NEUTRON_CONF]]
|
|
[quotas]
|
|
quota_network = 100
|
|
quota_port = 500
|
|
"""
|
|
|
|
RESULT4 = """
|
|
[[local|localrc]]
|
|
a=b
|
|
c=d
|
|
f=1
|
|
[[post-config|$NEUTRON_CONF]]
|
|
[quotas]
|
|
quota_network = 100
|
|
[DEFAULT]
|
|
global_physnet_mtu = 1400
|
|
"""
|
|
|
|
|
|
class TestLcMerge(testtools.TestCase):
|
|
|
|
def setUp(self):
|
|
super(TestLcMerge, self).setUp()
|
|
self._path = self.useFixture(fixtures.TempDir()).path
|
|
self._path += "/local.conf"
|
|
with open(self._path, "w") as f:
|
|
f.write(BASIC)
|
|
|
|
def test_merge_lc1(self):
|
|
dirname = self.useFixture(fixtures.TempDir()).path
|
|
lc1 = os.path.join(dirname, "local1.conf")
|
|
with open(lc1, "w+") as f:
|
|
f.write(LC1)
|
|
conf = dsconf.LocalConf(self._path)
|
|
conf.merge_lc(lc1)
|
|
|
|
with open(self._path) as f:
|
|
content = f.read()
|
|
self.assertEqual(content, RESULT1)
|
|
|
|
def test_merge_lc2(self):
|
|
dirname = self.useFixture(fixtures.TempDir()).path
|
|
lc2 = os.path.join(dirname, "local2.conf")
|
|
with open(lc2, "w+") as f:
|
|
f.write(LC2)
|
|
conf = dsconf.LocalConf(self._path)
|
|
conf.merge_lc(lc2)
|
|
|
|
with open(self._path) as f:
|
|
content = f.read()
|
|
self.assertEqual(content, RESULT2)
|
|
|
|
|
|
class TestLcMergePost(testtools.TestCase):
|
|
|
|
def setUp(self):
|
|
super(TestLcMergePost, self).setUp()
|
|
self._path = self.useFixture(fixtures.TempDir()).path
|
|
self._path += "/local.conf"
|
|
with open(self._path, "w") as f:
|
|
f.write(BASIC2)
|
|
|
|
def test_merge_lc3(self):
|
|
"""Test merging with 2 post-config sections that should overlap."""
|
|
|
|
dirname = self.useFixture(fixtures.TempDir()).path
|
|
lc = os.path.join(dirname, "local.conf")
|
|
with open(lc, "w+") as f:
|
|
f.write(LC3)
|
|
conf = dsconf.LocalConf(self._path)
|
|
conf.merge_lc(lc)
|
|
|
|
with open(self._path) as f:
|
|
content = f.read()
|
|
self.assertEqual(content, RESULT3)
|
|
|
|
def test_merge_lc4(self):
|
|
"""Test merging with 2 post-config sections that should overlap."""
|
|
|
|
dirname = self.useFixture(fixtures.TempDir()).path
|
|
lc = os.path.join(dirname, "local2.conf")
|
|
with open(lc, "w+") as f:
|
|
f.write(LC4)
|
|
conf = dsconf.LocalConf(self._path)
|
|
conf.merge_lc(lc)
|
|
|
|
with open(self._path) as f:
|
|
content = f.read()
|
|
self.assertEqual(content, RESULT4)
|