synapse 2.166.0__py311-none-any.whl → 2.167.0__py311-none-any.whl

synapse/tests/test_lib_stormlib_aha.py

@@ -0,0 +1,196 @@
+import synapse.exc as s_exc
+import synapse.common as s_common
+import synapse.cortex as s_cortex
+
+import synapse.lib.cell as s_cell
+
+import synapse.tests.utils as s_test
+
+class AhaLibTest(s_test.SynTest):
+
+    async def test_stormlib_aha_basics(self):
+
+        async with self.getTestAhaProv() as aha:
+
+            with self.getTestDir() as dirn:
+
+                dirn00 = s_common.genpath(dirn, 'cell00')
+                dirn01 = s_common.genpath(dirn, 'cell01')
+                dirn02 = s_common.genpath(dirn, 'cell02')
+                dirn03 = s_common.genpath(dirn, 'cell03')
+
+                replay = s_common.envbool('SYNDEV_NEXUS_REPLAY')
+                nevents = 10 if replay else 5
+
+                waiter = aha.waiter(nevents, 'aha:svcadd')
+
+                cell00 = await aha.enter_context(self.addSvcToAha(aha, '00.cell', s_cell.Cell, dirn=dirn00))
+                cell01 = await aha.enter_context(self.addSvcToAha(aha, '01.cell', s_cell.Cell, dirn=dirn01,
+                                                                  provinfo={'mirror': 'cell'}))
+                cell02 = await aha.enter_context(self.addSvcToAha(aha, 'mysvc', s_cell.Cell, dirn=dirn02))
+                core00 = await aha.enter_context(self.addSvcToAha(aha, 'core', s_cortex.Cortex, dirn=dirn03))
+
+                self.len(nevents, await waiter.wait(timeout=12))
+
+                svcs = await core00.callStorm('$l=() for $i in $lib.aha.list() { $l.append($i) } fini { return ($l) }')
+                self.len(5, svcs)
+
+                svc = await core00.callStorm('return( $lib.aha.get(core...) )')
+                self.eq('core.loop.vertex.link', svc.get('name'))
+                svc = await core00.callStorm('return( $lib.aha.get(core.loop.vertex.link))')
+                self.eq('core.loop.vertex.link', svc.get('name'))
+                svc = await core00.callStorm('return( $lib.aha.get(00.cell...))')
+                self.eq('00.cell.loop.vertex.link', svc.get('name'))
+                svc = await core00.callStorm('return( $lib.aha.get(cell...))')
+                self.eq('cell.loop.vertex.link', svc.get('name'))
+                svc = await core00.callStorm('$f=({"mirror": (true)}) return( $lib.aha.get(cell..., filters=$f))')
+                self.eq('01.cell.loop.vertex.link', svc.get('name'))
+
+                # List the aha services available
+                msgs = await core00.stormlist('aha.svc.list --nexus')
+                self.stormIsInPrint('Nexus', msgs)
+                self.stormIsInPrint('00.cell.loop.vertex.link                      true   true   true', msgs)
+                self.stormIsInPrint('01.cell.loop.vertex.link                      false  true   true', msgs)
+                self.stormIsInPrint('cell.loop.vertex.link                         true   true   true', msgs)
+                self.stormIsInPrint('core.loop.vertex.link                         null   true   true', msgs)
+                self.stormIsInPrint('mysvc.loop.vertex.link                        null   true   true', msgs)
+
+                msgs = await core00.stormlist('aha.svc.list')
+                self.stormNotInPrint('Nexus', msgs)
+                msgs = await core00.stormlist('aha.svc.stat cell...')
+
+                # The connections information includes runtime information such as port/host info.
+                # Omit checking part of that.
+                emsg = '''Resolved cell... to an AHA Service.
+
+Name:       cell.loop.vertex.link
+Online:     true
+Ready:      true
+Run iden:   ********************************
+Cell iden:  ********************************
+Leader:     cell
+Connection information:
+    ca:         loop.vertex.link
+'''
+                self.stormIsInPrint(emsg, msgs, deguid=True)
+                self.stormIsInPrint('    hostname:   00.cell.loop.vertex.link', msgs)
+                self.stormIsInPrint('    scheme:     ssl', msgs)
+                self.stormIsInPrint('    user:       root', msgs)
+
+                msgs = await core00.stormlist('aha.svc.stat --nexus cell...')
+                emsg = '''Resolved cell... to an AHA Service.
+
+Name:       cell.loop.vertex.link
+Online:     true
+Ready:      true
+Run iden:   ********************************
+Cell iden:  ********************************
+Leader:     cell
+Nexus:      1
+Connection information:
+    ca:         loop.vertex.link
+'''
+                self.stormIsInPrint(emsg, msgs, deguid=True)
+
+                msgs = await core00.stormlist('aha.svc.stat --nexus 01.cell...')
+                emsg = '''Resolved 01.cell... to an AHA Service.
+
+Name:       01.cell.loop.vertex.link
+Online:     true
+Ready:      true
+Run iden:   ********************************
+Cell iden:  ********************************
+Leader:     cell
+Nexus:      1
+Connection information:
+    ca:         loop.vertex.link
+'''
+                self.stormIsInPrint(emsg, msgs, deguid=True)
+
+                # Full name works
+                msgs = await core00.stormlist('aha.svc.stat 01.cell.loop.vertex.link')
+                emsg = '''Resolved 01.cell.loop.vertex.link to an AHA Service.
+
+Name:       01.cell.loop.vertex.link
+'''
+                self.stormIsInPrint(emsg, msgs, deguid=True)
+
+                # No item for pool00 yet..
+                msgs = await core00.stormlist('aha.svc.stat pool00...')
+                self.stormIsInPrint('No service found for: "pool00..."', msgs)
+
+                msgs = await core00.stormlist('aha.pool.add pool00...')
+                self.stormHasNoWarnErr(msgs)
+                msgs = await core00.stormlist('aha.pool.svc.add pool00... 00.cell...')
+                self.stormHasNoWarnErr(msgs)
+
+                msgs = await core00.stormlist('aha.svc.stat --nexus pool00...')
+                emsg = '''Resolved pool00... to an AHA Pool.
+
+The pool currently has 1 members.
+AHA Pool:   pool00.loop.vertex.link
+Member:     00.cell.loop.vertex.link'''
+                self.stormIsInPrint(emsg, msgs)
+
+                # Shut down a service
+                nevents = 2 if replay else 1
+                waiter = aha.waiter(nevents, 'aha:svcdown')
+                await cell01.fini()
+                self.len(nevents, await waiter.wait(timeout=12))
+
+                msgs = await core00.stormlist('aha.svc.list')
+                self.stormIsInPrint('01.cell.loop.vertex.link                      false  false  true', msgs)
+
+                # Fake a record
+                await aha.addAhaSvc('00.newp', info={'urlinfo': {'scheme': 'tcp', 'host': '0.0.0.0', 'port': '3030'}},
+                                    network='loop.vertex.link')
+
+                msgs = await core00.stormlist('aha.svc.list --nexus')
+                emsg = '00.newp.loop.vertex.link                      null   false  null  0.0.0.0         3030  ' \
+                       'Service is not online. Will not attempt to retrieve its nexus offset.'
+                self.stormIsInPrint(emsg, msgs)
+
+                self.none(await core00.callStorm('return($lib.aha.del(00.newp...))'))
+                msgs = await core00.stormlist('aha.svc.list')
+                self.stormNotInPrint('00.newp', msgs)
+
+                # Fake a online record
+                guid = s_common.guid()
+                await aha.addAhaSvc('00.newp', info={'urlinfo': {'scheme': 'tcp',
+                                                                 'host': '0.0.0.0',
+                                                                 'port': '3030'},
+                                                     'online': guid,
+                                                     },
+                                    network='loop.vertex.link')
+                msgs = await core00.stormlist('aha.svc.list --nexus')
+                emsg = '00.newp.loop.vertex.link                      null   true   null  0.0.0.0         3030  ' \
+                       'Failed to connect to Telepath service: "aha://00.newp.loop.vertex.link/" error:'
+                self.stormIsInPrint(emsg, msgs)
+
+                msgs = await core00.stormlist('aha.svc.stat --nexus 00.newp...')
+                emsg = '''Resolved 00.newp... to an AHA Service.
+
+Name:       00.newp.loop.vertex.link
+Online:     true
+Ready:      null
+Run iden:   $lib.null
+Cell iden:  $lib.null
+Leader:     Service did not register itself with a leader name.
+Nexus:      Failed to connect to Telepath service: "aha://00.newp.loop.vertex.link/" error: [Errno 111] Connect call failed ('0.0.0.0', 3030)
+Connection information:
+    host:       0.0.0.0
+    port:       3030
+    scheme:     tcp
+    user:       root'''
+                self.stormIsInPrint(emsg, msgs)
+
+                # Delete the fake service with its full service name
+                self.none(await core00.callStorm('return($lib.aha.del(00.newp.loop.vertex.link))'))
+                self.none(await core00.callStorm('return($lib.aha.get(00.newp...))'))
+
+                # Coverage for sad paths
+                with self.raises(s_exc.BadArg):
+                    await core00.callStorm('$lib.aha.del(pool00...)')
+
+                with self.raises(s_exc.NoSuchName):
+                    await core00.callStorm('$lib.aha.del(axon...)')

