synapse 2.176.0__py311-none-any.whl → 2.178.0__py311-none-any.whl

synapse/tests/test_lib_stormlib_tabular.py

@@ -0,0 +1,226 @@
+import synapse.exc as s_exc
+import synapse.tests.utils as s_test
+
+def printlines(mesgs):
+    return [part for m in mesgs if m[0] == 'print' for part in m[1]['mesg'].split('\n')]
+
+class TabularTest(s_test.SynTest):
+
+    async def test_stormlib_tabular(self):
+
+        async with self.getTestCore() as core:
+
+            opts = {
+                'vars': {
+                    'rows': [
+                        (1973, 'Issac Asimov', 'The Gods Themselves'),
+                        (1974, 'Arthur C. Clarke', 'Rendezvous with Rama'),
+                        (1975, 'Ursula K. Le Guin', 'The Dispossessed'),
+                        (1976, 'Joe Haldeman', 'The Forever War'),
+                    ],
+                },
+            }
+
+            # get schema
+
+            mesgs = await core.stormlist('$lib.print($lib.yaml.save($lib.tabular.schema()))')
+            self.stormHasNoWarnErr(mesgs)
+            self.stormIsInPrint('column:outline', mesgs)
+
+            # single line defaults
+
+            mesgs = await core.stormlist('''
+                $printer = $lib.tabular.printer(({
+                    "columns": [
+                        {"name": "Year", "width": 6, "justify": "right"},
+                        {"name": "Author", "width": 20, "justify": "center"},
+                        {"name": "Title", "width": 12},
+                    ]
+                }))
+
+                $lib.print($printer.header())
+                for $row in $rows {
+                    $lib.print($printer.row($row))
+                }
+            ''', opts=opts)
+            self.stormHasNoWarnErr(mesgs)
+            self.eq([
+                '   Year |        Author        | Title        ',
+                '========|======================|==============',
+                '   1973 |     Issac Asimov     | The Gods ... ',
+                '--------|----------------------|--------------',
+                '   1974 |   Arthur C. Clarke   | Rendezvou... ',
+                '--------|----------------------|--------------',
+                '   1975 |  Ursula K. Le Guin   | The Dispo... ',
+                '--------|----------------------|--------------',
+                '   1976 |     Joe Haldeman     | The Forev... ',
+            ], printlines(mesgs))
+
+            # custom separators
+
+            mesgs = await core.stormlist('''
+                $printer = $lib.tabular.printer(({
+                    "separators": {
+                        "row:outline": true,
+                        "column:outline": true,
+                        "header:row": "#",
+                        "data:row": "*",
+                        "column": "+",
+                    },
+                    "columns": [
+                        {"name": "Year", "width": 6, "justify": "right"},
+                        {"name": "Author", "width": 20, "justify": "center"},
+                        {"name": "Title", "width": 12},
+                    ]
+                }))
+
+                $lib.print($printer.header())
+                for $row in $rows {
+                    $lib.print($printer.row($row))
+                }
+            ''', opts=opts)
+            self.stormHasNoWarnErr(mesgs)
+            self.eq([
+                '+########+######################+##############+',
+                '+   Year +        Author        + Title        +',
+                '+########+######################+##############+',
+                '+   1973 +     Issac Asimov     + The Gods ... +',
+                '+********+**********************+**************+',
+                '+   1974 +   Arthur C. Clarke   + Rendezvou... +',
+                '+********+**********************+**************+',
+                '+   1975 +  Ursula K. Le Guin   + The Dispo... +',
+                '+********+**********************+**************+',
+                '+   1976 +     Joe Haldeman     + The Forev... +',
+                '+********+**********************+**************+',
+            ], printlines(mesgs))
+
+            # no col separators or end width
+
+            mesgs = await core.stormlist('''
+                $printer = $lib.tabular.printer(({
+                    "separators": {
+                        "header:row": "",
+                        "data:row": "",
+                        "column": "",
+                    },
+                    "columns": [
+                        {"name": "Year", "width": 6, "justify": "right"},
+                        {"name": "Author", "width": 20, "justify": "center"},
+                        {"name": "Title"},
+                    ]
+                }))
+
+                $lib.print($printer.header())
+                for $row in $rows {
+                    $lib.print($printer.row($row))
+                }
+            ''', opts=opts)
+            self.stormHasNoWarnErr(mesgs)
+            self.eq([
+                '   Year         Author         Title ',
+                '   1973      Issac Asimov      The Gods Themselves ',
+                '   1974    Arthur C. Clarke    Rendezvous with Rama ',
+                '   1975   Ursula K. Le Guin    The Dispossessed ',
+                '   1976      Joe Haldeman      The Forever War ',
+            ], printlines(mesgs))
+
+            # wraps
+
+            mesgs = await core.stormlist('''
+                $printer = $lib.tabular.printer(({
+                    "columns": [
+                        {"name": "Year", "width": 6, "justify": "right"},
+                        {"name": "Author", "width": 10, "justify": "center", "overflow": "wrap"},
+                        {"name": "Title", "width": 10, "overflow": "wrap"},
+                    ]
+                }))
+
+                $lib.print($printer.header())
+                for $row in $rows {
+                    $lib.print($printer.row($row))
+                }
+            ''', opts=opts)
+            self.stormHasNoWarnErr(mesgs)
+            self.eq([
+                '   Year |   Author   | Title      ',
+                '========|============|============',
+                '   1973 |   Issac    | The Gods   ',
+                '        |   Asimov   | Themselves ',
+                '--------|------------|------------',
+                '   1974 | Arthur C.  | Rendezvous ',
+                '        |   Clarke   | with Rama  ',
+                '--------|------------|------------',
+                '   1975 | Ursula K.  | The Dispos ',
+                '        |  Le Guin   | sessed     ',
+                '--------|------------|------------',
+                '   1976 |    Joe     | The        ',
+                '        |  Haldeman  | Forever    ',
+                '        |            | War        ',
+            ], printlines(mesgs))
+
+            # newlines
+
+            mesgs = await core.stormlist('''
+                $printer = $lib.tabular.printer(({
+                    "columns": [
+                        {"name": "Foo", "width": 10},
+                        {"name": "Bar", "width": 10, "newlines": "split"},
+                        {"name": "Baz", "newlines": "split"},
+                    ],
+                }))
+
+                $lib.print($printer.header())
+                $lib.print($printer.row(("aaa\\nbbb", "ccc\\nddd", "eee\\nfff")))
+                $lib.print($printer.row(("a", "dummy", "row")))
+            ''', opts=opts)
+            self.stormHasNoWarnErr(mesgs)
+            self.eq([
+                ' Foo        | Bar        | Baz ',
+                '============|============|=====',
+                ' aaa bbb    | ccc ddd    | eee ',
+                '            |            | fff ',
+                '------------|------------|-----',
+                ' a          | dummy      | row ',
+            ], printlines(mesgs))
+
+            # reprs
+
+            mesgs = await core.stormlist('''
+                $printer = $lib.tabular.printer(({
+                    "separators": {"header:row": "", "data:row": ""},
+                    "columns": [{"name": "Foo", "width": 20}],
+                }))
+
+                $lib.print($printer.row(($lib.null,)))
+                $lib.print($printer.row((({"bar": "baz"}),)))
+                $lib.print($printer.row((${ps:name=cool},)))
+            ''', opts=opts)
+            self.stormHasNoWarnErr(mesgs)
+            self.eq([
+                "                      ",
+                " {'bar': 'baz'}       ",
+                " ps:name=cool         ",
+            ], printlines(mesgs))
+
+            # sad
+
+            with self.raises(s_exc.SchemaViolation):
+                await core.nodes('$lib.tabular.printer(({"columns": [{"name": "newp", "width": -43}]}))')
+
+            with self.raises(s_exc.BadArg) as ecm:
+                await core.nodes('''
+                    $printer = $lib.tabular.printer(({
+                        "columns": [{"name": "Foo", "width": 20}],
+                    }))
+                    $printer.row(({"yeah": "no"}))
+                ''')
+            self.eq('tabular:printer row() requires a list argument', ecm.exception.errinfo['mesg'])
+
+            with self.raises(s_exc.BadArg) as ecm:
+                await core.nodes('''
+                    $printer = $lib.tabular.printer(({
+                        "columns": [{"name": "Foo", "width": 20}],
+                    }))
+                    $printer.row((too, many, items))
+                ''')
+            self.eq('tabular:printer row() requires data length to equal column count', ecm.exception.errinfo['mesg'])

