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

synapse/cortex.py

@@ -92,6 +92,7 @@ import synapse.lib.stormlib.scrape as s_stormlib_scrape   # NOQA
 import synapse.lib.stormlib.infosec as s_stormlib_infosec  # NOQA
 import synapse.lib.stormlib.project as s_stormlib_project  # NOQA
 import synapse.lib.stormlib.spooled as s_stormlib_spooled  # NOQA
+import synapse.lib.stormlib.tabular as s_stormlib_tabular  # NOQA
 import synapse.lib.stormlib.version as s_stormlib_version  # NOQA
 import synapse.lib.stormlib.easyperm as s_stormlib_easyperm  # NOQA
 import synapse.lib.stormlib.ethereum as s_stormlib_ethereum  # NOQA
@@ -857,7 +858,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         self.httpextapidb = self.slab.initdb('http:ext:apis')
 
         if self.inaugural:
-            await self.cellinfo.set('cortex:version', s_version.version)
+            self.cellinfo.set('cortex:version', s_version.version)
 
         corevers = self.cellinfo.get('cortex:version')
         s_version.reqVersion(corevers, reqver, exc=s_exc.BadStorageVersion,
@@ -881,7 +882,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
         self.stormmods = {}     # name: mdef
         self.stormpkgs = {}     # name: pkgdef
-        self.stormvars = None   # type: s_hive.HiveDict
+        self.stormvars = None   # type: s_lmdbslab.SafeKeyVal
 
         self.svcsbyiden = {}
         self.svcsbyname = {}
@@ -923,7 +924,9 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         # generic fini handler for the Cortex
         self.onfini(self._onCoreFini)
 
-        await self._initCoreHive()
+        self.cortexdata = self.slab.getSafeKeyVal('cortex')
+
+        await self._initCoreInfo()
         self._initStormLibs()
         self._initFeedFuncs()
 
@@ -943,6 +946,11 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             (1, self._migrateTaxonomyIface),
         ), nexs=False)
 
+        await self._bumpCellVers('cortex:storage', (
+            (1, self._storUpdateMacros),
+            (4, self._storCortexHiveMigration),
+        ), nexs=False)
+
         # Perform module loading
         await self._loadCoreMods()
         await self._loadExtModel()
@@ -961,8 +969,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
         await self._initOAuthManager()
 
-        stormdmonhive = await self.hive.open(('cortex', 'storm', 'dmons'))
-        self.stormdmonhive = await stormdmonhive.dict()
+        self.stormdmondefs = self.cortexdata.getSubKeyVal('storm:dmons:')
         self.stormdmons = await s_storm.DmonManager.anit(self)
         self.onfini(self.stormdmons)
 
@@ -973,15 +980,10 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
         await self._initRuntFuncs()
 
-        taghive = await self.hive.open(('cortex', 'tagmeta'))
-        cmdhive = await self.hive.open(('cortex', 'storm', 'cmds'))
-        pkghive = await self.hive.open(('cortex', 'storm', 'packages'))
-        svchive = await self.hive.open(('cortex', 'storm', 'services'))
-
-        self.taghive = await taghive.dict()
-        self.cmdhive = await cmdhive.dict()
-        self.pkghive = await pkghive.dict()
-        self.svchive = await svchive.dict()
+        self.tagmeta = self.cortexdata.getSubKeyVal('tagmeta:')
+        self.cmddefs = self.cortexdata.getSubKeyVal('storm:cmds:')
+        self.pkgdefs = self.cortexdata.getSubKeyVal('storm:packages:')
+        self.svcdefs = self.cortexdata.getSubKeyVal('storm:services:')
 
         await self._initDeprLocks()
         await self._warnDeprLocks()
@@ -997,29 +999,87 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
         # TODO - Remove this in 3.0.0
         ag = await self.auth.addAuthGate('cortex', 'cortex')
-        for (useriden, user) in ag.gateusers.items():
+        for useriden in ag.gateusers.keys():
+            user = self.auth.user(useriden)
+            if user is None:
+                continue
+
             mesg = f'User {useriden} ({user.name}) has a rule on the "cortex" authgate. This authgate is not used ' \
                    f'for permission checks and will be removed in Synapse v3.0.0.'
             logger.warning(mesg, extra=await self.getLogExtra(user=useriden, username=user.name))
-        for (roleiden, role) in ag.gateroles.items():
+        for roleiden in ag.gateroles.keys():
+            role = self.auth.role(roleiden)
+            if role is None:
+                continue
+
             mesg = f'Role {roleiden} ({role.name}) has a rule on the "cortex" authgate. This authgate is not used ' \
                    f'for permission checks and will be removed in Synapse v3.0.0.'
             logger.warning(mesg, extra=await self.getLogExtra(role=roleiden, rolename=role.name))
 
         self._initVaults()
 
