PR#50074: Issue 50071 - Set ports in local_simple_allocate function - 389-ds-base

389-ds-base

#50074 Issue 50071 - Set ports in local_simple_allocate function

Closed 3 years ago by spichugi. Opened 5 years ago by spichugi.

spichugi/389-ds-base local_allocate_ports into master

Issue 50071 - Set ports in local_simple_allocate function

Simon Pichugin • 5 years ago

1698dd8

src/lib389/lib389/__init__.py

file modified

+8 -2

		`@@ -85,6 +85,7 @@`
		`from lib389.paths import Paths`
		`from lib389.nss_ssl import NssSsl`
		`from lib389.tasks import BackupTask, RestoreTask`
		`+ from lib389.dseldif import DSEldif`

		`# mixin`
		`# from lib389.tools import DirSrvTools`
		`@@ -431,8 +432,13 @@`

		`# We must also alloc host and ports for some manipulation tasks`
		`self.host = socket.gethostname()`
		`- # self.port ...`
		`- # self.sslport ...`
		`+`
		`+ dse_ldif = DSEldif(self)`
		`+ port = dse_ldif.get(DN_CONFIG, "nsslapd-port", single=True)`
		`+ sslport = dse_ldif.get(DN_CONFIG, "nsslapd-secureport", single=True)`
		`+`
		`+ self.port = int(port) if port is not None else None`
		`+ self.sslport = int(sslport) if sslport is not None else None`

		`self.binddn = binddn`
		`self.bindpw = password`

src/lib389/lib389/dseldif.py

file modified

+3 -6

		`@@ -89,13 +89,10 @@`
		`except ValueError:`
		`return None`

		`+ vals = list(attr_data.values())`
		`if single:`
		`- vals = list(attr_data.values())`
		`- if len(vals) > 0:`
		`- return vals[0]`
		`- else:`
		`- return None`
		`- return attr_data.values()`
		`+ return vals[0] if len(vals) > 0 else None`
		`+ return vals`

		`def add(self, entry_dn, attr, value):`
		`"""Add an attribute under a given entry`

src/lib389/lib389/instance/remove.py

file modified

+2 -1

		`@@ -78,7 +78,8 @@`
		`subprocess.check_call(["systemctl", "disable", "dirsrv@{}".format(dirsrv.serverid)])`

		`# Remove selinux port label`
		`- selinux_label_port(dirsrv.port, remove_label=True)`
		`+ if dirsrv.port is not None:`
		`+ selinux_label_port(dirsrv.port, remove_label=True)`
		`if dirsrv.sslport is not None:`
		`selinux_label_port(dirsrv.sslport, remove_label=True)`

src/lib389/lib389/tests/instance/remove_test.py

file modified

+12 -2

		`@@ -9,12 +9,14 @@`
		`import os`
		`import subprocess`
		`import pytest`
		`+ import logging`
		`+ from lib389 import DirSrv`
		`from lib389.instance.remove import remove_ds_instance`
		`from lib389._constants import ReplicaRole`
		`from lib389.topologies import create_topology`


		`- @pytest.fixture(scope="module")`
		`+ @pytest.fixture(scope="function")`
		`def topology_st(request):`
		`"""Create DS standalone instance"""`

		`@@ -28,11 +30,17 @@`
		`return topology`


		`- def test_basic(topology_st):`
		`+ @pytest.mark.parametrize("simple_allocate", (True, False))`
		`+ def test_basic(topology_st, simple_allocate):`
		`"""Check that all DS directories and systemd items were removed"""`

		`inst = topology_st.standalone`

		`+ # FreeIPA uses local_simple_allocate for the removal process`
		`+ if simple_allocate:`
		`+ inst = DirSrv(verbose=inst.verbose)`
		`+ inst.local_simple_allocate(topology_st.standalone.serverid)`
		`+`
		`remove_ds_instance(inst)`

		`paths = [inst.ds_paths.backup_dir,`
		`@@ -51,3 +59,5 @@`
		`subprocess.check_output(['systemctl', 'is-enabled', 'dirsrv@{}'.format(inst.serverid)], encoding='utf-8')`
		`except subprocess.CalledProcessError as ex:`
		`assert "disabled" in ex.output`
		`+`
		`+`

spichugi commented 5 years ago

Description: remove_ds_instance function require DirSrv
object having port and sslport defined for semanage remove
label operation. We should set it in local_simple_allocate too.
Fix DSEldif.get function so it returns a list instead of a view
(Python 3 change).

https://pagure.io/389-ds-base/issue/50071

Reviewed by: ?