diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml

index 93604e8..4e1b6c5 100644

--- a/.github/workflows/pylint.yml

+++ b/.github/workflows/pylint.yml

@@ -1,9 +1,19 @@

-name: Pylint

+name: Linters

 on: [push]

 jobs:

-  build:

+

+  docker-lint:

+    runs-on: ubuntu-latest

+    steps:

+      - uses: actions/checkout@v3

+      - uses: hadolint/hadolint-action@v2.1.0

+        with:

+          recursive: true

+          ignore: DL3041

+

+  python-lint:

     runs-on: ubuntu-latest

     strategy:

diff --git a/Dockerfile b/Dockerfile

index ad6742e..0ab5138 100644

--- a/Dockerfile

+++ b/Dockerfile

@@ -2,12 +2,12 @@ FROM fedora:36

 WORKDIR /root

-# for nvme-stas

-RUN dnf install -y python3-dasbus python3-pyudev python3-systemd python3-gobject meson

-# for libnvme

-RUN dnf install -y git gcc g++ cmake openssl-devel libuuid-devel json-c-devel swig python-devel meson

+# first line for nvme-stas

+# second line for libnvme

+RUN dnf install -y python3-dasbus python3-pyudev python3-systemd python3-gobject meson \

+                   git gcc g++ cmake openssl-devel libuuid-devel json-c-devel swig python-devel meson && dnf clean all

 COPY . .

-RUN meson .build && ninja -C .build && cd .build && meson install

+RUN meson .build && ninja -C .build && meson install -C .build

 ENTRYPOINT ["python3"]

diff --git a/NEWS.md b/NEWS.md

index d1515cd..f56a7c9 100644

--- a/NEWS.md

+++ b/NEWS.md

@@ -5,6 +5,7 @@

 - Fix issues with I/O controller connection audits

   - Eliminate pcie devices from list of I/O controller connections to audit

   - Add soaking timer to workaround race condition between kernel and user-space applications on "add" uevents. When the kernel adds a new nvme device (e.g. `/dev/nvme7`) and sends a "add" uevent to notify user-space applications, the attributes associated with that device (e.g. `/sys/class/nvme/nvme7/cntrltype`) may not be fully initialized which can lead `stacd` to dismiss a device that should get audited. 

+- Make `sticky-connections=enabled` the default (see `stacd.conf`) 

 ## Changes with release 1.1.5

@@ -32,7 +33,7 @@ stacd: Bug fix. Check that self._cfg_soak_tmr is not None before dereferencing i

 ## Changes with release 1.1.1

-Make `sticky-connections-disabled` by default

+Make `sticky-connections=disabled` the default (see `stacd.conf`) 

 ## Changes with release 1.1

diff --git a/coverage.sh.in b/coverage.sh.in

index 96b8c53..5ba2ebe 100755

--- a/coverage.sh.in

+++ b/coverage.sh.in

@@ -38,14 +38,24 @@ PRIMARY_GRP=$( id -ng )

 PRIMARY_USR=$( id -nu )

 PYTHON_PATH=.:./subprojects/libnvme

+log() {

+    msg="$1"

+    printf "%b[1;36m%s%b[0m\n" "\0033" "${msg}" "\0033"

+    sudo logger -i "@@@@@  COVERAGE -" -p 4 "${msg}"

+}

+

 sd_stop() {

-    unit="$1"-cov.service

+    app="$1"

+    unit="${app}"-cov.service

+    log "Stop ${app}"

     sudo systemctl stop "${unit}" >/dev/null 2>&1

     sudo systemctl reset-failed "${unit}" >/dev/null 2>&1

 }

 sd_restart() {

-    unit="$1"-cov.service

+    app="$1"

+    unit="${app}"-cov.service

+    log "Restart ${app}"

     sudo systemctl restart "${unit}" >/dev/null 2>&1

 }