-        await self._bumpCellVers('cortex:storage', (
-            (1, self._storUpdateMacros),
-            (2, self._storLayrFeedDefaults),
-            (3, self._updateTriggerViewIdens),
-        ), nexs=False)
+    async def _storCortexHiveMigration(self):
+
+        logger.warning('migrating Cortex data out of hive')
+
+        viewdefs = self.cortexdata.getSubKeyVal('view:info:')
+        async with await self.hive.open(('cortex', 'views')) as viewnodes:
+            for view_iden, node in viewnodes:
+                viewdict = await node.dict()
+                viewinfo = viewdict.pack()
+                viewinfo.setdefault('iden', view_iden)
+                viewdefs.set(view_iden, viewinfo)
+
+                trigdict = self.cortexdata.getSubKeyVal(f'view:{view_iden}:trigger:')
+                async with await node.open(('triggers',)) as trignodes:
+                    for iden, trig in trignodes:
+                        valu = trig.valu
+                        if valu.get('view', s_common.novalu) != view_iden:
+                            valu['view'] = view_iden
+                        trigdict.set(iden, valu)
+
+        layrdefs = self.cortexdata.getSubKeyVal('layer:info:')
+        async with await self.hive.open(('cortex', 'layers')) as layrnodes:
+            for iden, node in layrnodes:
+                layrdict = await node.dict()
+                layrinfo = layrdict.pack()
+                pushs = layrinfo.get('pushs', {})
+                if pushs:
+                    for pdef in pushs.values():
+                        pdef.setdefault('chunk:size', s_const.layer_pdef_csize)
+                        pdef.setdefault('queue:size', s_const.layer_pdef_qsize)
 
-    async def _updateTriggerViewIdens(self):
-        for view in self.views.values():
-            for trigiden, trigger in await view.listTriggers():
-                if trigger.get('view') != view.iden:
-                    trigger.tdef['view'] = view.iden
-                    await view.trigdict.set(trigiden, trigger.tdef)
+                pulls = layrinfo.get('pulls', {})
+                if pulls:
+                    pulls = layrinfo.get('pulls', {})
+                    for pdef in pulls.values():
+                        pdef.setdefault('chunk:size', s_const.layer_pdef_csize)
+                        pdef.setdefault('queue:size', s_const.layer_pdef_qsize)
+
+                layrdefs.set(iden, layrinfo)
+
+        migrs = (
+            (('agenda', 'appts'), 'agenda:appt:'),
+            (('cortex', 'tagmeta'), 'tagmeta:'),
+            (('cortex', 'storm', 'cmds'), 'storm:cmds:'),
+            (('cortex', 'storm', 'vars'), 'storm:vars:'),
+            (('cortex', 'storm', 'dmons'), 'storm:dmons:'),
+            (('cortex', 'storm', 'packages'), 'storm:packages:'),
+            (('cortex', 'storm', 'services'), 'storm:services:'),
+            (('cortex', 'model', 'forms'), 'model:forms:'),
+            (('cortex', 'model', 'props'), 'model:props:'),
+            (('cortex', 'model', 'univs'), 'model:univs:'),
+            (('cortex', 'model', 'tagprops'), 'model:tagprops:'),
+            (('cortex', 'model', 'deprlocks'), 'model:deprlocks:'),
+        )
+
+        for hivepath, kvpref in migrs:
+            subkv = self.cortexdata.getSubKeyVal(kvpref)
+            async with await self.hive.open(hivepath) as hivenode:
+                for name, node in hivenode:
+                    subkv.set(name, node.valu)
+
+        logger.warning('...Cortex data migration complete!')
 
     async def _viewNomergeToProtected(self):
         for view in self.views.values():
@@ -1449,26 +1509,6 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         role = await self.auth.getRoleByName('all')
         await role.addRule((True, ('layer', 'read')), gateiden=layriden)
 
-    async def _storLayrFeedDefaults(self):
-
-        for layer in list(self.layers.values()):
-            layrinfo = layer.layrinfo  # type: s_hive.HiveDict
-
-            pushs = layrinfo.get('pushs', {})
-            if pushs:
-                for pdef in pushs.values():
-                    pdef.setdefault('chunk:size', s_const.layer_pdef_csize)
-                    pdef.setdefault('queue:size', s_const.layer_pdef_qsize)
-                await layrinfo.set('pushs', pushs, nexs=False)
-
-            pulls = layrinfo.get('pulls', {})
-            if pulls:
-                pulls = layrinfo.get('pulls', {})
-                for pdef in pulls.values():
-                    pdef.setdefault('chunk:size', s_const.layer_pdef_csize)
-                    pdef.setdefault('queue:size', s_const.layer_pdef_qsize)
-                await layrinfo.set('pulls', pulls, nexs=False)
-
     async def initServiceRuntime(self):
 
         # do any post-nexus initialization here...
@@ -1598,8 +1638,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             mesg = 'setDeprLock() called on non-existant or non-deprecated form, property, or type.'
             raise s_exc.NoSuchProp(name=name, mesg=mesg)
 
-        self.deprlocks[name] = locked
-        await self.hive.set(('cortex', 'model', 'deprlocks'), self.deprlocks)
+        self.deprlocks.set(name, locked)
 
         for elem in todo:
             elem.locked = locked
@@ -1905,14 +1944,14 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             await core.setTagModel("cno.cve", "regex", (None, None, "[0-9]{4}", "[0-9]{5}"))
 
         '''
-        meta = self.taghive.get(tagname)
+        meta = self.tagmeta.get(tagname)
         if meta is None:
             meta = {}
 
         meta[name] = valu
         reqValidTagModel(meta)
 
-        await self.taghive.set(tagname, meta)
+        self.tagmeta.set(tagname, meta)
 
         # clear cached entries
         if name == 'regex':
@@ -1928,7 +1967,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         Arguments:
             tagname (str): The name of the tag.
         '''
-        await self.taghive.pop(tagname)
+        self.tagmeta.pop(tagname)
         self.tagvalid.clear()
         self.tagprune.clear()
 