synapse/tests/test_lib_stormsvc.py

@@ -419,13 +419,16 @@ class StormSvcTest(s_test.SynTest):
             self.stormIsInPrint(f'List the storm services configured in the cortex.', msgs)
 
             msgs = await core.stormlist('service.add fake tcp://localhost:3333/foo')
-            iden = core.getStormSvcs()[0].iden
+            ssvc = core.getStormSvcs()[0]
+            iden = ssvc.iden
             self.stormIsInPrint(f'added {iden} (fake): tcp://localhost:3333/foo', msgs)
 
             msgs = await core.stormlist('service.list')
             self.stormIsInPrint('Storm service list (iden, ready, name, service name, service version, url):', msgs)
             self.stormIsInPrint(f'    {iden} false (fake) (Unknown @ Unknown): tcp://localhost:3333/foo', msgs)
 
+            self.eq(ssvc.sdef, await core._addStormSvc({'iden': iden}))
+
             msgs = await core.stormlist(f'service.del {iden[:4]}')
             self.stormIsInPrint(f'removed {iden} (fake): tcp://localhost:3333/foo', msgs)
 

synapse/tests/test_lib_stormtypes.py

@@ -3277,6 +3277,16 @@ class StormTypesTest(s_test.SynTest):
             self.eq(err[0], 'StormRuntimeError')
             self.isin('Error during base64 decoding - Incorrect padding', err[1].get('mesg'))
 
