Drop localized dialout cnfvar complexity for the easier cnf store
authorPlamen Dimitrov <plamen.dimitrov@intra2net.com>
Thu, 28 Apr 2022 06:13:08 +0000 (09:13 +0300)
committerChristian Herdtweck <christian.herdtweck@intra2net.com>
Thu, 19 May 2022 09:13:27 +0000 (11:13 +0200)
This is the final step towards a fully adapted dialout module and
gets rid simultaneously of outdated arnied cnfvar calls as well as
outdated cnf structure parsing in the new cnfvar API, both of which
will follow next.

src/dial.py

index 1b53fa9..0458f13 100644 (file)
@@ -65,7 +65,6 @@ import time
 import logging
 log = logging.getLogger('pyi2ncommon.dial')
 
-from . import arnied_wrapper
 from . import cnfvar
 from . import sysmisc
 
@@ -175,10 +174,12 @@ def arnied_dial_permanent(prid="P1", block=False):
                           ("dialout_defaultprovider_ref", "1")])
 
     def aux():
-        return arnied_wrapper.set_cnf_pipe(cnf.to_cnf_structure(), block=block), "", None
+        store = cnfvar.BinaryCnfStore()
+        store.commit(cnf)
+        return True, "", None
 
     if block is False:
-        succ = aux()
+        succ, out, _ = aux()
         return sysmisc.RUN_RESULT_OK if succ is True else sysmisc.RUN_RESULT_FAIL
 
     res, err = sysmisc.cmd_block_till(aux, DIALTOOLS_TIMEOUT, _connd_online,