@@ -1945,12 +1984,12 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             (object): The current value of the property.
         '''
 
-        meta = self.taghive.get(tagname)
+        meta = self.tagmeta.get(tagname)
         if meta is None:
             return None
 
         retn = meta.pop(name, None)
-        await self.taghive.set(name, meta)
+        self.tagmeta.set(tagname, meta)
 
         if name == 'regex':
             self.tagvalid.clear()
@@ -1973,7 +2012,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         parts = s_chop.tagpath(tagname)
         for tag in s_chop.tags(tagname):
 
-            meta = self.taghive.get(tag)
+            meta = self.tagmeta.get(tag)
             if meta is None:
                 continue
 
@@ -2006,7 +2045,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
                 prune.append(tag)
                 continue
 
-            meta = self.taghive.get(tag)
+            meta = self.tagmeta.get(tag)
             if meta is None:
                 continue
 
@@ -2028,7 +2067,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         Returns:
             (dict): The tag model specification or None.
         '''
-        retn = self.taghive.get(tagname)
+        retn = self.tagmeta.get(tagname)
         if retn is not None:
             return dict(retn)
 
@@ -2039,7 +2078,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         Returns:
             ([(str, dict), ...]): A list of tag model specification tuples.
         '''
-        return list(self.taghive.items())
+        return list(self.tagmeta.items())
 
     async def _finiStor(self):
         await asyncio.gather(*[view.fini() for view in self.views.values()])
@@ -2085,7 +2124,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
     async def _initStormDmons(self):
 
-        for iden, ddef in self.stormdmonhive.items():
+        for iden, ddef in self.stormdmondefs.items():
             try:
                 await self.runStormDmon(iden, ddef)
 
@@ -2097,7 +2136,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
     async def _initStormSvcs(self):
 
-        for iden, sdef in self.svchive.items():
+        for iden, sdef in self.svcdefs.items():
 
             try:
                 await self._setStormSvc(sdef)
@@ -2160,7 +2199,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         '''
         name = cdef.get('name')
         await self._setStormCmd(cdef)
-        await self.cmdhive.set(name, cdef)
+        self.cmddefs.set(name, cdef)
 
     async def _reqStormCmd(self, cdef):
 
@@ -2496,12 +2535,12 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         if ctor is None:
             return
 
-        cdef = self.cmdhive.get(name)
+        cdef = self.cmddefs.get(name)
         if cdef is None:
             mesg = f'The storm command ({name}) is not dynamic.'
             raise s_exc.CantDelCmd(mesg=mesg)
 
-        await self.cmdhive.pop(name)
+        self.cmddefs.pop(name)
         self.stormcmds.pop(name, None)
 
         await self.fire('core:cmd:change', cmd=name, act='del')
@@ -2556,7 +2595,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
     @s_nexus.Pusher.onPush('pkg:add')
     async def _addStormPkg(self, pkgdef):
         name = pkgdef.get('name')
-        olddef = self.pkghive.get(name, None)
+        olddef = self.pkgdefs.get(name, None)
         if olddef is not None:
             if s_hashitem.hashitem(pkgdef) != s_hashitem.hashitem(olddef):
                 await self._dropStormPkg(olddef)
@@ -2564,7 +2603,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
                 return
 
         await self.loadStormPkg(pkgdef)
-        await self.pkghive.set(name, pkgdef)
+        self.pkgdefs.set(name, pkgdef)
 
         self._clearPermDefs()
 
@@ -2577,7 +2616,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         await self.feedBeholder('pkg:add', pkgdef, gates=gates, perms=perms)
 
     async def delStormPkg(self, name):
-        pkgdef = self.pkghive.get(name, None)
+        pkgdef = self.pkgdefs.get(name)
         if pkgdef is None:
             mesg = f'No storm package: {name}.'
             raise s_exc.NoSuchPkg(mesg=mesg)
@@ -2589,7 +2628,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         '''
         Delete a storm package by name.
         '''
-        pkgdef = await self.pkghive.pop(name, None)
+        pkgdef = self.pkgdefs.pop(name, None)
         if pkgdef is None:
             return
 
@@ -2612,7 +2651,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         return self._getStormPkgs()
 
     def _getStormPkgs(self):
-        return copy.deepcopy(list(self.pkghive.values()))
+        return copy.deepcopy(list(self.pkgdefs.values()))
 
     async def getStormMods(self):
         return copy.deepcopy(self.stormmods)
@@ -2927,13 +2966,13 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             return ssvc.sdef
 
         ssvc = await self._setStormSvc(sdef)
-        await self.svchive.set(iden, sdef)
+        self.svcdefs.set(iden, sdef)
 
         await self.feedBeholder('svc:add', {'name': sdef.get('name'), 'iden': iden})
         return ssvc.sdef
 
     async def delStormSvc(self, iden):
-        sdef = self.svchive.get(iden)
+        sdef = self.svcdefs.get(iden)
         if sdef is None:
             mesg = f'No storm service with iden: {iden}'
             raise s_exc.NoSuchStormSvc(mesg=mesg, iden=iden)
@@ -2945,7 +2984,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         '''
         Delete a registered storm service from the cortex.
         '''
-        sdef = self.svchive.get(iden)
+        sdef = self.svcdefs.get(iden)
         if sdef is None:  # pragma: no cover
             return
 
@@ -2957,7 +2996,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         except Exception as e:
             logger.exception(f'service.del hook for service {iden} failed with error: {e}')
 
-        sdef = await self.svchive.pop(iden)
+        sdef = self.svcdefs.pop(iden)
 
         await self._delStormSvcPkgs(iden)
 
@@ -2983,7 +3022,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
     def getStormSvcPkgs(self, iden):
         pkgs = []
-        for _, pdef in self.pkghive.items():
+        for _, pdef in self.pkgdefs.items():
             pkgiden = pdef.get('svciden')
             if pkgiden and pkgiden == iden:
                 pkgs.append(pdef)