synapse/tests/test_lib_stormlib_compression.py

@@ -14,13 +14,13 @@ class StormlibCompressionTest(s_test.SynTest):
             text = 'ohhai'
             tenc = base64.urlsafe_b64encode((bz2.compress(text.encode()))).decode()
 
-            await core.nodes(f'[ graph:node=(node1,) :data="{tenc}" ]')
-            await core.nodes(f'[ graph:node=(node2,) :data="{text}" ]')
+            await core.nodes(f'[ tel:mob:telem=(node1,) :data="{tenc}" ]')
+            await core.nodes(f'[ tel:mob:telem=(node2,) :data="{text}" ]')
 
-            q = 'graph:node=(node1,) return($lib.compression.bzip2.un($lib.base64.decode(:data)).decode())'
+            q = 'tel:mob:telem=(node1,) return($lib.compression.bzip2.un($lib.base64.decode(:data)).decode())'
             self.eq(text, await core.callStorm(q))
 
-            q = 'graph:node=(node2,) return($lib.base64.encode($lib.compression.bzip2.en((:data).encode())))'
+            q = 'tel:mob:telem=(node2,) return($lib.base64.encode($lib.compression.bzip2.en((:data).encode())))'
             self.eq(tenc, await core.callStorm(q))
 
             await self.asyncraises(s_exc.StormRuntimeError, core.nodes('$lib.compression.bzip2.en(foo)'))