@@ -61,7 +71,7 @@ sd_start() {

         cmd="${app} --syslog -f ${conf}"

     fi

-    printf "\n%b[1;36m%s%b[0m\n" "\0033" "Start ${app}" "\0033"

+    log "Start ${app}"

     RUNTIME_DIRECTORY=/tmp/${app}

     rm -rf ${RUNTIME_DIRECTORY}

@@ -75,7 +85,7 @@ reload_cfg() {

     app="$1"

     unit="${app}"-cov.service

     pid=$( systemctl show --property MainPID --value "${unit}" )

-    printf "%b[1;36m%s%b[0m\n" "\0033" "Reload config ${app}" "\0033"

+    log "Reload config ${app}"

     sudo kill -HUP "${pid}"

 }

@@ -83,15 +93,24 @@ if [ ! -d coverage ]; then

     mkdir coverage

 fi

+

+log "START-START-START-START-START-START-START-START-START-START-START-START"

+

+

+

 ################################################################################

 # Load nvme kernel module

+log "modprobe nvme-tcp"

 sudo /usr/sbin/modprobe nvme-tcp

+log "nvme disconnect-all"

 sudo nvme disconnect-all

 ################################################################################

 # Create a dummy config file for @STAFD_PROCNAME@

-stafd_conf_fname=$(mktemp /tmp/@STAFD_PROCNAME@.conf.XXXXXX)

+file=/tmp/@STAFD_PROCNAME@.conf.XXXXXX

+log "Create dummy config file $file"

+stafd_conf_fname=$(mktemp $file)

 cat > "${stafd_conf_fname}" <<'EOF'

 [Global]

 tron=true

@@ -102,7 +121,9 @@ EOF

 ################################################################################

 # Create a dummy config file for @STACD_PROCNAME@

-stacd_conf_fname=$(mktemp /tmp/@STACD_PROCNAME@.conf.XXXXXX)

+file=/tmp/@STACD_PROCNAME@.conf.XXXXXX

+log "Create dummy config file $file"

+stacd_conf_fname=$(mktemp $file)

 cat > "${stacd_conf_fname}" <<'EOF'

 [Global]

 tron=true

@@ -111,6 +132,7 @@ udev-rule=disabled

 sticky-connections=enabled

 EOF

+log "Stop & Mask Avahi daemon"

 sudo systemctl stop avahi-daemon.service

 sudo systemctl stop avahi-daemon.socket

 sudo systemctl mask avahi-daemon.service

@@ -118,11 +140,11 @@ sudo systemctl mask avahi-daemon.socket

 sleep 1

-printf "%b[1;36m%s%b[0m\n" "\0033" "Invoking @STAFD_CTLNAME@ status while @STAFD_PROCNAME@ is not running" "\0033"

+log "Invoking @STAFD_CTLNAME@ status while @STAFD_PROCNAME@ is not running"

 coverage run --rcfile=.coveragerc @STAFD_CTLNAME@ ls >/dev/null 2>&1

 coverage run --rcfile=.coveragerc @STAFD_CTLNAME@ invalid-command >/dev/null 2>&1

-printf "%b[1;36m%s%b[0m\n" "\0033" "Invoking @STACD_CTLNAME@ status while @STACD_PROCNAME@ is not running" "\0033"

+log "Invoking @STACD_CTLNAME@ status while @STACD_PROCNAME@ is not running"

 coverage run --rcfile=.coveragerc @STACD_CTLNAME@ ls >/dev/null 2>&1

 coverage run --rcfile=.coveragerc @STACD_CTLNAME@ invalid-command >/dev/null 2>&1

@@ -132,30 +154,33 @@ sd_start "@STAFD_PROCNAME@" "@STAFD_DBUS_NAME@" "${stafd_conf_fname}"

 sd_start "@STACD_PROCNAME@" "@STACD_DBUS_NAME@" "${stacd_conf_fname}"

 sleep 3

-printf "%b[1;36m%s%b[0m\n" "\0033" "Invoking @STAFD_CTLNAME@ status" "\0033"

+log "Invoking @STAFD_CTLNAME@ status"

 coverage run --rcfile=.coveragerc @STAFD_CTLNAME@ status  >/dev/null 2>&1

 reload_cfg "@STAFD_PROCNAME@"

 sleep 1

+log "Restart Avahi daemon"

 sudo systemctl unmask avahi-daemon.socket

 sudo systemctl unmask avahi-daemon.service

 sudo systemctl start avahi-daemon.socket

 sudo systemctl start avahi-daemon.service

 sleep 2

+log "Change stafd config: tron=true, persistent-connections=false, zeroconf=enable"

 cat > "${stafd_conf_fname}" <<'EOF'

 [Global]

 tron=true

 persistent-connections=false

 [Service Discovery]

-zeroconf=disabled

+zeroconf=enabled

 EOF

 reload_cfg "@STAFD_PROCNAME@"

 sleep 1

+log "Change stafd config: ip-family=ipv4, kato=10, adding multiple controllers"

 cat > "${stafd_conf_fname}" <<'EOF'

 [Global]

 tron=true

@@ -172,11 +197,15 @@ controller=transport=tcp;traddr=abracadabra

 controller=

 controller=trsvcid

 controller=transport=rdma;traddr=!@#$

+controller=transport=fc;traddr=21:00:00:00:00:00:00:00;host-traddr=20:00:00:00:00:00:00:00

+controller=transport=XM;traddr=2.2.2.2

 blacklist=transport=tcp;traddr=1.1.1.1

 blacklist=transport=tcp;traddr=1000.1000.1000.1000

 EOF

 reload_cfg "@STAFD_PROCNAME@"

+

+log "Change stacd config: tron=true, udev-rule=disabled, sticky-connections=disabled"

 cat > "${stacd_conf_fname}" <<'EOF'

 [Global]

 tron=true

@@ -186,12 +215,12 @@ EOF

 reload_cfg "@STACD_PROCNAME@"

 sleep 3

-printf "%b[1;36m%s%b[0m\n" "\0033" "Invoking @STAFD_CTLNAME@ status" "\0033"

+log "Invoking @STAFD_CTLNAME@ status"

 coverage run --rcfile=.coveragerc @STAFD_CTLNAME@ status  >/dev/null 2>&1

 ################################################################################

 # Fake mDNS packets from a CDC

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Start Avahi publisher" "\0033"

+log "Start Avahi publisher"

 AVAHI_PUBLISHER=mdns_publisher.service

 sudo systemctl stop ${AVAHI_PUBLISHER} >/dev/null 2>&1

 sudo systemctl reset-failed ${AVAHI_PUBLISHER} >/dev/null 2>&1

@@ -200,7 +229,7 @@ sleep 1

 ################################################################################

 # Start nvme target simulator

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Start nvmet" "\0033"

+log "Start nvmet"

 sudo ../utils/nvmet/nvmet.py clean

 sudo ../utils/nvmet/nvmet.py create -f ../utils/nvmet/nvmet.conf

 sleep 2

@@ -210,76 +239,76 @@ reload_cfg "@STACD_PROCNAME@"

 sleep 3

 ################################################################################

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Invoking @STAFD_PROCNAME@ --version" "\0033"

+log "Invoking @STAFD_PROCNAME@ --version"

 coverage run --rcfile=.coveragerc @STAFD_PROCNAME@ --version

-printf "%b[1;36m%s%b[0m\n" "\0033" "Invoking @STAFD_PROCNAME@ --idl" "\0033"

+log "Invoking @STAFD_PROCNAME@ --idl"

 coverage run --rcfile=.coveragerc @STAFD_PROCNAME@ --idl /tmp/@STAFD_PROCNAME@.idl

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Invoking @STACD_PROCNAME@ --version" "\0033"

+log "Invoking @STACD_PROCNAME@ --version"

 coverage run --rcfile=.coveragerc @STACD_PROCNAME@ --version

-printf "%b[1;36m%s%b[0m\n" "\0033" "Invoking @STACD_PROCNAME@ --idl" "\0033"

+log "Invoking @STACD_PROCNAME@ --idl"

 coverage run --rcfile=.coveragerc @STACD_PROCNAME@ --idl /tmp/@STACD_PROCNAME@.idl

 ################################################################################

 # Stimulate D-Bus activity

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Invoking @STAFD_CTLNAME@ --version" "\0033"

+log "Invoking @STAFD_CTLNAME@ --version"

 sudo coverage run --rcfile=.coveragerc @STAFD_CTLNAME@ --version

-printf "%b[1;36m%s%b[0m\n" "\0033" "Invoking @STAFD_CTLNAME@ with a bad command" "\0033"

+log "Invoking @STAFD_CTLNAME@ with a bad command"

 sudo coverage run --rcfile=.coveragerc @STAFD_CTLNAME@ blah

-printf "%b[1;36m%s%b[0m\n" "\0033" "Invoking @STAFD_CTLNAME@ troff" "\0033"

+log "Invoking @STAFD_CTLNAME@ troff"

 sudo coverage run --rcfile=.coveragerc @STAFD_CTLNAME@ troff

-printf "%b[1;36m%s%b[0m\n" "\0033" "Invoking @STAFD_CTLNAME@ status" "\0033"

+log "Invoking @STAFD_CTLNAME@ status"

 coverage run --rcfile=.coveragerc @STAFD_CTLNAME@ status  >/dev/null 2>&1

-printf "%b[1;36m%s%b[0m\n" "\0033" "Invoking @STAFD_CTLNAME@ tron" "\0033"

+log "Invoking @STAFD_CTLNAME@ tron"

 sudo coverage run --rcfile=.coveragerc @STAFD_CTLNAME@ tron

-printf "%b[1;36m%s%b[0m\n" "\0033" "Invoking @STAFD_CTLNAME@ ls" "\0033"

+log "Invoking @STAFD_CTLNAME@ ls"

 coverage run --rcfile=.coveragerc @STAFD_CTLNAME@ ls -d   >/dev/null 2>&1

-printf "%b[1;36m%s%b[0m\n" "\0033" "Invoking @STAFD_CTLNAME@ adlp" "\0033"

+log "Invoking @STAFD_CTLNAME@ adlp"

 coverage run --rcfile=.coveragerc @STAFD_CTLNAME@ adlp -d >/dev/null 2>&1

-printf "%b[1;36m%s%b[0m\n" "\0033" "Invoking @STAFD_CTLNAME@ dlp" "\0033"

+log "Invoking @STAFD_CTLNAME@ dlp"

 coverage run --rcfile=.coveragerc @STAFD_CTLNAME@ dlp -t tcp -a ::1 -s 8009 >/dev/null 2>&1

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Invoking @STACD_CTLNAME@ --version" "\0033"

+log "Invoking @STACD_CTLNAME@ --version"

 sudo coverage run --rcfile=.coveragerc @STACD_CTLNAME@ --version

-printf "%b[1;36m%s%b[0m\n" "\0033" "Invoking @STACD_CTLNAME@ with a bad command" "\0033"

+log "Invoking @STACD_CTLNAME@ with a bad command"

 sudo coverage run --rcfile=.coveragerc @STACD_CTLNAME@ blah

-printf "%b[1;36m%s%b[0m\n" "\0033" "Invoking @STACD_CTLNAME@ troff" "\0033"

+log "Invoking @STACD_CTLNAME@ troff"

 sudo coverage run --rcfile=.coveragerc @STACD_CTLNAME@ troff

-printf "%b[1;36m%s%b[0m\n" "\0033" "Invoking @STACD_CTLNAME@ status" "\0033"

+log "Invoking @STACD_CTLNAME@ status"

 coverage run --rcfile=.coveragerc @STACD_CTLNAME@ status >/dev/null 2>&1

-printf "%b[1;36m%s%b[0m\n" "\0033" "Invoking @STACD_CTLNAME@ tron" "\0033"

+log "Invoking @STACD_CTLNAME@ tron"

 sudo coverage run --rcfile=.coveragerc @STACD_CTLNAME@ tron

-printf "%b[1;36m%s%b[0m\n" "\0033" "Invoking @STACD_CTLNAME@ ls" "\0033"

+log "Invoking @STACD_CTLNAME@ ls"

 coverage run --rcfile=.coveragerc @STACD_CTLNAME@ ls -d >/dev/null 2>&1

 ################################################################################

 # Stimulate AENs activity by removing/restoring namespaces

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Remove namespace: klingons" "\0033"

+log "Remove namespace: klingons"

 sudo ../utils/nvmet/nvmet.py unlink -p 1 -s klingons

 sleep 2

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Invoking @STACD_CTLNAME@ ls" "\0033"

+log "Invoking @STACD_CTLNAME@ ls"

 coverage run --rcfile=.coveragerc @STACD_CTLNAME@ ls -d >/dev/null 2>&1

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Restore namespace: klingons" "\0033"

+log "Restore namespace: klingons"

 sudo ../utils/nvmet/nvmet.py link -p 1 -s klingons

 sleep 2

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Invoking @STACD_CTLNAME@ ls" "\0033"

+log "Invoking @STACD_CTLNAME@ ls"

 coverage run --rcfile=.coveragerc @STACD_CTLNAME@ ls -d >/dev/null 2>&1

 ################################################################################

 # Stop Avahi Publisher

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Stop Avahi publisher" "\0033"

+log "Stop Avahi publisher"

 sudo systemctl stop ${AVAHI_PUBLISHER}

 sleep 1

 ################################################################################

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Restart Avahi publisher" "\0033"

+log "Restart Avahi publisher"

 sudo systemd-run --unit=${AVAHI_PUBLISHER} --working-directory=. avahi-publish -s SFSS _nvme-disc._tcp 8009 "p=tcp"

 sleep 2

 ################################################################################

 # Make config changes for @STAFD_PROCNAME@

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Empty configuration and disable zeroconf for @STAFD_PROCNAME@" "\0033"

+log "Empty configuration and disable zeroconf for @STAFD_PROCNAME@"

 cat > "${stafd_conf_fname}" <<'EOF'

 [Global]

 tron=true

@@ -293,7 +322,7 @@ sleep 1

 ################################################################################

 # Make more config changes for @STAFD_PROCNAME@

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Add single controller (::1) and re-enable zeroconf for @STAFD_PROCNAME@" "\0033"

+log "Add single controller (::1) and re-enable zeroconf for @STAFD_PROCNAME@"

 cat > "${stafd_conf_fname}" <<'EOF'

 [Global]

 tron=true

@@ -307,24 +336,23 @@ sleep 2

 ################################################################################

 # Stop Avahi Publisher

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Stop Avahi publisher" "\0033"

+log "Stop Avahi publisher"

 sudo systemctl stop ${AVAHI_PUBLISHER}

 sleep 2

 ################################################################################

 # Remove one of the NVMe device's

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Remove (disconnect) nvme1" "\0033"

+log "Remove (disconnect) nvme1"

 sudo nvme disconnect -d nvme1

 sleep 2

 ################################################################################

-printf "%b[1;36m%s%b[0m\n" "\0033" "Restart @STAFD_PROCNAME@ and @STACD_PROCNAME@" "\0033"

 sd_restart "@STAFD_PROCNAME@"

 sd_restart "@STACD_PROCNAME@"

 sleep 1

-printf "%b[1;36m%s%b[0m\n" "\0033" "Create invalid conditions for saving/loading @STAFD_PROCNAME@'s last known config" "\0033"

+log "Create invalid conditions for saving/loading @STAFD_PROCNAME@'s last known config"

 rm -rf "/tmp/@STAFD_PROCNAME@"

 sd_stop "@STAFD_PROCNAME@"

 sd_restart "@STACD_PROCNAME@"

@@ -334,7 +362,7 @@ sleep 2

 ################################################################################

 # Stop everything and collect coverage stats

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Stop @STAFD_PROCNAME@ and @STACD_PROCNAME@" "\0033"

+log "Stop @STAFD_PROCNAME@ and @STACD_PROCNAME@"

 sd_stop "@STAFD_PROCNAME@"

 sd_stop "@STACD_PROCNAME@"

 sleep 1

@@ -345,33 +373,49 @@ sudo chown -R "${PRIMARY_USR}":"${PRIMARY_GRP}" coverage  >/dev/null 2>&1

 sudo chown -R "${PRIMARY_USR}":"${PRIMARY_GRP}" staslib/__pycache__  >/dev/null 2>&1

 sudo chown -R "${PRIMARY_USR}":"${PRIMARY_GRP}" subprojects/libnvme/libnvme/__pycache__  >/dev/null 2>&1

+log "nvme disconnect-all"

 sudo nvme disconnect-all

+log "Remove ${stafd_conf_fname} and ${stacd_conf_fname}"

 rm "${stafd_conf_fname}"

 rm "${stacd_conf_fname}"

+log "Run unit test: test-udev"

 PYTHONPATH=${PYTHON_PATH} coverage run --rcfile=.coveragerc ../test/test-udev.py

+log "Run unit test: test-avahi"

 PYTHONPATH=${PYTHON_PATH} coverage run --rcfile=.coveragerc ../test/test-avahi.py

+log "Run unit test: test-gtimer"

 PYTHONPATH=${PYTHON_PATH} coverage run --rcfile=.coveragerc ../test/test-gtimer.py

+log "Run unit test: test-version"

 PYTHONPATH=${PYTHON_PATH} coverage run --rcfile=.coveragerc ../test/test-version.py

+log "Run unit test: test-transport_id"

 PYTHONPATH=${PYTHON_PATH} coverage run --rcfile=.coveragerc ../test/test-transport_id.py

+log "Run unit test: test-config"

 PYTHONPATH=${PYTHON_PATH} coverage run --rcfile=.coveragerc ../test/test-config.py

+log "Run unit test: test-controller"

 PYTHONPATH=${PYTHON_PATH} coverage run --rcfile=.coveragerc ../test/test-controller.py

+log "Run unit test: test-service"

 PYTHONPATH=${PYTHON_PATH} coverage run --rcfile=.coveragerc ../test/test-service.py

+log "Run unit test: test-log"

 PYTHONPATH=${PYTHON_PATH} coverage run --rcfile=.coveragerc ../test/test-log.py

+log "Run unit test: test-nvme_options"

 sudo PYTHONPATH=${PYTHON_PATH} coverage run --rcfile=.coveragerc ../test/test-nvme_options.py

 ################################################################################

 # Stop nvme target simulator

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Stop nvmet" "\0033"

+log "Stop nvmet"

 sudo ../utils/nvmet/nvmet.py clean

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Collect all coverage data" "\0033"

+log "Collect all coverage data"

 coverage combine --rcfile=.coveragerc

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Generating coverage report" "\0033"

+log "Generating coverage report"

 coverage report -i --rcfile=.coveragerc

-printf "\n%b[1;36m%s%b[0m\n" "\0033" "Generating coverage report (HTML)" "\0033"

+log "Generating coverage report (HTML)"

 coverage html -i --rcfile=.coveragerc

+

+log "All done!!!"

+

+log "FINISHED-FINISHED-FINISHED-FINISHED-FINISHED-FINISHED-FINISHED-FINISHED"

diff --git a/doc/man/stacd.conf.xml b/doc/man/stacd.conf.xml

index 60622f6..65ee71a 100644

--- a/doc/man/stacd.conf.xml

+++ b/doc/man/stacd.conf.xml

@@ -378,7 +378,7 @@

                             entries in <filename>stacd.conf</filename> have been removed.

                         </para>

-                        <formalpara><title>With sticky-connections=disabled (default)</title>

+                        <formalpara><title>With sticky-connections=disabled</title>

                             <para>

                                 stacd immediately disconnects from

                                 a previously connected IOC if the response to a

@@ -411,7 +411,7 @@

                             </formalpara>

                         </formalpara>

-                        <formalpara><title>With sticky-connections=enabled</title>

+                        <formalpara><title>With sticky-connections=enabled (default)</title>

                             <para>

                                 stacd does not disconnect from IOCs

                                 when a DPLE is removed or a <literal>controller=</literal>

diff --git a/etc/stas/stacd.conf b/etc/stas/stacd.conf

index 02e7b3e..0434671 100644

--- a/etc/stas/stacd.conf

+++ b/etc/stas/stacd.conf

@@ -202,8 +202,8 @@

 #

 #                     Type:    String

 #                     Range:   [disabled, enabled]

-#                     Default: disabled

-#sticky-connections=disabled

+#                     Default: enabled

+#sticky-connections=enabled

 [Controllers]

 # controller: I/O Controllers (IOC) are specified with this keyword.

diff --git a/stacd.py b/stacd.py

index 708e372..28cefac 100755

--- a/stacd.py

+++ b/stacd.py

@@ -10,14 +10,12 @@

 ''' STorage Appliance Connector Daemon

 '''

 import sys

-import logging

 from argparse import ArgumentParser

 from staslib import defs

-# pylint: disable=consider-using-f-string

-DBUS_IDL = '''

+DBUS_IDL = f'''

 <node>

-    <interface name="%s.debug">

+    <interface name="{defs.STACD_DBUS_NAME}.debug">

         <property name="tron" type="b" access="readwrite"/>

         <property name="log_level" type="s" access="read"/>

         <method name="process_info">

@@ -34,19 +32,16 @@ DBUS_IDL = '''

         </method>

     </interface>

-    <interface name="%s">

+    <interface name="{defs.STACD_DBUS_NAME}">

         <method name="list_controllers">

             <arg direction="in" type="b" name="detailed"/>

-            <arg direction="out" type="aa{ss}" name="controller_list"/>

+            <arg direction="out" type="aa{{ss}}" name="controller_list"/>

         </method>

     </interface>

 </node>

-''' % (

-    defs.STACD_DBUS_NAME,

-    defs.STACD_DBUS_NAME,

-)

-

+'''

+# ******************************************************************************

 def parse_args(conf_file: str):  # pylint: disable=missing-function-docstring

     parser = ArgumentParser(

         description=f'{defs.STAC_DESCRIPTION} ({defs.STAC_ACRONYM}). Must be root to run this program.'

@@ -77,6 +72,12 @@ ARGS = parse_args(defs.STACD_CONFIG_FILE)

 if ARGS.version:

     print(f'{defs.PROJECT_NAME} {defs.VERSION}')

+    try:

+        import libnvme

+

+        print(f'libnvme {libnvme.__version__}')

+    except (AttributeError, ModuleNotFoundError):

+        pass

     sys.exit(0)

 if ARGS.idl:

@@ -85,78 +86,14 @@ if ARGS.idl:

     sys.exit(0)

-# There is a reason for having this import here and not at the top of the file.

-# We want to allow running stafd with the --version and --idl options and exit

-# without having to import stas.

-from staslib import stas  # pylint: disable=wrong-import-position

-

-# Before going any further, make sure the script is allowed to run.

-stas.check_if_allowed_to_continue()

-

-

-################################################################################

-# Preliminary checks have passed. Let her rip!

-# pylint: disable=wrong-import-position

-# pylint: disable=wrong-import-order

-import json

-import pathlib

-import systemd.daemon

-import dasbus.error

-import dasbus.client.observer

-import dasbus.client.proxy

-from gi.repository import GLib

-from staslib import conf, log, gutil, trid, udev, ctrl, service  # pylint: disable=ungrouped-imports

-

-log.init(ARGS.syslog)

-

-UDEV_RULE_SUPPRESS = pathlib.Path('/run/udev/rules.d', '70-nvmf-autoconnect.rules')

-

-

-def udev_rule_ctrl(enable):

-    '''@brief We add an empty udev rule to /run/udev/rules.d to suppress

-    nvme-cli's udev rule that is used to tell udevd to automatically

-    connect to I/O controller. This is to avoid race conditions between

-    stacd and udevd. This is configurable. See "udev-rule" in stacd.conf

-    for details.

-    '''

-    if enable:

-        try:

-            UDEV_RULE_SUPPRESS.unlink()

-        except FileNotFoundError:

-            pass

-    else:

-        if not UDEV_RULE_SUPPRESS.exists():

-            pathlib.Path('/run/udev/rules.d').mkdir(parents=True, exist_ok=True)

-            UDEV_RULE_SUPPRESS.symlink_to('/dev/null')

-

-

 # ******************************************************************************

-class Ioc(ctrl.Controller):

-    '''@brief This object establishes a connection to one I/O Controller.'''

-

-    def __init__(self, root, host, tid: trid.TID):

-        super().__init__(root, host, tid)

-

-    def _on_udev_remove(self, udev_obj):

-        '''Called when the associated nvme device (/dev/nvmeX) is removed

-        from the system.

-        '''

-        super()._on_udev_remove(udev_obj)

-

-        # Defer removal of this object to the next main loop's idle period.

-        GLib.idle_add(STAC.remove_controller, self)

-

-    def _find_existing_connection(self):

-        return self._udev.find_nvme_ioc_device(self.tid)

-

-

-# ******************************************************************************

-class Stac(service.Service):

-    '''STorage Appliance Connector (STAC)'''

+if __name__ == '__main__':

+    import json

+    import logging

+    from staslib import log, service, stas, udev  # pylint: disable=ungrouped-imports

-    CONF_STABILITY_SOAK_TIME_SEC = 1.5

-    CONF_STABILITY_LONG_SOAK_TIME_SEC = 10  # pylint: disable=invalid-name

-    ADD_EVENT_SOAK_TIME_SEC = 1

+    # Before going any further, make sure the script is allowed to run.

+    stas.check_if_allowed_to_continue()

     class Dbus:

         '''This is the DBus interface that external programs can use to

@@ -205,229 +142,8 @@ class Stac(service.Service):

                 for controller in STAC.get_controllers()

             ]