@@ -3020,17 +3059,17 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         Returns:
             dict: An updated storm service definition dictionary.
         '''
-        sdef = self.svchive.get(iden)
+        sdef = self.svcdefs.get(iden)
         if sdef is None:
             mesg = f'No storm service with iden: {iden}'
             raise s_exc.NoSuchStormSvc(mesg=mesg)
 
         sdef['evts'] = edef
-        await self.svchive.set(iden, sdef)
+        self.svcdefs.set(iden, sdef)
         return sdef
 
     async def _runStormSvcAdd(self, iden):
-        sdef = self.svchive.get(iden)
+        sdef = self.svcdefs.get(iden)
         if sdef is None:
             mesg = f'No storm service with iden: {iden}'
             raise s_exc.NoSuchStormSvc(mesg=mesg)
@@ -3047,12 +3086,12 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             return
 
         sdef['added'] = True
-        await self.svchive.set(iden, sdef)
+        self.svcdefs.set(iden, sdef)
 
     async def runStormSvcEvent(self, iden, name):
         assert name in ('add', 'del')
 
-        sdef = self.svchive.get(iden)
+        sdef = self.svcdefs.get(iden)
         if sdef is None:
             mesg = f'No storm service with iden: {iden}'
             raise s_exc.NoSuchStormSvc(mesg=mesg)
@@ -3085,15 +3124,15 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
     # Global stormvars APIs
 
     async def getStormVar(self, name, default=None):
-        return self.stormvars.get(name, default=default)
+        return self.stormvars.get(name, defv=default)
 
     @s_nexus.Pusher.onPushAuto('stormvar:pop')
     async def popStormVar(self, name, default=None):
-        return await self.stormvars.pop(name, default=default)
+        return self.stormvars.pop(name, defv=default)
 
     @s_nexus.Pusher.onPushAuto('stormvar:set')
     async def setStormVar(self, name, valu):
-        return await self.stormvars.set(name, valu)
+        return self.stormvars.set(name, valu)
 
     async def itemsStormVar(self):
         for item in self.stormvars.items():
@@ -3125,17 +3164,16 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
     async def _loadExtModel(self):
 
-        self.extforms = await (await self.hive.open(('cortex', 'model', 'forms'))).dict()
-        self.extprops = await (await self.hive.open(('cortex', 'model', 'props'))).dict()
-        self.extunivs = await (await self.hive.open(('cortex', 'model', 'univs'))).dict()
-        self.exttagprops = await (await self.hive.open(('cortex', 'model', 'tagprops'))).dict()
+        self.extforms = self.cortexdata.getSubKeyVal('model:forms:')
+        self.extprops = self.cortexdata.getSubKeyVal('model:props:')
+        self.extunivs = self.cortexdata.getSubKeyVal('model:univs:')
+        self.extedges = self.cortexdata.getSubKeyVal('model:edges:')
+        self.exttagprops = self.cortexdata.getSubKeyVal('model:tagprops:')
 
         for formname, basetype, typeopts, typeinfo in self.extforms.values():
             try:
                 self.model.addType(formname, basetype, typeopts, typeinfo)
                 form = self.model.addForm(formname, {}, ())
-            except asyncio.CancelledError:  # pragma: no cover  TODO:  remove once >= py 3.8 only
-                raise
             except Exception as e:
                 logger.warning(f'Extended form ({formname}) error: {e}')
             else:
@@ -3147,8 +3185,6 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         for form, prop, tdef, info in self.extprops.values():
             try:
                 prop = self.model.addFormProp(form, prop, tdef, info)
-            except asyncio.CancelledError:  # pragma: no cover  TODO:  remove once >= py 3.8 only
-                raise
             except Exception as e:
                 logger.warning(f'ext prop ({form}:{prop}) error: {e}')
             else:
@@ -3160,19 +3196,21 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         for prop, tdef, info in self.extunivs.values():
             try:
                 self.model.addUnivProp(prop, tdef, info)
-            except asyncio.CancelledError:  # pragma: no cover  TODO:  remove once >= py 3.8 only
-                raise
             except Exception as e:
                 logger.warning(f'ext univ ({prop}) error: {e}')
 
         for prop, tdef, info in self.exttagprops.values():
             try:
                 self.model.addTagProp(prop, tdef, info)
-            except asyncio.CancelledError:  # pragma: no cover  TODO:  remove once >= py 3.8 only
-                raise
             except Exception as e:
                 logger.warning(f'ext tag prop ({prop}) error: {e}')
 
+        for edge, info in self.extedges.values():
+            try:
+                self.model.addEdge(edge, info)
+            except Exception as e:
+                logger.warning(f'ext edge ({edge}) error: {e}')
+
     async def getExtModel(self):
         '''
         Get all extended model properties in the Cortex.
@@ -3192,6 +3230,10 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
         for prop, tdef, info in self.exttagprops.values():
             ret['tagprops'].append((prop, tdef, info))
+
+        for edge, info in self.extedges.values():
+            ret['edges'].append((edge, info))
+
         ret['version'] = (1, 0)
         return copy.deepcopy(dict(ret))
 
@@ -3206,9 +3248,10 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             Bool: True when the model was added.
 
         Raises:
-            s_exc.BadFormDef: If a form exists with a different definition the provided definition.
-            s_exc.BadPropDef: If a propery, tagprop, or universal propert from exists with a different definition
+            s_exc.BadFormDef: If a form exists with a different definition than the provided definition.
+            s_exc.BadPropDef: If a property, tagprop, or universal property exists with a different definition
                               than the provided definition.