@@ -31,13 +31,13 @@ class StormlibCompressionTest(s_test.SynTest):
             text = 'ohhai'
             tenc = base64.urlsafe_b64encode((gzip.compress(text.encode()))).decode()
 
-            await core.nodes(f'[ graph:node=(node1,) :data="{tenc}" ]')
-            await core.nodes(f'[ graph:node=(node2,) :data="{text}" ]')
+            await core.nodes(f'[ tel:mob:telem=(node1,) :data="{tenc}" ]')
+            await core.nodes(f'[ tel:mob:telem=(node2,) :data="{text}" ]')
 
-            q = 'graph:node=(node1,) return($lib.compression.gzip.un($lib.base64.decode(:data)).decode())'
+            q = 'tel:mob:telem=(node1,) return($lib.compression.gzip.un($lib.base64.decode(:data)).decode())'
             self.eq(text, await core.callStorm(q))
 
-            q = 'graph:node=(node2,) return($lib.compression.gzip.en((:data).encode()))'
+            q = 'tel:mob:telem=(node2,) return($lib.compression.gzip.en((:data).encode()))'
             self.eq(text.encode(), gzip.decompress(await core.callStorm(q)))
 
             await self.asyncraises(s_exc.StormRuntimeError, core.nodes('$lib.compression.gzip.en(foo)'))
@@ -48,13 +48,13 @@ class StormlibCompressionTest(s_test.SynTest):
             text = 'ohhai'
             tenc = base64.urlsafe_b64encode((zlib.compress(text.encode()))).decode()
 