-    # ==========================================================================

-    def __init__(self, args):

-        super().__init__(args, self._reload_hdlr)

-

-        # We don't want to apply configuration changes to nvme-cli right away.

-        # Often, multiple changes will occur in a short amount of time (sub-second).

-        # We want to wait until there are no more changes before applying them

-        # to the system. The following timer acts as a "soak period". Changes

-        # will be applied by calling self._on_config_ctrls() at the end of

-        # the soak period.

-        self._cfg_soak_tmr = gutil.GTimer(Stac.CONF_STABILITY_SOAK_TIME_SEC, self._on_config_ctrls)

-        self._cfg_soak_tmr.start()

-

-        self._add_event_soak_tmr = gutil.GTimer(Stac.ADD_EVENT_SOAK_TIME_SEC, self._on_add_event_soaked)

-

-        self._config_connections_audit()

-

-        # Create the D-Bus instance.

-        self._config_dbus(Stac.Dbus(), defs.STACD_DBUS_NAME, defs.STACD_DBUS_PATH)

-

-        # Connect to STAF D-Bus interface

-        self._staf = None

-        self._staf_watcher = dasbus.client.observer.DBusObserver(self._sysbus, defs.STAFD_DBUS_NAME)

-        self._staf_watcher.service_available.connect(self._connect_to_staf)