+            s_exc.BadEdgeDef: If an edge exists with a different definition than the provided definition.
         '''
 
         # Get our current model definition
@@ -3219,11 +3262,13 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         props = {(info[0], info[1]): info for info in model.get('props', ())}
         tagprops = {info[0]: info for info in model.get('tagprops', ())}
         univs = {info[0]: info for info in model.get('univs', ())}
+        edges = {info[0]: info for info in model.get('edges', ())}
 
         efrms = {info[0]: info for info in emodl.get('forms', ())}
         eprops = {(info[0], info[1]): info for info in emodl.get('props', ())}
         etagprops = {info[0]: info for info in emodl.get('tagprops', ())}
         eunivs = {info[0]: info for info in emodl.get('univs', ())}
+        eedges = {info[0]: info for info in emodl.get('edges', ())}
 
         for (name, info) in forms.items():
             enfo = efrms.get(name)
@@ -3233,7 +3278,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             if enfo == info:
                 continue
             mesg = f'Extended form definition differs from existing definition for {name}.'
-            raise s_exc.BadFormDef(mesg)
+            raise s_exc.BadFormDef(mesg=mesg, name=name)
 
         for (name, info) in props.items():
             enfo = eprops.get(name)
@@ -3243,7 +3288,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             if enfo == info:
                 continue
             mesg = f'Extended prop definition differs from existing definition for {name}'
-            raise s_exc.BadPropDef(mesg)
+            raise s_exc.BadPropDef(mesg=mesg, name=name)
 
         for (name, info) in tagprops.items():
             enfo = etagprops.get(name)
@@ -3253,7 +3298,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             if enfo == info:
                 continue
             mesg = f'Extended tagprop definition differs from existing definition for {name}'
-            raise s_exc.BadPropDef(mesg)
+            raise s_exc.BadPropDef(mesg=mesg, name=name)
 
         for (name, info) in univs.items():
             enfo = eunivs.get(name)
@@ -3262,8 +3307,20 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
                 continue
             if enfo == info:
                 continue
-            mesg = f'Extended universal poroperty definition differs from existing definition for {name}'
-            raise s_exc.BadPropDef(mesg)
+            mesg = f'Extended universal property definition differs from existing definition for {name}'
+            raise s_exc.BadPropDef(mesg=mesg, name=name)
+
+        for (name, info) in edges.items():
+            enfo = eedges.get(name)
+            if enfo is None:
+                amodl['edges'].append(info)
+                continue
+            if enfo == info:
+                continue
+
+            (n1form, verb, n2form) = info[0]
+            mesg = f'Extended edge definition differs from existing definition for {info[0]}'
+            raise s_exc.BadEdgeDef(mesg=mesg, n1form=n1form, verb=verb, n2form=n2form)
 
         for formname, basetype, typeopts, typeinfo in amodl['forms']:
             await self.addForm(formname, basetype, typeopts, typeinfo)
@@ -3277,6 +3334,9 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         for prop, tdef, info in amodl['univs']:
             await self.addUnivProp(prop, tdef, info)
 
+        for edge, info in amodl['edges']:
+            await self.addEdge(edge, info)
+
         return True
 
     async def addUnivProp(self, name, tdef, info):
@@ -3307,7 +3367,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
         self.model.addUnivProp(name, tdef, info)
 
-        await self.extunivs.set(name, (name, tdef, info))
+        self.extunivs.set(name, (name, tdef, info))
         await self.fire('core:extmodel:change', prop=name, act='add', type='univ')
         base = '.' + name
         univ = self.model.univ(base)
@@ -3349,7 +3409,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         self.model.addType(formname, basetype, typeopts, typeinfo)
         self.model.addForm(formname, {}, ())
 
-        await self.extforms.set(formname, (formname, basetype, typeopts, typeinfo))
+        self.extforms.set(formname, (formname, basetype, typeopts, typeinfo))
         await self.fire('core:extmodel:change', form=formname, act='add', type='form')
         form = self.model.form(formname)
         ftyp = self.model.type(formname)
@@ -3379,7 +3439,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         self.model.delForm(formname)
         self.model.delType(formname)
 
-        await self.extforms.pop(formname, None)
+        self.extforms.pop(formname, None)
         await self.fire('core:extmodel:change', form=formname, act='del', type='form')
         await self.feedBeholder('model:form:del', {'form': formname})
 
@@ -3415,7 +3475,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             logger.warning(mesg)
 
         full = f'{form}:{prop}'
-        await self.extprops.set(full, (form, prop, tdef, info))
+        self.extprops.set(full, (form, prop, tdef, info))
         await self.fire('core:extmodel:change', form=form, prop=prop, act='add', type='formprop')
         prop = self.model.prop(full)
         if prop:
@@ -3448,7 +3508,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
                 raise s_exc.CantDelProp(mesg=mesg)
 
         self.model.delFormProp(form, prop)
-        await self.extprops.pop(full, None)
+        self.extprops.pop(full, None)
         await self.fire('core:extmodel:change',
                         form=form, prop=prop, act='del', type='formprop')
 
@@ -3478,7 +3538,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
                 raise s_exc.CantDelUniv(mesg=mesg)
 
         self.model.delUnivProp(prop)
-        await self.extunivs.pop(prop, None)
+        self.extunivs.pop(prop, None)
         await self.fire('core:extmodel:change', name=prop, act='del', type='univ')
         await self.feedBeholder('model:univ:del', {'prop': univname})
 
@@ -3503,7 +3563,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
         self.model.addTagProp(name, tdef, info)
 
-        await self.exttagprops.set(name, (name, tdef, info))
+        self.exttagprops.set(name, (name, tdef, info))
         await self.fire('core:tagprop:change', name=name, act='add')
         tagp = self.model.tagprop(name)
         if tagp:
@@ -3530,10 +3590,60 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
         self.model.delTagProp(name)
 
-        await self.exttagprops.pop(name, None)
+        self.exttagprops.pop(name, None)
         await self.fire('core:tagprop:change', name=name, act='del')
         await self.feedBeholder('model:tagprop:del', {'tagprop': name})
 
+    async def addEdge(self, edge, edgeinfo):
+        if not isinstance(edgeinfo, dict):
+            mesg = 'Edge info should be a dict.'
+            raise s_exc.BadArg(mesg=mesg, edgeinfo=edgeinfo)
+
+        (n1form, verb, n2form) = edge
+        if not verb.startswith('_'):
+            mesg = f'Extended edge verb must begin with "_"; got {verb}'
+            raise s_exc.BadEdgeDef(mesg=mesg, n1form=n1form, verb=verb, n2form=n2form)
+
+        if n1form is not None:
+            self.model._reqFormName(n1form)
+
+        if n2form is not None:
+            self.model._reqFormName(n2form)
+
+        if self.model.edge(edge) is not None:
+            raise s_exc.DupEdgeType.init(edge)
+
+        return await self._push('model:edge:add', edge, edgeinfo)
+
+    @s_nexus.Pusher.onPush('model:edge:add')
+    async def _addEdge(self, edge, edgeinfo):
+        if self.model.edge(edge) is not None:
+            return
+
+        self.model.addEdge(edge, edgeinfo)
+
+        self.extedges.set(s_common.guid(edge), (edge, edgeinfo))
+        await self.fire('core:extmodel:change', edge=edge, act='add', type='edge')
+        await self.feedBeholder('model:edge:add', {'edge': edge, 'info': edgeinfo})
+
+    async def delEdge(self, edge):
+        if self.extedges.get(s_common.guid(edge)) is None:
+            raise s_exc.NoSuchEdge.init(edge)
+
+        return await self._push('model:edge:del', edge)
+
+    @s_nexus.Pusher.onPush('model:edge:del')
+    async def _delEdge(self, edge):
+        edgeguid = s_common.guid(edge)
+        if self.extedges.get(edgeguid) is None:
+            return
+
+        self.model.delEdge(edge)
+
+        self.extedges.pop(edgeguid, None)
+        await self.fire('core:extmodel:change', edge=edge, act='del', type='edge')
+        await self.feedBeholder('model:edge:del', {'edge': edge})
+
     async def addNodeTag(self, user, iden, tag, valu=(None, None)):
         '''
         Add a tag to a node specified by iden.