-            await core.nodes(f'[ graph:node=(node1,) :data="{tenc}" ]')
-            await core.nodes(f'[ graph:node=(node2,) :data="{text}" ]')
+            await core.nodes(f'[ tel:mob:telem=(node1,) :data="{tenc}" ]')
+            await core.nodes(f'[ tel:mob:telem=(node2,) :data="{text}" ]')
 
-            q = 'graph:node=(node1,) return($lib.compression.zlib.un($lib.base64.decode(:data)).decode())'
+            q = 'tel:mob:telem=(node1,) return($lib.compression.zlib.un($lib.base64.decode(:data)).decode())'
             self.eq(text, await core.callStorm(q))
 
-            q = 'graph:node=(node2,) return($lib.base64.encode($lib.compression.zlib.en((:data).encode())))'
+            q = 'tel:mob:telem=(node2,) return($lib.base64.encode($lib.compression.zlib.en((:data).encode())))'
             self.eq(tenc, await core.callStorm(q))
 
             await self.asyncraises(s_exc.StormRuntimeError, core.nodes('$lib.compression.zlib.en(foo)'))

synapse/tests/test_lib_stormlib_macro.py

@@ -53,6 +53,27 @@ class MacroTest(s_test.SynTest):
             with self.raises(s_exc.AuthDeny):
                 await core.nodes('$lib.macro.del(hehe)', opts=asvisi)
 
+            with self.raises(s_exc.BadArg):
+                await core.nodes('$lib.macro.set("", ${ inet:ipv4 })')
+
+            with self.raises(s_exc.BadArg):
+                await core.nodes('$lib.macro.get("")')
+
+            with self.raises(s_exc.BadArg):
+                await core.nodes('$lib.macro.del("")')
+
+            with self.raises(s_exc.BadArg):
+                await core.delStormMacro('', user=None)
+
+            with self.raises(s_exc.BadArg):
+                await core.nodes('$lib.macro.grant("", users, hehe, 3)')
+
+            with self.raises(s_exc.SchemaViolation):
+                await core.nodes('$lib.macro.mod("hehe", ({"name": ""}))')
+
+            with self.raises(s_exc.BadArg):
+                await core.nodes('$lib.macro.mod("", ({"name": "foobar"}))')
+
             with self.raises(s_exc.AuthDeny):
                 await core.nodes('$lib.macro.set(hehe, ${ inet:ipv6 })', opts=asvisi)
 
@@ -118,6 +139,14 @@ class MacroTest(s_test.SynTest):
             msgs = await core.stormlist('macro.del print', opts={'readonly': True})
             self.stormIsInErr('not marked readonly safe', msgs)
 
+            msgs = await core.stormlist('macro.set blorpblorp "+#foo"', opts=asvisi)
+            self.stormHasNoWarnErr(msgs)
+
+            await core.auth.delUser(visi.iden)
+            msgs = await core.stormlist('macro.list')
+            self.stormIsInPrint("User not found", msgs)
+            self.stormIsInPrint(visi.iden, msgs)
+
     async def test_stormlib_macro_vars(self):
 
         async with self.getTestCore() as core:
@@ -319,3 +348,68 @@ class MacroTest(s_test.SynTest):
             await visi.addRule((True, ('storm', 'macro', 'admin')))
             msgs = await core.stormlist('macro.del asdf', opts={'user': visi.iden})
             self.stormHasNoWarnErr(msgs)