-        self._staf_watcher.service_unavailable.connect(self._disconnect_from_staf)

-        self._staf_watcher.connect_once_available()

-

-        # Suppress udev rule to auto-connect when AEN is received.

-        udev_rule_ctrl(conf.SvcConf().udev_rule_enabled)

-

-    def _release_resources(self):

-        logging.debug('Stac._release_resources()')

-

-        if self._add_event_soak_tmr:

-            self._add_event_soak_tmr.kill()

-

-        udev_rule_ctrl(True)

-

-        if self._udev:

-            self._udev.unregister_for_action_events('add')

-

-        self._destroy_staf_comlink(self._staf_watcher)

-        if self._staf_watcher is not None:

-            self._staf_watcher.disconnect()

-

-        super()._release_resources()

-

-        self._staf = None

-        self._staf_watcher = None

-        self._add_event_soak_tmr = None

-

-    def _audit_connections(self, tids):

-        '''A host should only connect to I/O controllers that have been zoned

-        for that host or a manual "controller" entry exists in stcd.conf.

-        A host should disconnect from an I/O controller when that I/O controller

-        is removed from the zone or a manual "controller" entry is removed from

-        stacd.conf. stacd will audit connections if "sticky-connections=disabled".

-        stacd will delete any connection that is not supposed to exist.

-        '''

-        logging.debug('Stac._audit_connections()          - tids = %s', tids)

-        num_controllers = len(self._controllers)

-        for tid in tids:

-            if tid not in self._controllers:

-                self._controllers[tid] = Ioc(self._root, self._host, tid)

-

-        if num_controllers != len(self._controllers):

-            self._cfg_soak_tmr.start(Stac.CONF_STABILITY_SOAK_TIME_SEC)

-

-    def _on_add_event(self, udev_obj):  # pylint: disable=unused-argument

-        '''@brief This function is called when a "add" event is received from

-        the kernel for an NVMe device. This is used to trigger an audit and make

-        sure that the connection to an I/O controller is allowed.

-

-        WARNING: There is a race condition with the "add" event from the kernel.

-        The kernel sends the "add" event a bit early and the sysfs attributes

-        associated with the nvme object are not always fully initialized.

-        To workaround this problem we use a soaking timer to give time for the

-        sysfs attributes to stabilize.

-        '''

-        self._add_event_soak_tmr.start()