@@ -3821,15 +3931,13 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
                         await self.waitfini(1)
 
-    async def _initCoreHive(self):
-        stormvarsnode = await self.hive.open(('cortex', 'storm', 'vars'))
-        self.stormvars = await stormvarsnode.dict()
+    async def _initCoreInfo(self):
+        self.stormvars = self.cortexdata.getSubKeyVal('storm:vars:')
         if self.inaugural:
-            await self.stormvars.set(s_stormlib_cell.runtime_fixes_key, s_stormlib_cell.getMaxHotFixes())
-        self.onfini(self.stormvars)
+            self.stormvars.set(s_stormlib_cell.runtime_fixes_key, s_stormlib_cell.getMaxHotFixes())
 
     async def _initDeprLocks(self):
-        self.deprlocks = await self.hive.get(('cortex', 'model', 'deprlocks'), {})  # type: s_hive.Node
+        self.deprlocks = self.cortexdata.getSubKeyVal('model:deprlocks:')
         # TODO: 3.0.0 conversion will truncate this hive key
 
         if self.inaugural:
@@ -4062,18 +4170,18 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
     async def _initPureStormCmds(self):
         oldcmds = []
-        for name, cdef in self.cmdhive.items():
+        for name, cdef in self.cmddefs.items():
             cmdiden = cdef.get('cmdconf', {}).get('svciden')
-            if cmdiden and self.svchive.get(cmdiden) is None:
+            if cmdiden and self.svcdefs.get(cmdiden) is None:
                 oldcmds.append(name)
             else:
                 await self._trySetStormCmd(name, cdef)
 
         for name in oldcmds:
             logger.warning(f'Removing old command: [{name}]')
-            await self.cmdhive.pop(name)
+            self.cmddefs.pop(name)
 
-        for pkgdef in self.pkghive.values():
+        for pkgdef in self.pkgdefs.values():
             await self._tryLoadStormPkg(pkgdef)
 
     async def _trySetStormCmd(self, name, cdef):
@@ -4399,9 +4507,9 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             mrev = s_modelrev.ModelRev(self)
             await mrev.revCoreLayers()
 
-    async def _loadView(self, node):
+    async def _loadView(self, vdef):
 
-        view = await self.viewctor(self, node)
+        view = await self.viewctor(self, vdef)
 
         self.views[view.iden] = view
         self.dynitems[view.iden] = view
@@ -4425,8 +4533,10 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
         defiden = self.cellinfo.get('defaultview')
 
-        for iden, node in await self.hive.open(('cortex', 'views')):
-            view = await self._loadView(node)
+        self.viewdefs = self.cortexdata.getSubKeyVal('view:info:')
+
+        for iden, vdef in self.viewdefs.items():
+            view = await self._loadView(vdef)
             if iden == defiden:
                 self.view = view
 
@@ -4450,7 +4560,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             }
             vdef = await self.addView(vdef, nexs=False)
             iden = vdef.get('iden')