+
+    async def test_stormlib_behold_macro(self):
+        self.skipIfNexusReplay()
+        async with self.getTestCore() as core:
+            host, port = await core.addHttpsPort(0, host='127.0.0.1')
+
+            visi = await core.auth.addUser('visi')
+            await visi.setPasswd('secret')
+            await visi.setAdmin(True)
+
+            async with self.getHttpSess() as sess:
+                async with sess.post(f'https://localhost:{port}/api/v1/login', json={'user': 'visi', 'passwd': 'secret'}) as resp:
+                    retn = await resp.json()
+                    self.eq('ok', retn.get('status'))
+                    self.eq('visi', retn['result']['name'])
+
+                async with sess.ws_connect(f'wss://localhost:{port}/api/v1/behold') as sock:
+                    await sock.send_json({'type': 'call:init'})
+                    mesg = await sock.receive_json()
+                    self.eq(mesg['type'], 'init')
+
+                    await core.callStorm('''
+                        $lib.macro.set('foobar', ${ file:bytes | [+#neato] })
+                        $lib.macro.set('foobar', ${ inet:ipv4 | [+#burrito] })
+                        $lib.macro.mod('foobar', ({'name': 'bizbaz'}))
+                        $lib.macro.grant('bizbaz', users, $visi, 3)
+                        $lib.macro.del('bizbaz')
+                    ''', opts={'vars': {'visi': visi.iden}})
+
+                    addmesg = await sock.receive_json()
+                    self.eq('storm:macro:add', addmesg['data']['event'])
+                    macro = addmesg['data']['info']['macro']
+                    self.eq(macro['name'], 'foobar')
+                    self.eq(macro['storm'], 'file:bytes | [+#neato]')
+                    self.ne(visi.iden, macro['user'])
+                    self.ne(visi.iden, macro['creator'])
+                    self.nn(macro['iden'])
+
+                    setmesg = await sock.receive_json()
+                    self.eq('storm:macro:mod', setmesg['data']['event'])
+                    event = setmesg['data']['info']
+                    self.nn(event['macro'])
+                    self.eq(event['info']['storm'], 'inet:ipv4 | [+#burrito]')
+                    self.nn(event['info']['updated'])
+
+                    modmesg = await sock.receive_json()
+                    self.eq('storm:macro:mod', modmesg['data']['event'])
+                    event = modmesg['data']['info']
+                    self.nn(event['macro'])
+                    self.eq(event['info']['name'], 'bizbaz')
+                    self.nn(event['info']['updated'])
+
+                    grantmesg = await sock.receive_json()
+                    self.eq('storm:macro:set:perm', grantmesg['data']['event'])
+                    event = grantmesg['data']['info']
+                    self.nn(event['macro'])
+                    self.eq(event['info']['level'], 3)
+                    self.eq(event['info']['scope'], 'users')
+                    self.eq(event['info']['iden'], visi.iden)
+
+                    delmesg = await sock.receive_json()
+                    self.eq('storm:macro:del', delmesg['data']['event'])
+                    event = delmesg['data']['info']
+                    self.nn(event['iden'])
+                    self.eq(event['name'], 'bizbaz')

synapse/tests/test_lib_stormlib_spooled.py

@@ -29,7 +29,7 @@ class StormlibSpooledTest(s_test.SynTest):
                 $set = $lib.spooled.set()
                 inet:ipv4 $set.add(:asn)
                 $set.rems((:asn,:asn))