+            opts = {'vars': {'bytes': None}}
+            text = '[test:str=$lib.base64.decode($bytes)]'
+            mesgs = await core.stormlist(text, opts=opts)
+            errs = [m[1] for m in mesgs if m[0] == 'err']
+            self.len(1, errs)
+            err = errs[0]
+            self.eq(err[0], 'StormRuntimeError')
+            emsg = "Error during base64 decoding - argument should be a bytes-like object or ASCII string, not 'NoneType'"
+            self.isin(emsg, err[1].get('mesg'))
+
     async def test_storm_lib_vars(self):
 
         async with self.getTestCore() as core:

synapse/tests/test_model_base.py

@@ -278,6 +278,7 @@ class BaseTest(s_t_utils.SynTest):
                 [ meta:rule=*
                     :created=20200202 :updated=20220401 :author=*
                     :name=" My  Rule" :desc="My cool rule"
+                    :type=foo.bar
                     :text="while TRUE { BAD }"
                     :ext:id=WOOT-20 :url=https://vertex.link/rules/WOOT-20
                     <(has)+ { meta:ruleset }
@@ -287,6 +288,7 @@ class BaseTest(s_t_utils.SynTest):
             self.len(1, nodes)
 
             self.nn(nodes[0].get('author'))
+            self.eq(nodes[0].get('type'), 'foo.bar.')
             self.eq(nodes[0].get('created'), 1580601600000)
             self.eq(nodes[0].get('updated'), 1648771200000)
             self.eq(nodes[0].get('name'), 'my rule')
@@ -296,6 +298,7 @@ class BaseTest(s_t_utils.SynTest):
             self.eq(nodes[0].get('ext:id'), 'WOOT-20')
 
             self.len(1, await core.nodes('meta:rule -> ps:contact'))
+            self.len(1, await core.nodes('meta:rule -> meta:rule:type:taxonomy'))
             self.len(1, await core.nodes('meta:ruleset -> ps:contact'))
             self.len(1, await core.nodes('meta:ruleset -(has)> meta:rule -(matches)> *'))
 

synapse/tests/test_model_biz.py

@@ -51,6 +51,7 @@ class BizModelTest(s_t_utils.SynTest):
             nodes = await core.nodes('''
                 [ biz:deal=*
 
+                    :id = " 12345  "
                     :title = HeHeHaHa
                     :type = baz.faz
                     :status = foo.bar
@@ -74,6 +75,7 @@ class BizModelTest(s_t_utils.SynTest):
                 ]
             ''')
             self.len(1, nodes)
+            self.eq(nodes[0].get('id'), '12345')
             self.eq(nodes[0].get('title'), 'HeHeHaHa')
             self.eq(nodes[0].get('type'), 'baz.faz.')
             self.eq(nodes[0].get('status'), 'foo.bar.')
@@ -128,6 +130,7 @@ class BizModelTest(s_t_utils.SynTest):
             self.nn(nodes[0].get('purchase'))
 
             self.len(1, await core.nodes('biz:bundle -> biz:deal'))
+            self.len(1, await core.nodes('biz:bundle -> biz:deal +:id=12345'))
             self.len(1, await core.nodes('biz:bundle -> econ:purchase'))
             self.len(1, await core.nodes('biz:bundle -> biz:product +:name=LoLoLoL'))
             self.len(1, await core.nodes('biz:bundle -> biz:service +:name=WoWoWoW'))

synapse/tests/test_model_files.py

@@ -586,7 +586,7 @@ class FileTest(s_t_utils.SynTest):
                     :entry:primary="c:\\some\\stuff\\prog~2\\cmd.exe"
                     :entry:secondary="c:\\some\\stuff\program files\\cmd.exe"
                     :entry:extended="c:\\some\\actual\\stuff\\I\\swear\\cmd.exe"
-                    :entry:localized="c:\\some\\actual\\stuff\\I\\swear\\cmd.exe"
+                    :entry:localized="c:\\some\\actual\\archivos\\I\\swear\\cmd.exe"
                     :entry:icon="%windir%\\system32\\notepad.exe"
 
                     :environment:path="%windir%\\system32\\cmd.exe"
@@ -602,6 +602,10 @@ class FileTest(s_t_utils.SynTest):
                     :target:created="2023/01/25 18:57:45.284"
                     :target:accessed="2023/01/25 18:57:45.284"
                     :target:written="2023/01/25 18:57:45.284"
+
+                    :driveserial=0x6af54670
+                    :machineid=stellarcollapse
+                    :iconindex=1
             ]''')
             self.len(1, nodes)
             node = nodes[0]
@@ -609,7 +613,7 @@ class FileTest(s_t_utils.SynTest):
             self.eq(node.get('entry:primary'), 'c:/some/stuff/prog~2/cmd.exe')
             self.eq(node.get('entry:secondary'), 'c:/some/stuff/program files/cmd.exe')
             self.eq(node.get('entry:extended'), 'c:/some/actual/stuff/i/swear/cmd.exe')
-            self.eq(node.get('entry:localized'), 'c:/some/actual/stuff/i/swear/cmd.exe')
+            self.eq(node.get('entry:localized'), 'c:/some/actual/archivos/i/swear/cmd.exe')
 
             self.eq(node.get('entry:icon'), '%windir%/system32/notepad.exe')
             self.eq(node.get('environment:path'), '%windir%/system32/cmd.exe')
@@ -628,3 +632,9 @@ class FileTest(s_t_utils.SynTest):
             self.eq(node.get('target:created'), time)
             self.eq(node.get('target:accessed'), time)
             self.eq(node.get('target:written'), time)
+
+            self.eq(node.get('driveserial'), 0x6af54670)
+            self.eq(node.get('machineid'), 'stellarcollapse')
+            self.eq(node.get('iconindex'), 1)
+
+            self.len(1, await core.nodes('file:mime:lnk -> it:hostname'))

synapse/tests/test_model_inet.py

@@ -3173,16 +3173,19 @@ class InetModelTest(s_t_utils.SynTest):
             q = '''
             [
                 (inet:service:message=(blackout, developers, 1715856900000, vertex, slack)
+                    :type=chat.group
                     :group=$devsiden
                     :public=$lib.false
                 )
 
                 (inet:service:message=(blackout, visi, 1715856900000, vertex, slack)
+                    :type=chat.direct
                     :to=$visiiden
                     :public=$lib.false
                 )
 
                 (inet:service:message=(blackout, general, 1715856900000, vertex, slack)
+                    :type=chat.channel
                     :channel=$gnrliden
                     :public=$lib.true
                 )
@@ -3224,12 +3227,33 @@ class InetModelTest(s_t_utils.SynTest):
 
             self.eq(nodes[0].get('group'), devsgrp.ndef[1])
             self.false(nodes[0].get('public'))
+            self.eq(nodes[0].get('type'), 'chat.group.')
 
             self.eq(nodes[1].get('to'), visiacct.ndef[1])
             self.false(nodes[1].get('public'))
+            self.eq(nodes[1].get('type'), 'chat.direct.')
 
             self.eq(nodes[2].get('channel'), gnrlchan.ndef[1])
             self.true(nodes[2].get('public'))
+            self.eq(nodes[2].get('type'), 'chat.channel.')
+
+            svcmsgs = await core.nodes('inet:service:message:type:taxonomy -> inet:service:message')
+            self.len(3, svcmsgs)
+            self.sorteq(
+                [k.ndef for k in svcmsgs],
+                [k.ndef for k in nodes],
+            )
+
+            nodes = await core.nodes('inet:service:message:type:taxonomy')
+            self.len(4, nodes)
+            self.sorteq(
+                [k.ndef[1] for k in nodes],
+                ('chat.', 'chat.channel.', 'chat.direct.', 'chat.group.'),
+            )
+
+            nodes = await core.nodes('inet:service:message:type:taxonomy=chat.channel -> inet:service:message')
+            self.len(1, nodes)
+            self.eq(nodes[0].ndef, ('inet:service:message', 'c0d64c559e2f42d57b37b558458c068b'))
 
             q = '''
             [ inet:service:resource=(web, api, vertex, slack)

synapse/tests/test_tools_aha.py

@@ -9,6 +9,7 @@ import synapse.lib.cell as s_cell
 import synapse.tests.utils as s_t_utils
 
 import synapse.tools.aha.list as s_a_list
+import synapse.tools.aha.clone as s_a_clone
 import synapse.tools.aha.enroll as s_a_enroll
 import synapse.tools.aha.easycert as s_a_easycert
 import synapse.tools.aha.provision.user as s_a_provision_user
@@ -17,40 +18,37 @@ class AhaToolsTest(s_t_utils.SynTest):
 
     async def test_aha_list(self):
 
-        ephemeral_address = 'tcp://0.0.0.0:0/'
-        async with self.getTestAha(conf={'auth:passwd': 'root',
-                                         'dmon:listen': ephemeral_address}) as aha:
-            _, port = aha.sockaddr
-            ahaurl = f'tcp://root:root@127.0.0.1:{port}'
-            conf0 = {
-                'aha:registry': ahaurl,
-                'aha:name': 'cell0',
-                'aha:network': 'demo.net',
-                'dmon:listen': ephemeral_address,
-            }
-            conf1 = {
-                'aha:registry': ahaurl,
-                'aha:name': 'cell1',
-                'aha:network': 'example.net',
-                'dmon:listen': ephemeral_address,
-            }
+        async with self.getTestAha() as aha:
+
             waiter = aha.waiter(2, 'aha:svcadd')
+            conf0 = {'aha:provision': await aha.addAhaSvcProv('cell0')}
+
+            provinfo = {'aha:network': 'example.net'}
+            conf1 = {'aha:provision': await aha.addAhaSvcProv('cell1', provinfo=provinfo)}
+
+            ahaurl = aha.getLocalUrl()
+
             async with self.getTestCell(s_cell.Cell, conf=conf0) as cell0:
+
                 async with self.getTestCell(s_cell.Cell, conf=conf1) as cell1:
+
                     self.true(await waiter.wait(timeout=6))
+
                     argv = [ahaurl]
                     retn, outp = await self.execToolMain(s_a_list._main, argv)
                     self.eq(retn, 0)
-                    outp.expect('Service              network                        leader')
-                    outp.expect('cell0                demo.net                       None')
-                    outp.expect('cell1                example.net                    None')
+
+                    outp.expect('''
+                        Service              network                        leader
+                        cell0                synapse                        None
+                        cell1                example.net                    None
+                    ''', whitespace=False)
 
                     argv = [ahaurl, 'demo.net']
                     retn, outp = await self.execToolMain(s_a_list._main, argv)
                     self.eq(retn, 0)
-                    outp.expect('Service              network')
-                    outp.expect('cell0                demo.net')
-                    self.false(outp.expect('cell1                example.net', throw=False))
+                    outp.expect('Service              network', whitespace=False)
+                    outp.expect('cell0                demo.net', whitespace=False)
 
         async with self.getTestCore() as core:
             curl = core.getLocalUrl()
@@ -94,102 +92,81 @@ class AhaToolsTest(s_t_utils.SynTest):
 
     async def test_aha_enroll(self):
 
-        with self.getTestDir() as dirn:
-
-            conf = {
-                'aha:name': 'aha',
-                'aha:network': 'loop.vertex.link',
-                'provision:listen': 'ssl://aha.loop.vertex.link:0',
-                'dmon:listen': 'tcp://0.0.0.0:0'
-            }
-            async with self.getTestAha(dirn=dirn, conf=conf) as aha:
-
-                addr, port = aha.provdmon.addr
-                aha.conf['provision:listen'] = f'ssl://aha.loop.vertex.link:{port}'
-
-                host_, ahaport = aha.sockaddr
-                self.eq(aha._getAhaUrls(), [f'ssl://aha.loop.vertex.link:{ahaport}'])
+        async with self.getTestAha() as aha:
 
-                argv = ['--url', aha.getLocalUrl(), 'visi']
-                retn, outp = await self.execToolMain(s_a_provision_user.main, argv)
-                self.isin('one-time use URL:', str(outp))
-
-                provurl = str(outp).split(':', 1)[1].strip()
-                with self.getTestSynDir() as syndir:
+            argv = ['--url', aha.getLocalUrl(), '01.aha.loop.vertex.link']
+            retn, outp = await self.execToolMain(s_a_clone.main, argv)
+            self.eq(retn, 0)
+            self.isin('one-time use URL:', str(outp))
 
-                    capath = s_common.genpath(syndir, 'certs', 'cas', 'loop.vertex.link.crt')
-                    crtpath = s_common.genpath(syndir, 'certs', 'users', 'visi@loop.vertex.link.crt')
-                    keypath = s_common.genpath(syndir, 'certs', 'users', 'visi@loop.vertex.link.key')
+            argv = ['--url', aha.getLocalUrl(), '01.aha.loop.vertex.link', '--only-url']
+            retn, outp = await self.execToolMain(s_a_clone.main, argv)
+            self.eq(retn, 0)
+            self.notin('one-time use URL:', str(outp))
 
-                    for path in (capath, crtpath, keypath):
-                        s_common.genfile(path)
+            argv = ['--url', 'newp://1.2.3.4', '01.aha.loop.vertex.link']
+            retn, outp = await self.execToolMain(s_a_clone.main, argv)
+            self.eq(retn, 1)
+            self.isin('ERROR: Invalid URL scheme: newp', str(outp))
 
-                    yamlpath = s_common.genpath(syndir, 'telepath.yaml')
-                    s_common.yamlsave({'aha:servers': 'cell://aha'}, yamlpath)
+            argv = ['--url', aha.getLocalUrl(), 'visi']
+            retn, outp = await self.execToolMain(s_a_provision_user.main, argv)
+            self.isin('one-time use URL:', str(outp))
 
-                    retn, outp = await self.execToolMain(s_a_enroll.main, (provurl,))
-                    self.eq(0, retn)
+            provurl = str(outp).split(':', 1)[1].strip()
+            with self.getTestSynDir() as syndir:
 
-                    for path in (capath, crtpath, keypath):
-                        self.gt(os.path.getsize(path), 0)
+                capath = s_common.genpath(syndir, 'certs', 'cas', 'synapse.crt')
+                crtpath = s_common.genpath(syndir, 'certs', 'users', 'visi@synapse.crt')
+                keypath = s_common.genpath(syndir, 'certs', 'users', 'visi@synapse.crt')
 
-                    teleyaml = s_common.yamlload(syndir, 'telepath.yaml')
-                    self.eq(teleyaml.get('version'), 1)
-                    self.eq(teleyaml.get('aha:servers'), ('cell://aha', f'ssl://visi@aha.loop.vertex.link:{ahaport}'))
+                retn, outp = await self.execToolMain(s_a_enroll.main, (provurl,))
+                self.eq(0, retn)
 
-                    shutil.rmtree(s_common.genpath(syndir, 'certs'))
+                for path in (capath, crtpath, keypath):
+                    self.true(os.path.isfile(path))
+                    self.gt(os.path.getsize(path), 0)
 
-                    def _strUrl(self):
-                        return 'ssl://aha.loop.vertex.link'
+                teleyaml = s_common.yamlload(syndir, 'telepath.yaml')
+                self.eq(teleyaml.get('version'), 1)
+                self.len(1, teleyaml.get('aha:servers'))
 
-                    with mock.patch('synapse.lib.aha.AhaCell._getAhaUrls', _strUrl):
+                shutil.rmtree(s_common.genpath(syndir, 'certs'))
 
-                        argv = ['--again', '--url', aha.getLocalUrl(), 'visi']
-                        retn, outp = await self.execToolMain(s_a_provision_user.main, argv)
-                        self.eq(retn, 0)
-                        self.isin('one-time use URL:', str(outp))
-
-                        provurl = str(outp).split(':', 1)[1].strip()
-
-                        retn, outp = await self.execToolMain(s_a_enroll.main, (provurl,))
-
-                        servers = ['cell://aha',
-                                   'ssl://visi@aha.loop.vertex.link',
-                                   f'ssl://visi@aha.loop.vertex.link:{ahaport}']
+                argv = ['--again', '--url', aha.getLocalUrl(), 'visi']
+                retn, outp = await self.execToolMain(s_a_provision_user.main, argv)
+                self.eq(retn, 0)
+                self.isin('one-time use URL:', str(outp))
 
-                        teleyaml = s_common.yamlload(syndir, 'telepath.yaml')
-                        self.sorteq(teleyaml.get('aha:servers'), servers)
+                provurl = str(outp).split(':', 1)[1].strip()
 
-                        # Just return the URL
-                        retn, outp = await self.execToolMain(s_a_provision_user.main, argv + ['--only-url'])
-                        self.eq(retn, 0)
-                        self.notin('one-time use URL:', str(outp))
-                        self.isin('ssl://', str(outp))
+                retn, outp = await self.execToolMain(s_a_enroll.main, (provurl,))
 
-                with self.getTestSynDir() as syndir:
+                # Just return the URL
+                retn, outp = await self.execToolMain(s_a_provision_user.main, argv + ['--only-url'])
+                self.eq(retn, 0)
+                self.notin('one-time use URL:', str(outp))
+                self.isin('ssl://', str(outp))
 
-                    argv = ['--again', '--url', aha.getLocalUrl(), 'visi']
-                    retn, outp = await self.execToolMain(s_a_provision_user.main, argv)
-                    self.eq(retn, 0)
-                    provurl = str(outp).split(':', 1)[1].strip()
+            with self.getTestSynDir() as syndir:
 
-                    capath = s_common.genpath(syndir, 'certs', 'cas', 'loop.vertex.link.crt')
-                    crtpath = s_common.genpath(syndir, 'certs', 'users', 'visi@loop.vertex.link.crt')
-                    keypath = s_common.genpath(syndir, 'certs', 'users', 'visi@loop.vertex.link.key')
+                argv = ['--again', '--url', aha.getLocalUrl(), 'visi']
+                retn, outp = await self.execToolMain(s_a_provision_user.main, argv)
+                self.eq(retn, 0)
+                provurl = str(outp).split(':', 1)[1].strip()
 
-                    for path in (capath, crtpath, keypath):
-                        s_common.genfile(path)
+                capath = s_common.genpath(syndir, 'certs', 'cas', 'synapse.crt')
+                crtpath = s_common.genpath(syndir, 'certs', 'users', 'visi@synapse.crt')
+                keypath = s_common.genpath(syndir, 'certs', 'users', 'visi@synapse.key')
 
-                    yamlpath = s_common.genpath(syndir, 'telepath.yaml')
-                    s_common.yamlsave({'aha:servers': ['cell://aha', 'cell://foo', ['cell://bar']]}, yamlpath)
+                for path in (capath, crtpath, keypath):
+                    s_common.genfile(path)
 
-                    retn, outp = await self.execToolMain(s_a_enroll.main, (provurl,))
-                    self.eq(0, retn)
+                retn, outp = await self.execToolMain(s_a_enroll.main, (provurl,))
+                self.eq(0, retn)
 
-                    for path in (capath, crtpath, keypath):
-                        self.gt(os.path.getsize(path), 0)
+                for path in (capath, crtpath, keypath):
+                    self.gt(os.path.getsize(path), 0)
 
-                    teleyaml = s_common.yamlload(syndir, 'telepath.yaml')
-                    self.eq(teleyaml.get('version'), 1)
-                    self.eq(teleyaml.get('aha:servers'), ('cell://aha', 'cell://foo', ('cell://bar',),
-                                                          f'ssl://visi@aha.loop.vertex.link:{ahaport}'))
+                teleyaml = s_common.yamlload(syndir, 'telepath.yaml')
+                self.eq(teleyaml.get('version'), 1)