-            await self.cellinfo.set('defaultview', iden)
+            self.cellinfo.set('defaultview', iden)
             self.view = self.getView(iden)
 
         self._calcViewsByLayer()
@@ -4497,13 +4607,9 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             role = await self.auth.getRoleByName('all')
             await role.addRule((True, ('view', 'read')), gateiden=iden, nexs=False)
 
-        node = await self.hive.open(('cortex', 'views', iden))
-
-        info = await node.dict()
-        for name, valu in vdef.items():
-            await info.set(name, valu)
+        self.viewdefs.set(iden, vdef)
 
-        view = await self._loadView(node)
+        view = await self._loadView(vdef)
         view.init2()
 
         self._calcViewsByLayer()
@@ -4546,7 +4652,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
         if (view := self.views.get(viewiden)) is not None:
 
-            await self.hive.pop(('cortex', 'views', viewiden))
+            self.viewdefs.pop(viewiden)
             await view.delete()
 
             self._calcViewsByLayer()
@@ -4563,8 +4669,9 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
                 continue
 
             view.layers = [lyr for lyr in view.layers if lyr.iden != layriden]
+
             layridens = [lyr.iden for lyr in view.layers]
-            await view.info.set('layers', layridens)
+            view.info['layers'] = layridens
 
             mesg = {'iden': view.iden, 'layers': layridens}
             await self.feedBeholder('view:setlayers', mesg, gates=[view.iden, layridens[0]])
@@ -4572,14 +4679,16 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             if view.parent.iden == viewiden:
                 if newparent is None:
                     view.parent = None
-                    await view.info.pop('parent')
+                    view.info['parent'] = None
                 else:
                     view.parent = newview
-                    await view.info.set('parent', newparent)
+                    view.info['parent'] = newparent
 
                 mesg = {'iden': view.iden, 'name': 'parent', 'valu': newparent}
                 await self.feedBeholder('view:set', mesg, gates=[view.iden, layridens[0]])
 
+            self.viewdefs.set(view.iden, view.info)
+
         if not layrinuse and (layr := self.layers.get(layriden)) is not None:
             del self.layers[layriden]
 
@@ -4593,8 +4702,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             await self.auth.delAuthGate(layriden)
             self.dynitems.pop(layriden)
 
-            await self.hive.pop(('cortex', 'layers', layriden))
-
+            self.layerdefs.pop(layriden)
             await layr.delete()
 
             layr.deloffs = nexsitem[0]
@@ -4629,7 +4737,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             if cview.parent is not None and cview.parent.iden == iden:
                 raise s_exc.SynErr(mesg='Cannot delete a view that has children')
 
-        await self.hive.pop(('cortex', 'views', iden))
+        self.viewdefs.pop(iden)
         await view.delete()
 
         self._calcViewsByLayer()
@@ -4665,7 +4773,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         await self.auth.delAuthGate(iden)
         self.dynitems.pop(iden)
 
-        await self.hive.pop(('cortex', 'layers', iden))
+        self.layerdefs.pop(iden)
 
         await layr.delete()
 
@@ -4811,6 +4919,60 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         else:
             return await self._addLayer(ldef, (None, None))
 
+    async def _twinLayer(self, oldlayr):
+
+        newldef = s_msgpack.deepcopy(oldlayr.layrinfo)
+
+        newldef.pop('iden', None)
+
+        newldef = await self.addLayer(newldef)
+        newlayr = self.reqLayer(newldef.get('iden'))
+
+        oldinfo = self.auth.reqAuthGate(oldlayr.iden).pack()
+
+        for userinfo in oldinfo.get('users', ()):
+
+            user = self.auth.user(userinfo.get('iden'))
+            if user is None: # pragma: no cover
+                continue
+
+            if userinfo.get('admin'):
+                await user.setAdmin(True, gateiden=newlayr.iden)
+
+            for rule in userinfo.get('rules', ()):
+                await user.addRule(rule, gateiden=newlayr.iden)
+
+        for roleinfo in oldinfo.get('roles', ()):
+
+            role = self.auth.role(roleinfo.get('iden'))
+            if role is None: # pragma: no cover
+                continue
+
+            for rule in roleinfo.get('rules', ()):
+                await role.addRule(rule, gateiden=newlayr.iden)
+
+        return newlayr
+
+    @s_nexus.Pusher.onPushAuto('layer:swap')
+    async def swapLayer(self, oldiden, newiden):
+        '''
+        Atomically swap out a layer from all views that contain it.
+        '''
+        self.reqLayer(oldiden)
+        self.reqLayer(newiden)
+
+        for view in list(self.views.values()):
+            await asyncio.sleep(0)
+
+            oldlayers = view.info.get('layers')
+            if oldiden not in oldlayers:
+                continue
+
+            newlayers = list(oldlayers)
+            newlayers[oldlayers.index(oldiden)] = newiden
+
+            await view._setLayerIdens(newlayers)
+
     @s_nexus.Pusher.onPush('layer:add', passitem=True)
     async def _addLayer(self, ldef, nexsitem):
 
@@ -4827,13 +4989,9 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
         user = await self.auth.reqUser(creator)
 
-        node = await self.hive.open(('cortex', 'layers', iden))
+        self.layerdefs.set(iden, ldef)
 
-        layrinfo = await node.dict()
-        for name, valu in ldef.items():
-            await layrinfo.set(name, valu)
-
-        layr = await self._initLayr(layrinfo, nexsoffs=nexsitem[0])
+        layr = await self._initLayr(ldef, nexsoffs=nexsitem[0])
         await user.setAdmin(True, gateiden=iden, logged=False)
 
         # forward wind the new layer to the current model version