-                [ graph:node="*" ] +graph:node [ :data=$set.list() ]
+                [ tel:mob:telem="*" ] +tel:mob:telem [ :data=$set.list() ]
             '''
             nodes = await core.nodes(q)
             self.len(1, nodes)

synapse/tests/test_lib_stormtypes.py

@@ -1343,34 +1343,34 @@ class StormTypesTest(s_test.SynTest):
             n2 = s_common.guid()
             n3 = s_common.guid()
 
-            nodes = await core.nodes('[graph:node="*" :data=$data]', opts={'vars': {'data': ghstr}})
+            nodes = await core.nodes('[tel:mob:telem="*" :data=$data]', opts={'vars': {'data': ghstr}})
             self.len(1, nodes)
             node1 = nodes[0]
 
-            nodes = await core.nodes('[graph:node="*" :data=$data]', opts={'vars': {'data': mstr}})
+            nodes = await core.nodes('[tel:mob:telem="*" :data=$data]', opts={'vars': {'data': mstr}})
             self.len(1, nodes)
             node2 = nodes[0]
-            q = '''graph:node=$n1 $gzthing = :data
+            q = '''tel:mob:telem=$n1 $gzthing = :data
                 $foo = $lib.base64.decode($gzthing).gunzip()
                 $lib.print($foo)
-                [( graph:node=$n2 :data=$foo.decode() )]'''
+                [( tel:mob:telem=$n2 :data=$foo.decode() )]'''
 
             msgs = await core.stormlist(q, opts={'vars': {'n1': node1.ndef[1], 'n2': n2}})
             self.stormHasNoWarnErr(msgs)
             self.stormIsInPrint('ohhai', msgs)
 
             # make sure we gunzip correctly
-            nodes = await core.nodes('graph:node=$valu', opts={'vars': {'valu': n2}})
+            nodes = await core.nodes('tel:mob:telem=$valu', opts={'vars': {'valu': n2}})
             self.len(1, nodes)
             self.eq(hstr, nodes[0].get('data'))
 
-            text = f'''graph:node=$n2 $bar = :data
-                    [( graph:node=$n3 :data=$lib.base64.encode($bar.encode().gzip()) )]'''
+            text = f'''tel:mob:telem=$n2 $bar = :data
+                    [( tel:mob:telem=$n3 :data=$lib.base64.encode($bar.encode().gzip()) )]'''
             msgs = await core.stormlist(text, opts={'vars': {'n2': node2.ndef[1], 'n3': n3}})
             self.stormHasNoWarnErr(msgs)
 
             # make sure we gzip correctly
-            nodes = await core.nodes('graph:node=$valu', opts={'vars': {'valu': n3}})
+            nodes = await core.nodes('tel:mob:telem=$valu', opts={'vars': {'valu': n3}})
             self.len(1, nodes)
             self.eq(mstr.encode(), gzip.decompress(base64.urlsafe_b64decode(nodes[0].props['data'])))
 
@@ -1383,30 +1383,30 @@ class StormTypesTest(s_test.SynTest):
             n2 = s_common.guid()
             n3 = s_common.guid()
 
-            nodes = await core.nodes('[graph:node="*" :data=$data]', opts={'vars': {'data': ghstr}})
+            nodes = await core.nodes('[tel:mob:telem="*" :data=$data]', opts={'vars': {'data': ghstr}})
             self.len(1, nodes)
             node1 = nodes[0]
-            nodes = await core.nodes('[graph:node="*" :data=$data]', opts={'vars': {'data': mstr}})
+            nodes = await core.nodes('[tel:mob:telem="*" :data=$data]', opts={'vars': {'data': mstr}})
             self.len(1, nodes)
             node2 = nodes[0]
 
-            q = '''graph:node=$valu $bzthing = :data $foo = $lib.base64.decode($bzthing).bunzip()
+            q = '''tel:mob:telem=$valu $bzthing = :data $foo = $lib.base64.decode($bzthing).bunzip()
             $lib.print($foo)
-            [( graph:node=$n2 :data=$foo.decode() )] -graph:node=$valu'''
+            [( tel:mob:telem=$n2 :data=$foo.decode() )] -tel:mob:telem=$valu'''
             msgs = await core.stormlist(q, opts={'vars': {'valu': node1.ndef[1], 'n2': n2}})
             self.stormHasNoWarnErr(msgs)
             self.stormIsInPrint('ohhai', msgs)
 
             # make sure we bunzip correctly
             opts = {'vars': {'iden': n2}}
-            nodes = await core.nodes('graph:node=$iden', opts=opts)
+            nodes = await core.nodes('tel:mob:telem=$iden', opts=opts)
             self.len(1, nodes)
             node = nodes[0]
             self.eq(node.get('data'), hstr)
 
             # bzip
-            q = '''graph:node=$valu $bar = :data
-                [( graph:node=$n3 :data=$lib.base64.encode($bar.encode().bzip()) )] -graph:node=$valu'''
+            q = '''tel:mob:telem=$valu $bar = :data
+                [( tel:mob:telem=$n3 :data=$lib.base64.encode($bar.encode().bzip()) )] -tel:mob:telem=$valu'''
             nodes = await core.nodes(q, opts={'vars': {'valu': node2.ndef[1], 'n3': n3}})
             self.len(1, nodes)
             node = nodes[0]
@@ -1420,13 +1420,13 @@ class StormTypesTest(s_test.SynTest):
             valu = s_common.guid()
             n2 = s_common.guid()
 
-            nodes = await core.nodes('[graph:node=$valu :data=$data]', opts={'vars': {'valu': valu, 'data': ghstr}})
+            nodes = await core.nodes('[tel:mob:telem=$valu :data=$data]', opts={'vars': {'valu': valu, 'data': ghstr}})
             self.len(1, nodes)
             node1 = nodes[0]
             self.eq(node1.get('data'), ghstr)
 
-            q = '''graph:node=$valu $jzthing=:data $foo=$jzthing.encode().json() [(graph:node=$n2 :data=$foo)]
-                  -graph:node=$valu'''
+            q = '''tel:mob:telem=$valu $jzthing=:data $foo=$jzthing.encode().json() [(tel:mob:telem=$n2 :data=$foo)]
+                  -tel:mob:telem=$valu'''
             nodes = await core.nodes(q, opts={'vars': {'valu': valu, 'n2': n2}})
             self.len(1, nodes)
             node2 = nodes[0]
@@ -1720,7 +1720,7 @@ class StormTypesTest(s_test.SynTest):
             q = '''
                 $set = $lib.set()
                 inet:ipv4 $set.add(:asn)