@@ -4899,10 +5057,9 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         return await s_layer.Layer.anit(self, layrinfo)
 
     async def _initCoreLayers(self):
-        node = await self.hive.open(('cortex', 'layers'))
-        for _, node in node:
-            layrinfo = await node.dict()
-            await self._initLayr(layrinfo)
+        self.layerdefs = self.cortexdata.getSubKeyVal('layer:info:')
+        for ldef in self.layerdefs.values():
+            await self._initLayr(ldef)
 
     @s_nexus.Pusher.onPushAuto('layer:push:add')
     async def addLayrPush(self, layriden, pdef):
@@ -4925,7 +5082,9 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
         pushs[iden] = pdef
 
-        await layr.layrinfo.set('pushs', pushs)
+        layr.layrinfo['pushs'] = pushs
+        self.layerdefs.set(layr.iden, layr.layrinfo)
+
         await self.runLayrPush(layr, pdef)
 
     @s_nexus.Pusher.onPushAuto('layer:push:del')
@@ -4943,7 +5102,9 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         if pdef is None:
             return
 
-        await layr.layrinfo.set('pushs', pushs)
+        layr.layrinfo['pushs'] = pushs
+        self.layerdefs.set(layr.iden, layr.layrinfo)
+
         await self.delActiveCoro(pushiden)
 
     @s_nexus.Pusher.onPushAuto('layer:pull:add')
@@ -4966,7 +5127,9 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
             return
 
         pulls[iden] = pdef
-        await layr.layrinfo.set('pulls', pulls)
+
+        layr.layrinfo['pulls'] = pulls
+        self.layerdefs.set(layr.iden, layr.layrinfo)
 
         await self.runLayrPull(layr, pdef)
 
@@ -4985,7 +5148,9 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         if pdef is None:
             return
 
-        await layr.layrinfo.set('pulls', pulls)
+        layr.layrinfo['pulls'] = pulls
+        self.layerdefs.set(layr.iden, layr.layrinfo)
+
         await self.delActiveCoro(pulliden)
 
     async def runLayrPush(self, layr, pdef):
@@ -5106,24 +5271,20 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         newpath = s_common.gendir(self.dirn, 'layers', newiden)
         await layr.clone(newpath)
 
-        node = await self.hive.open(('cortex', 'layers', iden))
-        copynode = await self.hive.open(('cortex', 'layers', newiden))
+        copyinfo = self.layerdefs.get(iden)
 
-        layrinfo = await node.dict()
-        copyinfo = await copynode.dict()
-        for name, valu in layrinfo.items():
-            await copyinfo.set(name, valu)
+        for name, valu in copyinfo.items():
+            ldef.setdefault(name, valu)
 
-        for name, valu in ldef.items():
-            await copyinfo.set(name, valu)
+        self.layerdefs.set(newiden, ldef)
 
-        copylayr = await self._initLayr(copyinfo, nexsoffs=nexsitem[0])
+        copylayr = await self._initLayr(ldef, nexsoffs=nexsitem[0])
 
         creator = copyinfo.get('creator')
         user = await self.auth.reqUser(creator)
         await user.setAdmin(True, gateiden=newiden, logged=False)
 
-        return await copylayr.pack()
+        return ldef
 
     def addStormCmd(self, ctor):
         '''
@@ -5149,7 +5310,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
     @s_nexus.Pusher.onPushAuto('storm:dmon:bump')
     async def bumpStormDmon(self, iden):
-        ddef = self.stormdmonhive.get(iden)
+        ddef = self.stormdmondefs.get(iden)
         if ddef is None:
             return False
 
@@ -5166,7 +5327,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         Args:
             iden (str): User iden.
         '''
-        for dmoniden, ddef in list(self.stormdmonhive.items()):
+        for dmoniden, ddef in list(self.stormdmondefs.items()):
             if ddef.get('user') == iden:
                 await self.bumpStormDmon(dmoniden)
 
@@ -5182,7 +5343,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         dmon.enabled = True
         dmon.ddef['enabled'] = True
 
-        await self.stormdmonhive.set(iden, dmon.ddef)
+        self.stormdmondefs.set(iden, dmon.ddef)
 
         if self.isactive:
             await dmon.run()
@@ -5202,7 +5363,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
         dmon.enabled = False
         dmon.ddef['enabled'] = False
 
-        await self.stormdmonhive.set(iden, dmon.ddef)
+        self.stormdmondefs.set(iden, dmon.ddef)
 
         if self.isactive:
             await dmon.stop()
@@ -5223,14 +5384,14 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
         dmon = await self.runStormDmon(iden, ddef)
 
-        await self.stormdmonhive.set(iden, ddef)
+        self.stormdmondefs.set(iden, ddef)
         return dmon.pack()
 
     async def delStormDmon(self, iden):
         '''
         Stop and remove a storm dmon.
         '''
-        ddef = self.stormdmonhive.get(iden)
+        ddef = self.stormdmondefs.get(iden)
         if ddef is None:
             mesg = f'No storm daemon exists with iden {iden}.'
             raise s_exc.NoSuchIden(mesg=mesg)
@@ -5239,7 +5400,7 @@ class Cortex(s_oauth.OAuthMixin, s_cell.Cell):  # type: ignore
 
     @s_nexus.Pusher.onPush('storm:dmon:del')
     async def _delStormDmon(self, iden):
-        ddef = await self.stormdmonhive.pop(iden)
+        ddef = self.stormdmondefs.pop(iden)
         if ddef is None:  # pragma: no cover
             return
         await self.stormdmons.popDmon(iden)