-                [ graph:node="*" ] +graph:node [ :data=$set.list() ]
+                [ tel:mob:telem="*" ] +tel:mob:telem [ :data=$set.list() ]
             '''
             nodes = await core.nodes(q)
             self.len(1, nodes)
@@ -1729,7 +1729,7 @@ class StormTypesTest(s_test.SynTest):
             q = '''
                 $set = $lib.set()
                 inet:ipv4 $set.adds((:asn,:asn))
-                [ graph:node="*" ] +graph:node [ :data=$set.list() ]
+                [ tel:mob:telem="*" ] +tel:mob:telem [ :data=$set.list() ]
             '''
             nodes = await core.nodes(q)
             self.len(1, nodes)
@@ -1739,7 +1739,7 @@ class StormTypesTest(s_test.SynTest):
                 $set = $lib.set()
                 inet:ipv4 $set.adds((:asn,:asn))
                 { +:asn=20 $set.rem(:asn) }
-                [ graph:node="*" ] +graph:node [ :data=$set.list() ]
+                [ tel:mob:telem="*" ] +tel:mob:telem [ :data=$set.list() ]
             '''
             nodes = await core.nodes(q)
             self.len(1, nodes)
@@ -1749,7 +1749,7 @@ class StormTypesTest(s_test.SynTest):
                 $set = $lib.set()
                 inet:ipv4 $set.add(:asn)
                 $set.rems((:asn,:asn))
-                [ graph:node="*" ] +graph:node [ :data=$set.list() ]
+                [ tel:mob:telem="*" ] +tel:mob:telem [ :data=$set.list() ]
             '''
             nodes = await core.nodes(q)
             self.len(1, nodes)
@@ -2151,7 +2151,7 @@ class StormTypesTest(s_test.SynTest):
             q = '''
                 inet:fqdn=vertex.link -> inet:dns:a -> inet:ipv4
                 $idens = $path.idens()
-                [ graph:node="*" ] +graph:node [ :data=$idens ]
+                [ tel:mob:telem="*" ] +tel:mob:telem [ :data=$idens ]
             '''
 
             idens = (
@@ -2699,6 +2699,17 @@ class StormTypesTest(s_test.SynTest):
             await core.addUserRule(user, (True, ('storm', 'lib', 'telepath', 'open', 'cell')))
             self.len(2, await core.callStorm('return ( $lib.telepath.open($url).ipv4s() )', opts=opts))
 
+            # SynErr exceptions are allowed through. They can be caught by storm.
+            with self.raises(s_exc.BadUrl):
+                await core.callStorm('$prox=$lib.telepath.open("weeeeeeeeeeeeee")')
+
+            # Python exceptions are caught and raised as StormRuntimeError exceptions.
+            with self.raises(s_exc.StormRuntimeError) as cm:
+                await core.callStorm('$prox=$lib.telepath.open("tcp://0.0.0.0:60000")')
+            emsg = cm.exception.get('mesg')
+            self.isin('Failed to connect to Telepath service: "tcp://0.0.0.0:60000" error:', emsg)
+            self.isin('Connect call failed', emsg)
+
     async def test_storm_lib_queue(self):
 
         async with self.getTestCore() as core:
@@ -4474,7 +4485,7 @@ class StormTypesTest(s_test.SynTest):
 
         async with self.getTestCore() as core:
 
-            cdef = await core.callStorm('return($lib.cron.add(query="{[graph:node=*]}", hourly=30).pack())')
+            cdef = await core.callStorm('return($lib.cron.add(query="{[tel:mob:telem=*]}", hourly=30).pack())')
             self.eq('', cdef.get('doc'))
             self.eq('', cdef.get('name'))
 
@@ -4490,7 +4501,7 @@ class StormTypesTest(s_test.SynTest):
             with self.raises(s_exc.BadArg):
                 await core.callStorm('return($lib.cron.get($iden).set(hehe, haha))', opts=opts)
 
-            mesgs = await core.stormlist('cron.add --hour +1 {[graph:node=*]} --name myname --doc mydoc')
+            mesgs = await core.stormlist('cron.add --hour +1 {[tel:mob:telem=*]} --name myname --doc mydoc')
             for mesg in mesgs:
                 if mesg[0] == 'print':
                     iden0 = mesg[1]['mesg'].split(' ')[-1]
@@ -4595,7 +4606,7 @@ class StormTypesTest(s_test.SynTest):
                 nextlayroffs = await layr.getEditOffs() + 1
 
                 # Start simple: add a cron job that creates a node every minute
-                q = "cron.add --minute +1 {[graph:node='*' :type=m1]}"
+                q = "cron.add --minute +1 {[meta:note='*' :type=m1]}"
                 mesgs = await core.stormlist(q)
                 self.stormIsInPrint('Created cron job', mesgs)
                 for mesg in mesgs:
@@ -4637,24 +4648,24 @@ class StormTypesTest(s_test.SynTest):
 
                 # Make sure it ran
                 await layr.waitEditOffs(nextlayroffs, timeout=5)
-                self.eq(1, await prox.count('graph:node:type=m1'))
+                self.eq(1, await prox.count('meta:note:type=m1'))
 
-                q = "cron.mod $guid { [graph:node='*' :type=m2] }"
+                q = "cron.mod $guid { [meta:note='*' :type=m2] }"
                 mesgs = await core.stormlist(q, opts={'vars': {'guid': guid[:6]}})
                 self.stormIsInPrint(f'Modified cron job: {guid}', mesgs)
 
-                q = "cron.mod xxx { [graph:node='*' :type=m2] }"
+                q = "cron.mod xxx { [meta:note='*' :type=m2] }"
                 mesgs = await core.stormlist(q)
                 self.stormIsInErr('does not match', mesgs)
 
                 # Make sure the old one didn't run and the new query ran
                 unixtime += 60
                 await asyncio.sleep(0)
-                self.eq(1, await prox.count('graph:node:type=m1'))
+                self.eq(1, await prox.count('meta:note:type=m1'))
                 # UNG WTF
                 await asyncio.sleep(0)
                 await asyncio.sleep(0)
-                self.eq(1, await prox.count('graph:node:type=m2'))
+                self.eq(1, await prox.count('meta:note:type=m2'))
 
                 # Delete the job
                 q = f"cron.del {guid}"
@@ -4667,8 +4678,8 @@ class StormTypesTest(s_test.SynTest):
 
                 # Make sure deleted job didn't run
                 unixtime += 60
-                self.eq(1, await prox.count('graph:node:type=m1'))
-                self.eq(1, await prox.count('graph:node:type=m2'))
+                self.eq(1, await prox.count('meta:note:type=m1'))
+                self.eq(1, await prox.count('meta:note:type=m2'))
 
                 # Test fixed minute, i.e. every hour at 17 past
                 unixtime = datetime.datetime(year=2018, month=12, day=5, hour=7, minute=10,