synapse 2.186.0__py311-none-any.whl → 2.188.0__py311-none-any.whl

synapse/tests/test_lib_modelrev.py

@@ -1,9 +1,13 @@
 import datetime
+import textwrap
+
+from unittest import mock
 
 import synapse.exc as s_exc
 import synapse.common as s_common
 
 import synapse.lib.chop as s_chop
+import synapse.lib.spooled as s_spooled
 import synapse.lib.modelrev as s_modelrev
 
 import synapse.tests.utils as s_tests
@@ -126,7 +130,7 @@ class ModelRevTest(s_tests.SynTest):
             url3 = "https://alpha.com/woot"
 
             # created via: f'[it:sec:cve=CVE-2013-9999 :desc="some words" :references=({url0}, {url1}, {url2}, {url3})]'
-            nodes = await core.nodes(f'it:sec:cve=CVE-2013-9999')
+            nodes = await core.nodes('it:sec:cve=CVE-2013-9999')
             self.eq(nodes[0].ndef[1], 'cve-2013-9999')
             self.eq(nodes[0].get('desc'), 'some words')
             self.eq(nodes[0].get('references'), (url3, url1, url0, url2))
@@ -569,47 +573,106 @@ class ModelRevTest(s_tests.SynTest):
             self.len(1, nodes)
             self.eq('Foo', nodes[0].get('id'))
 
-    async def test_modelrev_cpe(self):
-        # Skip this test for now since 0_2_28 migration was disabled. This test will be moved/updated in a later PR.
-        self.skip('Model 0.2.28 disabled')
+    async def test_modelrev_0_2_29(self):
+        async with self.getRegrCore('model-0.2.29') as core:
+            self.len(2, await core.nodes('ou:industry:type:taxonomy'))
+
+    async def test_modelrev_0_2_30(self):
+        async with self.getRegrCore('model-0.2.30') as core:
+            q = '''
+                inet:ipv4=192.0.0.0 inet:ipv4=192.0.0.8 inet:ipv4=192.0.0.9 inet:ipv4=192.0.0.10 inet:ipv4=192.0.0.255
+            '''
+            nodes = await core.nodes(q)
+            typz = [node.get('type') for node in nodes]
+            self.eq(typz, ['private', 'private', 'unicast', 'unicast', 'private'])
+
+            q = '''
+            inet:ipv6="64:ff9b:1::" inet:ipv6="64:ff9b:1::1" inet:ipv6="64:ff9b:1::ffff" inet:ipv6="64:ff9b:1::ffff:1"
+            '''
+            nodes = await core.nodes(q)
+            typz = [node.get('type') for node in nodes]
+            self.eq(typz, ['private', 'private', 'private', 'private'])
+
+            q = '''
+            inet:ipv6="2002::" inet:ipv6="2002::1" inet:ipv6="2002::fffe" inet:ipv6="2002::ffff"
+            '''
+            nodes = await core.nodes(q)
+            typz = [node.get('type') for node in nodes]
+            self.eq(typz, ['private', 'private', 'private', 'private'])
+
+            q = 'inet:ipv6="2001:1::1/128" inet:ipv6="2001:1::2/128"'
+            nodes = await core.nodes(q)
+            typz = [node.get('type') for node in nodes]
+            self.eq(typz, ['unicast', 'unicast'])
+
+            q = 'inet:ipv6="2001:3::" inet:ipv6="2001:3::1" inet:ipv6="2001:3::ffff"'
+            nodes = await core.nodes(q)
+            typz = [node.get('type') for node in nodes]
+            self.eq(typz, ['unicast', 'unicast', 'unicast'])
+
+            q = 'inet:ipv6="2001:4:112::" inet:ipv6="2001:4:112::1" inet:ipv6="2001:4:112::ffff"'
+            nodes = await core.nodes(q)
+            typz = [node.get('type') for node in nodes]
+            self.eq(typz, ['unicast', 'unicast', 'unicast'])
+
+            q = 'inet:ipv6="2001:20::" inet:ipv6="2001:20::1" inet:ipv6="2001:20::ffff"'
+            nodes = await core.nodes(q)
+            typz = [node.get('type') for node in nodes]
+            self.eq(typz, ['unicast', 'unicast', 'unicast'])
+
+            q = 'inet:ipv6="2001:30::" inet:ipv6="2001:30::1" inet:ipv6="2001:30::ffff"'
+            nodes = await core.nodes(q)
+            typz = [node.get('type') for node in nodes]
+            self.eq(typz, ['unicast', 'unicast', 'unicast'])
+
+    async def test_modelrev_0_2_31(self):
 
-        async with self.getRegrCore('model-0.2.28', maxvers=(0, 2, 24)) as core:
+        self.maxDiff = None
+
+        async with self.getRegrCore('model-cpe-migration', maxvers=(0, 2, 24)) as core:
             # Do some pre-migration validation of the cortex. It's still a
             # little weird in here because the CPE types have been updated so
             # some lifting/pivoting won't work right.
 
-            views = await core.callStorm('return($lib.view.list(deporder=$lib.true))')
-            self.len(3, views)
+            # There should be nothing in the default view
+            nodes = await core.nodes('.created')
+            self.len(0, nodes)
+
+            views = {view.info.get('name'): view for view in core.listViews()}
+            self.len(5, views)
 
-            fork00 = views[1].get('iden')
+            fork00 = views.get('fork00').iden
             infork00 = {'view': fork00}
 
-            nodes = await core.nodes('it:sec:cpe')
-            self.len(11, nodes)
+            fork01 = views.get('fork01').iden
+            infork01 = {'view': fork01}
+
+            nodes = await core.nodes('it:sec:cpe', opts=infork00)
+            self.len(12, nodes)
             for node in nodes:
                 self.isin('test.cpe', node.tags)
                 data = await s_tests.alist(node.iterData())
                 self.eq([k[0] for k in data], ('cpe22', 'cpe23'))
 
-            nodes = await core.nodes('it:sec:cpe -(refs)> risk:vuln | uniq')
+            nodes = await core.nodes('it:sec:cpe -(refs)> risk:vuln | uniq', opts=infork00)
             self.len(1, nodes)
             self.eq(nodes[0].ndef, ('risk:vuln', s_common.guid(('risk', 'vuln'))))
 
-            nodes = await core.nodes('risk:vulnerable')
-            self.len(11, nodes)
+            nodes = await core.nodes('risk:vulnerable', opts=infork00)
+            self.len(12, nodes)
             for node in nodes:
                 self.nn(node.get('node'))
 
-            nodes = await core.nodes(r'it:sec:cpe:vendor="d\-link"')
+            nodes = await core.nodes(r'it:sec:cpe:vendor="d\-link"', opts=infork00)
             self.len(1, nodes)
 
-            nodes = await core.nodes('it:prod:soft', opts=infork00)
+            nodes = await core.nodes('it:prod:soft', opts=infork01)
             self.len(4, nodes)
             for node in nodes:
                 self.isin('test.prod', node.tags)
                 self.nn(node.get('cpe'))
 
-            nodes = await core.nodes('inet:flow', opts=infork00)
+            nodes = await core.nodes('inet:flow', opts=infork01)
             self.len(4, nodes)
             for node in nodes:
                 self.isin('test.flow', node.tags)
@@ -620,35 +683,56 @@ class ModelRevTest(s_tests.SynTest):
                     (srcs is not None and len(srcs) == 2)
                 ))
 
-            nodes = await core.nodes('_ext:model:form', opts=infork00)
+            nodes = await core.nodes('_ext:model:form', opts=infork01)
             self.len(4, nodes)
             for node in nodes:
                 self.isin('test.ext', node.tags)
                 self.nn(node.get('cpe'))
 
-            nodes = await core.nodes('meta:source:name="cpe.22.invalid" -(seen)> it:sec:cpe', opts=infork00)
-            self.len(5, nodes)
-
-            nodes = await core.nodes('meta:source:name="cpe.23.invalid" -(seen)> it:sec:cpe', opts=infork00)
+            nodes = await core.nodes('meta:source:name="cpe.22.invalid" -(seen)> it:sec:cpe', opts=infork01)
             self.len(6, nodes)
 
-            nodes = await core.nodes('meta:source:name="cpe.22.invalid" -> meta:seen', opts=infork00)
-            self.len(5, nodes)
+            nodes = await core.nodes('meta:source:name="cpe.23.invalid" -(seen)> it:sec:cpe', opts=infork01)
+            self.len(7, nodes)
 
-            nodes = await core.nodes('meta:source:name="cpe.23.invalid" -> meta:seen', opts=infork00)
+            nodes = await core.nodes('meta:source:name="cpe.22.invalid" -> meta:seen', opts=infork01)
             self.len(6, nodes)
 
-            nodes = await core.nodes('it:sec:vuln:scan:result', opts=infork00)
-            self.len(11, nodes)
+            nodes = await core.nodes('meta:source:name="cpe.23.invalid" -> meta:seen', opts=infork01)
+            self.len(7, nodes)
+
+            nodes = await core.nodes('it:sec:vuln:scan:result', opts=infork01)
+            self.len(13, nodes)
+
+            # Do some error checking before the queue is created
+            q = '''
+                for $entry in $lib.model.migration.s.model_0_2_31.listNodes() {
+                    $lib.print(`ENTRY: {$entry}`)
+                }
+            '''
+            msgs = await core.stormlist(q)
+            self.stormIsInPrint('Queue model_0_2_31:nodes not found, no nodes to list.', msgs)
+
+            msgs = await core.stormlist('$lib.model.migration.s.model_0_2_31.printNode((0))')
+            self.stormIsInPrint('Queue model_0_2_31:nodes not found, no nodes to print.', msgs)
 
-        async with self.getRegrCore('model-0.2.28') as core:
+            msgs = await core.stormlist('$lib.model.migration.s.model_0_2_31.repairNode((0), newp)')
+            self.stormIsInPrint('Queue model_0_2_31:nodes not found, no nodes to repair.', msgs)
 
-            views = await core.callStorm('return($lib.view.list(deporder=$lib.true))')
-            self.len(3, views)
+        async with self.getRegrCore('model-cpe-migration') as core:
 
-            fork00 = views[1].get('iden')
+            views = {view.info.get('name'): view for view in core.listViews()}
+            self.len(5, views)
+
+            fork00 = views.get('fork00').iden
             infork00 = {'view': fork00}
 
+            fork01 = views.get('fork01').iden
+            infork01 = {'view': fork01}
+
+            fork03 = views.get('fork03').iden
+            infork03 = {'view': fork03}
+
             # Calculate some timestamps
             start = datetime.datetime(year=2020, month=1, day=1, tzinfo=datetime.timezone.utc)
             end = datetime.datetime(year=2021, month=1, day=1, tzinfo=datetime.timezone.utc)
@@ -656,9 +740,9 @@ class ModelRevTest(s_tests.SynTest):
             start = int(start.timestamp() * 1000)
             end = int(end.timestamp() * 1000)
 
-            # We started with 11 CPE nodes and two got removed
-            nodes = await core.nodes('it:sec:cpe')
-            self.len(9, nodes)
+            # We started with 12 CPE nodes and one got removed
+            nodes = await core.nodes('it:sec:cpe', opts=infork00)
+            self.len(11, nodes)
             for node in nodes:
                 self.isin('test.cpe', node.tags)
                 data = await s_tests.alist(node.iterData())
@@ -670,33 +754,37 @@ class ModelRevTest(s_tests.SynTest):
 
                 self.eq((start, end), seen)
 
-            nodes = await core.nodes('it:sec:cpe#test.cpe.22invalid +#test.cpe.23invalid')
-            self.len(0, nodes)
+            nodes = await core.nodes('it:sec:cpe', opts=infork03)
+            self.len(1, nodes)
+            self.eq(nodes[0].repr(), r'cpe:2.3:a:\@ianwalter:merge:*:*:*:*:*:*:*:*')
 
-            nodes = await core.nodes('it:sec:cpe -(refs)> risk:vuln')
-            self.len(9, nodes)
+            nodes = await core.nodes('it:sec:cpe#test.cpe.22invalid +#test.cpe.23invalid', opts=infork00)
+            self.len(2, nodes)
 
-            nodes = await core.nodes('risk:vulnerable')
+            nodes = await core.nodes('it:sec:cpe -(refs)> risk:vuln', opts=infork00)
             self.len(11, nodes)
 
-            nodes = await core.nodes('risk:vulnerable:node')
-            self.len(9, nodes)
+            nodes = await core.nodes('risk:vulnerable', opts=infork00)
+            self.len(12, nodes)
 
-            nodes = await core.nodes('risk:vulnerable -> it:sec:cpe')
-            self.len(9, nodes)
+            nodes = await core.nodes('risk:vulnerable:node', opts=infork00)
+            self.len(11, nodes)
 
-            nodes = await core.nodes('risk:vulnerable -:node')
-            self.len(2, nodes)
+            nodes = await core.nodes('risk:vulnerable -> it:sec:cpe', opts=infork00)
+            self.len(11, nodes)
 
-            nodes = await core.nodes('it:prod:soft', opts=infork00)
+            nodes = await core.nodes('risk:vulnerable -:node', opts=infork00)
+            self.len(1, nodes)
+
+            nodes = await core.nodes('it:prod:soft', opts=infork01)
             self.len(4, nodes)
             for node in nodes:
                 self.isin('test.prod', node.tags)
 
-            nodes = await core.nodes('it:prod:soft:cpe', opts=infork00)
+            nodes = await core.nodes('it:prod:soft:cpe', opts=infork01)
             self.len(3, nodes)
 
-            nodes = await core.nodes('it:prod:soft -> it:sec:cpe', opts=infork00)
+            nodes = await core.nodes('it:prod:soft -> it:sec:cpe', opts=infork01)
             self.len(3, nodes)
             ndefs = [k.ndef for k in nodes]
             self.sorteq(ndefs, (
@@ -705,24 +793,28 @@ class ModelRevTest(s_tests.SynTest):
                 ('it:sec:cpe', 'cpe:2.3:o:zyxel:nas326_firmware:5.21\\(aazf.14\\)c0:*:*:*:*:*:*:*'),
             ))
 
-            nodes = await core.nodes('it:prod:soft -:cpe', opts=infork00)
+            nodes = await core.nodes('it:prod:soft -:cpe', opts=infork01)
             self.len(1, nodes)
             self.eq(nodes[0].get('name'), '22i-23i')
 
-            nodes = await core.nodes('inet:flow', opts=infork00)
+            nodes = await core.nodes('inet:flow', opts=infork01)
             self.len(4, nodes)
 
-            nodes = await core.nodes('inet:flow +(:src:cpes or :dst:cpes)', opts=infork00)
-            self.len(3, nodes)
+            nodes = await core.nodes('inet:flow +(:src:cpes or :dst:cpes)', opts=infork01)
+            self.len(4, nodes)
+
+            nodes = await core.nodes('inet:flow -(:src:cpes or :dst:cpes)', opts=infork01)
+            self.len(0, nodes)
 
-            nodes = await core.nodes('inet:flow -(:src:cpes or :dst:cpes)', opts=infork00)
+            nodes = await core.nodes('inet:flow=(flow, 22i, 23i)', opts=infork01)
             self.len(1, nodes)
-            self.eq(nodes[0].repr(), s_common.guid(('flow', '22i', '23i')))
+            self.none(nodes[0].get('dst:cpes'))
 
-            nodes = await core.nodes('inet:flow -> it:sec:cpe', opts=infork00)
-            self.len(6, nodes)
+            nodes = await core.nodes('inet:flow -> it:sec:cpe', opts=infork01)
+            self.len(7, nodes)
             ndefs = [k.ndef for k in nodes]
             self.sorteq(ndefs, (
+                ('it:sec:cpe', 'cpe:2.3:a:openbsd:openssh_server:7.4:*:*:*:*:*:*:*'),
                 ('it:sec:cpe', 'cpe:2.3:a:10web:social_feed_for_instagram:1.0.0:*:*:*:premium:wordpress:*:*'),
                 ('it:sec:cpe', 'cpe:2.3:o:zyxel:nas326_firmware:5.21\\(aazf.14\\)c0:*:*:*:*:*:*:*'),
                 ('it:sec:cpe', 'cpe:2.3:a:01generator:pireospay:-:*:*:*:*:prestashop:*:*'),
@@ -731,16 +823,16 @@ class ModelRevTest(s_tests.SynTest):
                 ('it:sec:cpe', 'cpe:2.3:a:abinitio:control\\>center:-:*:*:*:*:*:*:*'),
             ))
 
-            nodes = await core.nodes('_ext:model:form', opts=infork00)
+            nodes = await core.nodes('_ext:model:form', opts=infork01)
             self.len(4, nodes)
 
-            nodes = await core.nodes('_ext:model:form:cpe', opts=infork00)
+            nodes = await core.nodes('_ext:model:form:cpe', opts=infork01)
             self.len(3, nodes)
 
-            nodes = await core.nodes('_ext:model:form -:cpe', opts=infork00)
+            nodes = await core.nodes('_ext:model:form -:cpe', opts=infork01)
             self.len(1, nodes)
 
-            nodes = await core.nodes('_ext:model:form -> it:sec:cpe', opts=infork00)
+            nodes = await core.nodes('_ext:model:form -> it:sec:cpe', opts=infork01)
             self.len(3, nodes)
             ndefs = [k.ndef for k in nodes]
             self.sorteq(ndefs, (
@@ -749,10 +841,10 @@ class ModelRevTest(s_tests.SynTest):
                 ('it:sec:cpe', r'cpe:2.3:a:1c:1c\:enterprise:-:*:*:*:*:*:*:*'),
             ))
 
-            nodes = await core.nodes('meta:seen', opts=infork00)
+            nodes = await core.nodes('meta:seen', opts=infork01)
             self.len(3, nodes)
 
-            nodes = await core.nodes('meta:seen -> it:sec:cpe', opts=infork00)
+            nodes = await core.nodes('meta:seen -> it:sec:cpe', opts=infork01)
             self.len(3, nodes)
             ndefs = [k.ndef for k in nodes]
             self.sorteq(ndefs, (
@@ -761,7 +853,7 @@ class ModelRevTest(s_tests.SynTest):
                 ('it:sec:cpe', 'cpe:2.3:o:zyxel:nas542_firmware:5.21\\%28aazf.15\\%29co:*:*:*:*:*:*:*'),
             ))
 
-            nodes = await core.nodes('it:sec:cpe -> meta:seen -> it:sec:vuln:scan:result', opts=infork00)
+            nodes = await core.nodes('it:sec:cpe -> meta:seen -> it:sec:vuln:scan:result', opts=infork01)
             self.len(3, nodes)
             ndefs = [k.ndef for k in nodes]
             self.sorteq(ndefs, (
@@ -771,84 +863,111 @@ class ModelRevTest(s_tests.SynTest):
             ))
 
             # Check that we correctly copied over the edges
-            nodes = await core.nodes('risk:vuln <(refs)- it:sec:cpe')
-            self.len(9, nodes)
+            nodes = await core.nodes('risk:vuln <(refs)- it:sec:cpe', opts=infork00)
+            self.len(11, nodes)
 
             # Check that we correctly copied over the tags
-            nodes = await core.nodes(r'it:sec:cpe="cpe:2.3:o:zyxel:nas326_firmware:5.21\(aazf.14\)c0:*:*:*:*:*:*:*"')
+            nodes = await core.nodes(r'it:sec:cpe="cpe:2.3:o:zyxel:nas326_firmware:5.21\(aazf.14\)c0:*:*:*:*:*:*:*"', opts=infork00)
             self.len(1, nodes)
             self.isin('test.cpe.22valid', nodes[0].tags)
             self.isin('test.cpe.23invalid', nodes[0].tags)
 
-            nodes = await core.nodes('it:sec:cpe="cpe:2.3:a:10web:social_feed_for_instagram:1.0.0:*:*:*:premium:wordpress:*:*"')
+            nodes = await core.nodes('it:sec:cpe="cpe:2.3:a:10web:social_feed_for_instagram:1.0.0:*:*:*:premium:wordpress:*:*"', opts=infork00)
             self.len(1, nodes)
             self.isin('test.cpe.22valid', nodes[0].tags)
             self.isin('test.cpe.23invalid', nodes[0].tags)
 
-            nodes = await core.nodes(r'it:sec:cpe="cpe:2.3:a:acurax:under_construction_\/_maintenance_mode:-:*:*:*:*:wordpress:*:*"')
+            nodes = await core.nodes(r'it:sec:cpe="cpe:2.3:a:acurax:under_construction_\/_maintenance_mode:-:*:*:*:*:wordpress:*:*"', opts=infork00)
             self.len(1, nodes)
             self.isin('test.cpe.22valid', nodes[0].tags)
             self.isin('test.cpe.23invalid', nodes[0].tags)
 
-            nodes = await core.nodes('it:sec:cpe="cpe:2.3:h:d-link:dir-850l:*:*:*:*:*:*:*:*"')
+            nodes = await core.nodes('it:sec:cpe="cpe:2.3:h:d-link:dir-850l:*:*:*:*:*:*:*:*"', opts=infork00)
             self.len(1, nodes)
             self.isin('test.cpe.22valid', nodes[0].tags)
             self.isin('test.cpe.23invalid', nodes[0].tags)
 
+            nodes = await core.nodes('it:sec:cpe="cpe:2.3:a:openbsd:openssh_server:7.4:*:*:*:*:*:*:*"', opts=infork00)
+            self.len(1, nodes)
+            self.isin('test.cpe.22invalid', nodes[0].tags)
+            self.isin('test.cpe.23invalid', nodes[0].tags)
+
             # Check that we correctly copied over the node data
-            nodes = await core.nodes(r'it:sec:cpe="cpe:2.3:o:zyxel:nas326_firmware:5.21\(aazf.14\)c0:*:*:*:*:*:*:*"')
+            nodes = await core.nodes(r'it:sec:cpe="cpe:2.3:o:zyxel:nas326_firmware:5.21\(aazf.14\)c0:*:*:*:*:*:*:*"', opts=infork00)
             self.len(1, nodes)
             data = await s_tests.alist(nodes[0].iterData())
             self.sorteq(data, (('cpe23', 'invalid'), ('cpe22', 'valid')))
 
-            nodes = await core.nodes('it:sec:cpe="cpe:2.3:a:10web:social_feed_for_instagram:1.0.0:*:*:*:premium:wordpress:*:*"')
+            nodes = await core.nodes('it:sec:cpe="cpe:2.3:a:10web:social_feed_for_instagram:1.0.0:*:*:*:premium:wordpress:*:*"', opts=infork00)
             self.len(1, nodes)
             data = await s_tests.alist(nodes[0].iterData())
             self.sorteq(data, (('cpe23', 'invalid'), ('cpe22', 'valid')))
 
-            nodes = await core.nodes(r'it:sec:cpe="cpe:2.3:a:acurax:under_construction_\/_maintenance_mode:-:*:*:*:*:wordpress:*:*"')
+            nodes = await core.nodes(r'it:sec:cpe="cpe:2.3:a:acurax:under_construction_\/_maintenance_mode:-:*:*:*:*:wordpress:*:*"', opts=infork00)
             self.len(1, nodes)
             data = await s_tests.alist(nodes[0].iterData())
             self.sorteq(data, (('cpe23', 'invalid'), ('cpe22', 'valid')))
 
-            nodes = await core.nodes('it:sec:cpe="cpe:2.3:h:d-link:dir-850l:*:*:*:*:*:*:*:*"')
+            nodes = await core.nodes('it:sec:cpe="cpe:2.3:h:d-link:dir-850l:*:*:*:*:*:*:*:*"', opts=infork00)
             self.len(1, nodes)
             data = await s_tests.alist(nodes[0].iterData())
             self.sorteq(data, (('cpe23', 'invalid'), ('cpe22', 'valid')))
 
+            nodes = await core.nodes('it:sec:cpe="cpe:2.3:a:openbsd:openssh_server:7.4:*:*:*:*:*:*:*"', opts=infork00)
+            self.len(1, nodes)
+            data = await s_tests.alist(nodes[0].iterData())
+            self.sorteq(data, (('cpe23', 'invalid'), ('cpe22', 'invalid')))
+
             # Check that we correctly copied over the extended props
-            nodes = await core.nodes(r'it:sec:cpe="cpe:2.3:o:zyxel:nas326_firmware:5.21\(aazf.14\)c0:*:*:*:*:*:*:*"')
+            nodes = await core.nodes(r'it:sec:cpe="cpe:2.3:o:zyxel:nas326_firmware:5.21\(aazf.14\)c0:*:*:*:*:*:*:*"', opts=infork00)
             self.len(1, nodes)
             self.true(nodes[0].get('_cpe22valid'))
             self.false(nodes[0].get('_cpe23valid'))
 
-            nodes = await core.nodes('it:sec:cpe="cpe:2.3:a:10web:social_feed_for_instagram:1.0.0:*:*:*:premium:wordpress:*:*"')
+            nodes = await core.nodes('it:sec:cpe="cpe:2.3:a:10web:social_feed_for_instagram:1.0.0:*:*:*:premium:wordpress:*:*"', opts=infork00)
             self.len(1, nodes)
             self.true(nodes[0].get('_cpe22valid'))
             self.false(nodes[0].get('_cpe23valid'))
 
-            nodes = await core.nodes(r'it:sec:cpe="cpe:2.3:a:acurax:under_construction_\/_maintenance_mode:-:*:*:*:*:wordpress:*:*"')
+            nodes = await core.nodes(r'it:sec:cpe="cpe:2.3:a:acurax:under_construction_\/_maintenance_mode:-:*:*:*:*:wordpress:*:*"', opts=infork00)
             self.len(1, nodes)
             self.true(nodes[0].get('_cpe22valid'))
             self.false(nodes[0].get('_cpe23valid'))
 
-            nodes = await core.nodes('it:sec:cpe="cpe:2.3:h:d-link:dir-850l:*:*:*:*:*:*:*:*"')
+            nodes = await core.nodes('it:sec:cpe="cpe:2.3:h:d-link:dir-850l:*:*:*:*:*:*:*:*"', opts=infork00)
             self.len(1, nodes)
             self.true(nodes[0].get('_cpe22valid'))
             self.false(nodes[0].get('_cpe23valid'))
 
-        async with self.getRegrCore('model-0.2.28') as core:
+            nodes = await core.nodes('it:sec:cpe="cpe:2.3:a:openbsd:openssh_server:7.4:*:*:*:*:*:*:*"', opts=infork00)
+            self.len(1, nodes)
+            self.false(nodes[0].get('_cpe22valid'))
+            self.false(nodes[0].get('_cpe23valid'))
+
+            # There should be nothing in the default view
+            nodes = await core.nodes('.created')
+            self.len(0, nodes)
+
+        async with self.getRegrCore('model-cpe-migration') as core:
 
-            views = await core.callStorm('return($lib.view.list(deporder=$lib.true))')
-            self.len(3, views)
+            views = {view.info.get('name'): view for view in core.listViews()}
+            self.len(5, views)
 
-            fork00 = views[1].get('iden') # forked view
-            forklayr = views[1].get('layers')[0].get('iden')
+            fork00 = views.get('fork00').iden
+            fork00layr = views.get('fork00').layers[0].iden
+            infork00 = {'view': fork00}
 
-            view00 = views[0].get('iden') # default view
-            viewlayr = views[0].get('layers')[0].get('iden')
+            fork01 = views.get('fork01').iden
+            fork01layr = views.get('fork01').layers[0].iden
+            infork01 = {'view': fork01}
 
-            opts = {'view': fork00}
+            fork02 = views.get('fork02').iden # forked view
+
+            fork03 = views.get('fork03').iden
+            fork03layr = views.get('fork03').layers[0].iden
+            infork03 = {'view': fork03}
+
+            opts = {'view': fork01}
 
             nodes = await core.nodes('meta:source:name="cpe.22.invalid"', opts=opts)
             self.len(1, nodes)
@@ -864,12 +983,15 @@ class ModelRevTest(s_tests.SynTest):
             source23 = source01.ndef[1]
             source23iden = source01.iden()
 
+            riskvuln = s_common.ehex(s_common.buid(('risk:vuln', s_common.guid(('risk', 'vuln')))))
+
             invcpe00 = 'cpe:2.3:a:10web:social_feed_for_instagram:1.0.0::~~premium~wordpress~~:*:*:*:*:*'
             invcpe01 = 'cpe:2.3:a:acurax:under_construction_%2f_maintenance_mode:-::~~~wordpress~~:*:*:*:*:*'
             invcpe02 = 'cpe:2.3:a:openbsd:openssh:7.4\r\n:*:*:*:*:*:*:*'
             invcpe03 = 'cpe:2.3:a:openbsd:openssh:8.2p1 ubuntu-4ubuntu0.2:*:*:*:*:*:*:*'
             invcpe04 = 'cpe:2.3:h:d\\-link:dir\\-850l:*:*:*:*:*:*:*:*'
             invcpe05 = 'cpe:2.3:o:zyxel:nas326_firmware:5.21%28aazf.14%29c0:*:*:*:*:*:*:*'
+            invcpe06 = 'cpe:2.3:a:%40ianwalter:merge:*:*:*:*:*:*:*:*'
 
             metaseen00 = s_common.ehex(s_common.buid(('meta:seen', (source23, ('it:sec:cpe', invcpe00)))))
             metaseen01 = s_common.ehex(s_common.buid(('meta:seen', (source23, ('it:sec:cpe', invcpe01)))))
@@ -879,344 +1001,761 @@ class ModelRevTest(s_tests.SynTest):
             metaseen05 = s_common.ehex(s_common.buid(('meta:seen', (source22, ('it:sec:cpe', invcpe03)))))
             metaseen06 = s_common.ehex(s_common.buid(('meta:seen', (source23, ('it:sec:cpe', invcpe04)))))
             metaseen07 = s_common.ehex(s_common.buid(('meta:seen', (source23, ('it:sec:cpe', invcpe05)))))
+            metaseen08 = s_common.ehex(s_common.buid(('meta:seen', (source22, ('it:sec:cpe', invcpe06)))))
+            metaseen09 = s_common.ehex(s_common.buid(('meta:seen', (source23, ('it:sec:cpe', invcpe06)))))
 
-            badcpe00 = s_common.ehex(s_common.buid(('it:sec:cpe', invcpe02)))
-            badcpe01 = s_common.ehex(s_common.buid(('it:sec:cpe', invcpe03)))
+            badcpe00 = s_common.ehex(s_common.buid(('it:sec:cpe', invcpe03)))
 
             '''
-            There are two CPEs that we couldn't migrate. They should be fully
-            represented in the following three queues for potentially being
-            rebuilt later.
+            There is one CPE that we couldn't migrate. It should be fully represented in the following queues for
+            potentially being rebuilt later.
 
-            badcpe00: it:sec:cpe="cpe:2.3:a:openbsd:openssh:7.4\r\n:*:*:*:*:*:*:*"
-            badcpe01: it:sec:cpe="cpe:2.3:a:openbsd:openssh:8.2p1 ubuntu-4ubuntu0.2:*:*:*:*:*:*:*"
+            badcpe00: it:sec:cpe="cpe:2.3:a:openbsd:openssh:8.2p1 ubuntu-4ubuntu0.2:*:*:*:*:*:*:*"
             '''
 
             queues = await core.callStorm('return($lib.queue.list())')
             [q.pop('meta') for q in queues]
-            self.len(3, queues)
+            self.len(1, queues)
             self.eq(queues, (
-                {'name': 'model_0_2_28:nodes', 'size': 10, 'offs': 10},
-                {'name': 'model_0_2_28:nodes:refs', 'size': 14, 'offs': 14},
-                {'name': 'model_0_2_28:nodes:edges', 'size': 4, 'offs': 4},
+                {'name': 'model_0_2_31:nodes', 'size': 11, 'offs': 11},
             ))
 
             q = '''
                 $ret = ([])
-                $q = $lib.queue.get('model_0_2_28:nodes')
+                $q = $lib.queue.get('model_0_2_31:nodes')
                 for $ii in $lib.range(($q.size())) {
-                    $ret.append($q.get($ii, cull=(false), wait=(false)))
+                    ($offs, $item) = $q.get($ii, cull=(false), wait=(false))
+                    $ret.append($item)
                 }
                 fini { return($ret) }
             '''
             nodesq = await core.callStorm(q)
             for item in nodesq:
-                self.nn(item[1]['props'].pop('.created'))
+                if (sources := item.get('sources')):
+                    item['sources'] = tuple(sorted(sources))
 
-            self.eq(nodesq, [
-                (0,
-                 {'data': (),
-                  'form': 'meta:seen',
-                  'iden': metaseen00,
-                  'layer': forklayr,
-                  'props': {'node': ('it:sec:cpe', invcpe00),
-                            'source': source23},
-                  'repr': (source23, ('it:sec:cpe', invcpe00)),
+                if (layers := item.get('layers')):
+                    item['layers'] = tuple(sorted(layers))
+
+            self.len(11, nodesq)
+
+            expected = [
+                {'formname': 'meta:seen',
+                  'iden': metaseen08,
+                  'layers': (fork01layr,),
+                  'formvalu': (source22, ('it:sec:cpe', invcpe06)),
                   'sources': (),
-                  'tags': (),
-                  'view': fork00}),
-                (1,
-                 {'data': (),
-                  'form': 'meta:seen',
-                  'iden': metaseen01,
-                  'layer': forklayr,
-                  'props': {'node': ('it:sec:cpe', invcpe01),
-                            'source': source23},
-                  'repr': (source23, ('it:sec:cpe', invcpe01)),
+                  'sodes': {
+                      fork01layr: {
+                          'form': 'meta:seen',
+                          'valu': ((source22, ('it:sec:cpe', invcpe06)), 13),
+                      },
+                  },
+                  'n1edges': {},
+                  'n2edges': {},
+                  'nodedata': {},
+                  'refs': {
+                    fork01layr: (
+                        ('5fbce86c228ebf052bebca0bebbadbf3ae92a7afbd35f35996a275e6688ad88e',
+                         ('it:sec:vuln:scan:result', 'asset', 'ndef', False, False)),
+                    ),
+                  },
+                },
+                {'formname': 'meta:seen',
+                  'iden': metaseen09,
+                  'layers': (fork01layr,),
+                  'formvalu': (source23, ('it:sec:cpe', invcpe06)),
                   'sources': (),
-                  'tags': (),
-                  'view': fork00}),
-                (2,
-                 {'data': (),
-                  'form': 'meta:seen',
+                  'sodes': {
+                      fork01layr: {
+                          'form': 'meta:seen',
+                          'valu': ((source23, ('it:sec:cpe', invcpe06)), 13),
+                      },
+                  },
+                  'n1edges': {},
+                  'n2edges': {},
+                  'nodedata': {},
+                  'refs': {
+                    fork01layr: (
+                        ('52d48d748a795329651e62f89c22a1f24e3560f1858aec2c5eba304e711c0bf5',
+                         ('it:sec:vuln:scan:result', 'asset', 'ndef', False, False)),
+                    ),
+                  },
+                },
+                {'formname': 'meta:seen',
                   'iden': metaseen02,
-                  'layer': forklayr,
-                  'props': {'node': ('it:sec:cpe', invcpe02),
-                            'source': source22},
-                  'repr': (source22, ('it:sec:cpe', invcpe02)),
+                  'layers': (fork01layr,),
+                  'formvalu': (source22, ('it:sec:cpe', invcpe02)),
                   'sources': (),
-                  'tags': (),
-                  'view': fork00}),
-                (3,
-                 {'data': (),
-                  'form': 'meta:seen',
+                  'sodes': {
+                      fork01layr: {
+                          'form': 'meta:seen',
+                          'valu': ((source22, ('it:sec:cpe', invcpe02)), 13),
+                      },
+                  },
+                  'n1edges': {},
+                  'n2edges': {},
+                  'nodedata': {},
+                  'refs': {
+                    fork01layr: (
+                        ('11f7e64a8dd8aa5f2a9b52c0e95783da4b7486452aff74dfcf80814f72507f88',
+                         ('it:sec:vuln:scan:result', 'asset', 'ndef', False, False)),
+                    ),
+                  },
+                },
+                {'formname': 'meta:seen',
                   'iden': metaseen03,
-                  'layer': forklayr,
-                  'props': {'node': ('it:sec:cpe', invcpe02),
-                            'source': source23},
-                  'repr': (source23, ('it:sec:cpe', invcpe02)),
+                  'layers': (fork01layr,),
+                  'formvalu': (source23, ('it:sec:cpe', invcpe02)),
+                  'sources': (),
+                  'sodes': {
+                      fork01layr: {
+                          'form': 'meta:seen',
+                          'valu': ((source23, ('it:sec:cpe', invcpe02)), 13),
+                      },
+                  },
+                  'n1edges': {},
+                  'n2edges': {},
+                  'nodedata': {},
+                  'refs': {
+                    fork01layr: (
+                        ('b209cfe6fb7167cc7dbae9df50894c2614cb9e179e5b3a4fd85fbcf7fa31a9dd',
+                         ('it:sec:vuln:scan:result', 'asset', 'ndef', False, False)),
+                    ),
+                  },
+                },
+                {'formname': 'meta:seen',
+                  'iden': metaseen06,
+                  'layers': (fork01layr,),
+                  'formvalu': (source23, ('it:sec:cpe', invcpe04)),
                   'sources': (),
-                  'tags': (),
-                  'view': fork00}),
-                (4,
-                 {'data': (('cpe22', 'invalid'), ('cpe23', 'invalid')),
-                  'form': 'it:sec:cpe',
+                  'sodes': {
+                      fork01layr: {
+                          'form': 'meta:seen',
+                          'valu': ((source23, ('it:sec:cpe', invcpe04)), 13),
+                      },
+                  },
+                  'n1edges': {},
+                  'n2edges': {},
+                  'nodedata': {},
+                  'refs': {
+                    fork01layr: (
+                        ('e3c389c194609a57cde68c21cac8ae1cd18e6a642e332461a3acd19138904239',
+                         ('it:sec:vuln:scan:result', 'asset', 'ndef', False, False)),
+                    ),
+                  },
+                },
+                {'formname': 'meta:seen',
+                  'iden': metaseen01,
+                  'layers': (fork01layr,),
+                  'formvalu': (source23, ('it:sec:cpe', invcpe01)),
+                  'sources': (),
+                  'sodes': {
+                      fork01layr: {
+                          'form': 'meta:seen',
+                          'valu': ((source23, ('it:sec:cpe', invcpe01)), 13),
+                      },
+                  },
+                  'n1edges': {},
+                  'n2edges': {},
+                  'nodedata': {},
+                  'refs': {
+                    fork01layr: (
+                        ('1e0ce923f3dbd57b11d5d95cc5d6d1ccd4de4aba9b6534d57eaa0a2433af9430',
+                         ('it:sec:vuln:scan:result', 'asset', 'ndef', False, False)),
+                    ),
+                  },
+                },
+                {'formname': 'it:sec:cpe',
                   'iden': badcpe00,
-                  'layer': viewlayr,
-                  'props': {'.seen': (1577836800000, 1609459200000),
-                            'edition': '*',
-                            'language': '*',
-                            'other': '*',
-                            'part': 'a',
-                            'product': 'openssh',
-                            'sw_edition': '*',
-                            'target_hw': '*',
-                            'target_sw': '*',
-                            'update': '*',
-                            'v2_2': 'cpe:/a:openbsd:openssh:7.4\r\n',
-                            'vendor': 'openbsd',
-                            'version': '7.4',
-                            '_cpe22valid': 0,
-                            '_cpe23valid': 0},
-                  'repr': invcpe02,
-                  'sources': (source23,
-                              source22),
-                  'tags': ('test', 'test.cpe', 'test.cpe.23invalid', 'test.cpe.22invalid'),
-                  'view': view00}),
-                (5,
-                 {'data': (),
-                  'form': 'meta:seen',
+                  'layers': tuple(sorted((fork00layr, fork03layr))),
+                  'formvalu': invcpe03,
+                  'sources': tuple(sorted((source22, source23))),
+                  'n1edges': {
+                    fork00layr: (
+                        ('refs', 'f0315900f365f45f2e027edc66ed8477d8661dad501d51f3ac8067c36565f07c'),
+                    ),
+                  },
+                  'n2edges': {
+                    fork01layr: (
+                        ('seen', '051d93252abe655e43265b89149b6a2d5a8f5f2df33b56c986ab8671c081e394', 'meta:source'),
+                        ('seen', '6db5f4049ac1916928f41cc5928fa60cd8fe80c453c6b2325324874a184e77da', 'meta:source'),
+                    ),
+                  },
+                  'nodedata': {
+                    fork00layr: (
+                        ('cpe22', 'invalid'),
+                        ('cpe23', 'invalid'),
+                    ),
+                  },
+                  'sodes': {
+                    fork00layr: {
+                        'form': 'it:sec:cpe',
+                        'props': {
+                            '.seen': ((1577836800000, 1609459200000), 12),
+                            '_cpe22valid': (0, 2),
+                            '_cpe23valid': (0, 2),
+                        },
+                        'tagprops': {
+                            'test.tagprop': {
+                                'score': (0, 9),
+                            },
+                        },
+                        'tags': {
+                            'test': (None, None),
+                            'test.cpe': (None, None),
+                            'test.cpe.22invalid': (None, None),
+                            'test.cpe.23invalid': (None, None),
+                            'test.cpe.ival': (1577836800000, 1609459200000),
+                            'test.tagprop': (None, None),
+                        },
+                        'valu': ('cpe:2.3:a:openbsd:openssh:8.2p1 ubuntu-4ubuntu0.2:*:*:*:*:*:*:*', 1),
+                    },
+                    fork03layr: {
+                        'form': 'it:sec:cpe',
+                        'valu': ('cpe:2.3:a:openbsd:openssh:8.2p1 ubuntu-4ubuntu0.2:*:*:*:*:*:*:*', 1),
+                    },
+                  },
+                  'refs': {
+                    fork01layr: (
+                      ('9742664e24fe1a3a37d871b1f62af27453c2945b98f421d753db8436e9a44cc9',
+                       ('it:prod:soft', 'cpe', 'it:sec:cpe', False, False)),
+                      ('16e3289346a258c3e3073affad490c1d6ebf1d01295aacc489cdb24658ebc6e7',
+                       ('_ext:model:form', 'cpe', 'it:sec:cpe', False, False)),
+                      ('7d4c31f1364aaf0b4cfaf4b57bb60157f2e86248391ce8ec75d6b7e3cd5f35b7',
+                       ('inet:flow', 'dst:cpes', 'it:sec:cpe', True, False)),
+                      ('7d4c31f1364aaf0b4cfaf4b57bb60157f2e86248391ce8ec75d6b7e3cd5f35b7',
+                       ('inet:flow', 'src:cpes', 'it:sec:cpe', True, False)),
+                      ('81973208bc0f5b99250e4cda7889c66e0573c0573bc2a279083d23426ba3c74d',
+                       ('meta:seen', 'node', 'ndef', False, True)),
+                      ('85bfc442d87a64a8e75d4ff2831281fb156317767612eef9b75c271ff162c4d9',
+                       ('meta:seen', 'node', 'ndef', False, True)),
+                    ),
+                    fork00layr: (
+                      ('5fddf1b5fa06aa8a39a1eb297712cecf9ca146764c4d6e5c79296b9e9978d2c3',
+                       ('risk:vulnerable', 'node', 'ndef', False, False)),
+                    ),
+                  },
+                },
+                {'formname': 'meta:seen',
                   'iden': metaseen04,
-                  'layer': forklayr,
-                  'props': {'node': ('it:sec:cpe', invcpe03),
-                            'source': source23},
-                  'repr': (source23, ('it:sec:cpe', invcpe03)),
+                  'layers': (fork01layr,),
+                  'formvalu': (source23, ('it:sec:cpe', invcpe03)),
                   'sources': (),
-                  'tags': (),
-                  'view': fork00}),
-                (6,
-                 {'data': (),
-                  'form': 'meta:seen',
+                  'sodes': {
+                      fork01layr: {
+                          'form': 'meta:seen',
+                          'valu': ((source23, ('it:sec:cpe', invcpe03)), 13),
+                      },
+                  },
+                  'n1edges': {},
+                  'n2edges': {},
+                  'nodedata': {},
+                  'refs': {
+                    fork01layr: (
+                        ('6d09c45666b3a14bf9d298079344d01c079e474423307da553d65ad9917556ae',
+                         ('it:sec:vuln:scan:result', 'asset', 'ndef', False, False)),
+                    ),
+                  },
+                },
+                {'formname': 'meta:seen',
                   'iden': metaseen05,
-                  'layer': forklayr,
-                  'props': {'node': ('it:sec:cpe', invcpe03),
-                            'source': source22},
-                  'repr': (source22, ('it:sec:cpe', invcpe03)),
+                  'layers': (fork01layr,),
+                  'formvalu': (source22, ('it:sec:cpe', invcpe03)),
                   'sources': (),
-                  'tags': (),
-                  'view': fork00}),
-                (7,
-                 {'data': (('cpe22', 'invalid'), ('cpe23', 'invalid')),
-                  'form': 'it:sec:cpe',
-                  'iden': badcpe01,
-                  'layer': viewlayr,
-                  'props': {'.seen': (1577836800000, 1609459200000),
-                            'edition': '*',
-                            'language': '*',
-                            'other': '*',
-                            'part': 'a',
-                            'product': 'openssh',
-                            'sw_edition': '*',
-                            'target_hw': '*',
-                            'target_sw': '*',
-                            'update': '*',
-                            'v2_2': 'cpe:/a:openbsd:openssh:8.2p1 ubuntu-4ubuntu0.2',
-                            'vendor': 'openbsd',
-                            'version': '8.2p1 ubuntu-4ubuntu0.2',
-                            '_cpe22valid': 0,
-                            '_cpe23valid': 0},
-                  'repr': invcpe03,
-                  'sources': (source23,
-                              source22),
-                  'tags': ('test', 'test.cpe', 'test.cpe.23invalid', 'test.cpe.22invalid'),
-                  'view': view00}),
-                (8,
-                 {'data': (),
-                  'form': 'meta:seen',
-                  'iden': metaseen06,
-                  'layer': forklayr,
-                  'props': {'node': ('it:sec:cpe', invcpe04),
-                            'source': source23},
-                  'repr': (source23, ('it:sec:cpe', invcpe04)),
+                  'sodes': {
+                      fork01layr: {
+                          'form': 'meta:seen',
+                          'valu': ((source22, ('it:sec:cpe', invcpe03)), 13),
+                      },
+                  },
+                  'n1edges': {},
+                  'n2edges': {},
+                  'nodedata': {},
+                  'refs': {
+                    fork01layr: (
+                        ('208ea1b5593aff3c9cb51c19374616fcd103ea2f554f0dd2a13652aadabb82ae',
+                         ('it:sec:vuln:scan:result', 'asset', 'ndef', False, False)),
+                    ),
+                  },
+                },
+                {'formname': 'meta:seen',
+                  'iden': metaseen00,
+                  'layers': (fork01layr,),
+                  'formvalu': (source23, ('it:sec:cpe', invcpe00)),
                   'sources': (),
-                  'tags': (),
-                  'view': fork00}),
-                (9,
-                 {'data': (),
-                  'form': 'meta:seen',
+                  'sodes': {
+                      fork01layr: {
+                          'form': 'meta:seen',
+                          'valu': ((source23, ('it:sec:cpe', invcpe00)), 13),
+                      },
+                  },
+                  'n1edges': {},
+                  'n2edges': {},
+                  'nodedata': {},
+                  'refs': {
+                    fork01layr: (
+                        ('86288a55af26e1314ae60e12c54c02f4af2e22ed1580166b39f5352762856335',
+                         ('it:sec:vuln:scan:result', 'asset', 'ndef', False, False)),
+                    ),
+                  },
+                },
+                {'formname': 'meta:seen',
                   'iden': metaseen07,
-                  'layer': forklayr,
-                  'props': {'node': ('it:sec:cpe', invcpe05),
-                            'source': source23},
-                  'repr': (source23, ('it:sec:cpe', invcpe05)),
+                  'layers': (fork01layr,),
+                  'formvalu': (source23, ('it:sec:cpe', invcpe05)),
                   'sources': (),
-                  'tags': (),
-                  'view': fork00}),
-            ])
+                  'sodes': {
+                      fork01layr: {
+                          'form': 'meta:seen',
+                          'valu': ((source23, ('it:sec:cpe', invcpe05)), 13),
+                      },
+                  },
+                  'n1edges': {},
+                  'n2edges': {},
+                  'nodedata': {},
+                  'refs': {
+                    fork01layr: (
+                        ('53ad1502b6f6de3d9d4efe72cc101cd3889e47323ac8db5e3fd39ae68c72f141',
+                         ('it:sec:vuln:scan:result', 'asset', 'ndef', False, False)),
+                    ),
+                  },
+                },
+            ]
+
+            for item in expected:
+                self.isin(item, nodesq)
+
+            # There should be nothing in the default view
+            nodes = await core.nodes('.created')
+            self.len(0, nodes)
 
-            q = '''
-                $ret = ([])
-                $q = $lib.queue.get('model_0_2_28:nodes:refs')
-                for $ii in $lib.range(($q.size())) {
-                    $ret.append($q.get($ii, cull=(false), wait=(false)))
-                }
-                fini { return($ret) }
-            '''
-            refsq = await core.callStorm(q)
-            self.eq(refsq, [
-                (0,
-                 {'iden': metaseen00,
-                  'refs': ({'iden': '86288a55af26e1314ae60e12c54c02f4af2e22ed1580166b39f5352762856335',
-                            'refinfo': ('it:sec:vuln:scan:result', 'asset', 'ndef', False)},),
-                  'view': fork00}),
-                (1,
-                 {'iden': metaseen01,
-                  'refs': ({'iden': '1e0ce923f3dbd57b11d5d95cc5d6d1ccd4de4aba9b6534d57eaa0a2433af9430',
-                            'refinfo': ('it:sec:vuln:scan:result', 'asset', 'ndef', False)},),
-                  'view': fork00}),
-                (2,
-                 {'iden': badcpe00,
-                  'refs': ({'iden': 'd2c0737b821ba0a699e1ff168e2bf1677590dbf677ce7e5c02894f8868ae080a',
-                            'refinfo': ('risk:vulnerable', 'node', 'ndef', False)},),
-                  'view': view00}),
-                (3,
-                 {'iden': badcpe00,
-                  'refs': ({'iden': '7d4c31f1364aaf0b4cfaf4b57bb60157f2e86248391ce8ec75d6b7e3cd5f35b7',
-                            'refinfo': ('inet:flow', 'src:cpes', 'it:sec:cpe', True)},),
-                  'view': fork00}),
-                (4,
-                 {'iden': metaseen02,
-                  'refs': ({'iden': '11f7e64a8dd8aa5f2a9b52c0e95783da4b7486452aff74dfcf80814f72507f88',
-                            'refinfo': ('it:sec:vuln:scan:result', 'asset', 'ndef', False)},),
-                  'view': fork00}),
-                (5,
-                 {'iden': metaseen03,
-                  'refs': ({'iden': 'b209cfe6fb7167cc7dbae9df50894c2614cb9e179e5b3a4fd85fbcf7fa31a9dd',
-                            'refinfo': ('it:sec:vuln:scan:result', 'asset', 'ndef', False)},),
-                  'view': fork00}),
-                (6,
-                 {'iden': badcpe01,
-                  'refs': ({'iden': '5fddf1b5fa06aa8a39a1eb297712cecf9ca146764c4d6e5c79296b9e9978d2c3',
-                            'refinfo': ('risk:vulnerable', 'node', 'ndef', False)},),
-                  'view': view00}),
-                (7,
-                 {'iden': badcpe01,
-                  'refs': ({'iden': '9742664e24fe1a3a37d871b1f62af27453c2945b98f421d753db8436e9a44cc9',
-                            'refinfo': ('it:prod:soft', 'cpe', 'it:sec:cpe', False)},),
-                  'view': fork00}),
-                (8,
-                 {'iden': badcpe01,
-                  'refs': ({'iden': '16e3289346a258c3e3073affad490c1d6ebf1d01295aacc489cdb24658ebc6e7',
-                            'refinfo': ('_ext:model:form', 'cpe', 'it:sec:cpe', False)},),
-                  'view': fork00}),
-                (9,
-                 {'iden': badcpe01,
-                  'refs': ({'iden': '7d4c31f1364aaf0b4cfaf4b57bb60157f2e86248391ce8ec75d6b7e3cd5f35b7',
-                            'refinfo': ('inet:flow', 'src:cpes', 'it:sec:cpe', True)},),
-                  'view': fork00}),
-                (10,
-                 {'iden': metaseen04,
-                  'refs': ({'iden': '6d09c45666b3a14bf9d298079344d01c079e474423307da553d65ad9917556ae',
-                            'refinfo': ('it:sec:vuln:scan:result', 'asset', 'ndef', False)},),
-                  'view': fork00}),
-                (11,
-                 {'iden': metaseen05,
-                  'refs': ({'iden': '208ea1b5593aff3c9cb51c19374616fcd103ea2f554f0dd2a13652aadabb82ae',
-                            'refinfo': ('it:sec:vuln:scan:result', 'asset', 'ndef', False)},),
-                  'view': fork00}),
-                (12,
-                 {'iden': metaseen06,
-                  'refs': ({'iden': 'e3c389c194609a57cde68c21cac8ae1cd18e6a642e332461a3acd19138904239',
-                            'refinfo': ('it:sec:vuln:scan:result', 'asset', 'ndef', False)},),
-                  'view': fork00}),
-                (13,
-                 {'iden': metaseen07,
-                  'refs': ({'iden': '53ad1502b6f6de3d9d4efe72cc101cd3889e47323ac8db5e3fd39ae68c72f141',
-                            'refinfo': ('it:sec:vuln:scan:result', 'asset', 'ndef', False)},),
-                  'view': fork00}),
-            ])
-
-            riskvuln00 = await core.callStorm('risk:vuln return($node.iden())')
-            q = '''
-                $ret = ([])
-                $q = $lib.queue.get('model_0_2_28:nodes:edges')
-                for $ii in $lib.range(($q.size())) {
-                    $ret.append($q.get($ii, cull=(false), wait=(false)))
-                }
-                fini { return($ret) }
-            '''
-            edgesq = await core.callStorm(q)
-            self.eq(edgesq, [
-                (0,
-                 {'direction': 'n1',
-                  'edges': (('refs', riskvuln00),),
-                  'iden': badcpe00,
-                  'view': view00}),
-                (1,
-                 {'direction': 'n2',
-                  'edges': (('seen', source23iden), ('seen', source22iden)),
-                  'iden': badcpe00,
-                  'view': fork00}),
-                (2,
-                 {'direction': 'n1',
-                  'edges': (('refs', riskvuln00),),
-                  'iden': badcpe01,
-                  'view': view00}),
-                (3,
-                 {'direction': 'n2',
-                  'edges': (('seen', source23iden), ('seen', source22iden)),
-                  'iden': badcpe01,
-                  'view': fork00}),
-            ])
+        async with self.getRegrCore('model-cpe-migration') as core:
 
-    async def test_modelrev_0_2_29(self):
-        async with self.getRegrCore('model-0.2.29') as core:
-            self.len(2, await core.nodes('ou:industry:type:taxonomy'))
+            riskvuln = s_common.ehex(s_common.buid(('risk:vuln', s_common.guid(('risk', 'vuln')))))
 
-    async def test_modelrev_0_2_30(self):
-        async with self.getRegrCore('model-0.2.30') as core:
-            q = '''
-                inet:ipv4=192.0.0.0 inet:ipv4=192.0.0.8 inet:ipv4=192.0.0.9 inet:ipv4=192.0.0.10 inet:ipv4=192.0.0.255
-            '''
-            nodes = await core.nodes(q)
-            typz = [node.get('type') for node in nodes]
-            self.eq(typz, ['private', 'private', 'unicast', 'unicast', 'private'])
+            views = {view.info.get('name'): view for view in core.listViews()}
+            self.len(5, views)
 
-            q = '''
-            inet:ipv6="64:ff9b:1::" inet:ipv6="64:ff9b:1::1" inet:ipv6="64:ff9b:1::ffff" inet:ipv6="64:ff9b:1::ffff:1"
-            '''
-            nodes = await core.nodes(q)
-            typz = [node.get('type') for node in nodes]
-            self.eq(typz, ['private', 'private', 'private', 'private'])
+            fork02 = views.get('fork02').iden
+            infork02 = {'view': fork02}
+
+            # Normal lift will go through the views
+            nodes = await core.nodes('it:sec:cpe:vendor=01generator', opts=infork02)
+            self.len(1, nodes)
+            self.eq(nodes[0].get('v2_2'), 'cpe:/a:01generator:pireospay:-::~~~prestashop~~')
 
+            # The v2_2 floating props in this view were removed because the underlying nodes were completely invalid and
+            # could not be migrated
             q = '''
-            inet:ipv6="2002::" inet:ipv6="2002::1" inet:ipv6="2002::fffe" inet:ipv6="2002::ffff"
+            $nodes = ([])
+
+            for $n in $lib.view.get().layers.0.liftByProp("it:sec:cpe:v2_2") {
+                $nodes.append($n)
+            }
+
+            return($nodes)
             '''
-            nodes = await core.nodes(q)
-            typz = [node.get('type') for node in nodes]
-            self.eq(typz, ['private', 'private', 'private', 'private'])
+            nodes = await core.callStorm(q, opts=infork02)
+            self.len(0, nodes)
 
-            q = 'inet:ipv6="2001:1::1/128" inet:ipv6="2001:1::2/128"'
-            nodes = await core.nodes(q)
-            typz = [node.get('type') for node in nodes]
-            self.eq(typz, ['unicast', 'unicast'])
+            nodes = await core.nodes('meta:source:name=cpe.22.valid', opts=infork02)
+            self.len(1, nodes)
+            meta22valid = nodes[0]
 
-            q = 'inet:ipv6="2001:3::" inet:ipv6="2001:3::1" inet:ipv6="2001:3::ffff"'
-            nodes = await core.nodes(q)
-            typz = [node.get('type') for node in nodes]
-            self.eq(typz, ['unicast', 'unicast', 'unicast'])
+            nodes = await core.nodes('meta:source:name=cpe.22.invalid', opts=infork02)
+            self.len(1, nodes)
+            meta22invalid = nodes[0]
 
-            q = 'inet:ipv6="2001:4:112::" inet:ipv6="2001:4:112::1" inet:ipv6="2001:4:112::ffff"'
-            nodes = await core.nodes(q)
-            typz = [node.get('type') for node in nodes]
-            self.eq(typz, ['unicast', 'unicast', 'unicast'])
+            nodes = await core.nodes('meta:source:name=cpe.22.wasinvalid', opts=infork02)
+            self.len(1, nodes)
+            meta22wasinvalid = nodes[0]
 
-            q = 'inet:ipv6="2001:20::" inet:ipv6="2001:20::1" inet:ipv6="2001:20::ffff"'
-            nodes = await core.nodes(q)
-            typz = [node.get('type') for node in nodes]
-            self.eq(typz, ['unicast', 'unicast', 'unicast'])
+            nodes = await core.nodes('meta:source:name=cpe.23.valid', opts=infork02)
+            self.len(1, nodes)
+            meta23valid = nodes[0]
 
-            q = 'inet:ipv6="2001:30::" inet:ipv6="2001:30::1" inet:ipv6="2001:30::ffff"'
-            nodes = await core.nodes(q)
-            typz = [node.get('type') for node in nodes]
-            self.eq(typz, ['unicast', 'unicast', 'unicast'])
+            nodes = await core.nodes('meta:source:name=cpe.23.invalid', opts=infork02)
+            self.len(1, nodes)
+            meta23invalid = nodes[0]
+
+            nodes = await core.nodes('meta:source:name=cpe.23.wasinvalid', opts=infork02)
+            self.len(1, nodes)
+            meta23wasinvalid = nodes[0]
+
+            nodes = await core.nodes('risk:vuln', opts=infork02)
+            self.len(1, nodes)
+            riskvuln = nodes[0]
+
+            nodes = await core.nodes('it:sec:cpe#test.cpe.23valid +#test.cpe.22invalid', opts=infork02)
+            self.len(3, nodes)
+            for node in nodes:
+
+                self.true(node.get('_cpe22valid'))
+                self.true(node.get('_cpe23valid'))
+                self.eq(node.get('.seen'), (1577836800000, 1672531200001)) # .seen = (2020, 2023)
+                self.isin('test.cpe.22valid', node.tags)
+                self.isin('test.tagprop', node.tags)
+                self.eq(['score'], node.getTagProps('test.tagprop'))
+                self.eq(11, node.getTagProp('test.tagprop', 'score'))
+
+                nodedata = await s_tests.alist(node.iterData())
+                self.eq(nodedata, [('cpe22', 'wasinvalid'), ('cpe23', 'valid')])
+
+                n1s = await s_tests.alist(node.iterEdgesN1())
+                self.sorteq(n1s, [
+                    ('refs', meta23valid.iden()),
+                    ('refs', meta22wasinvalid.iden()),
+                    ('refs', riskvuln.iden())
+                ])
+
+                for n in (meta23valid, meta22wasinvalid, riskvuln):
+                    n2s = await s_tests.alist(n.iterEdgesN2())
+                    self.isin(('refs', node.iden()), n2s)
+
+                n2s = await s_tests.alist(node.iterEdgesN2())
+                self.sorteq(n2s, [
+                    ('seen', meta22invalid.iden()),
+                    ('seen', meta22wasinvalid.iden()),
+                    ('seen', meta23valid.iden())
+                ])
+
+                for n in (meta22invalid, meta22wasinvalid, meta23valid):
+                    n1s = await s_tests.alist(n.iterEdgesN1())
+                    self.isin(('seen', node.iden()), n1s)
+
+            nodes = await core.nodes('it:sec:cpe#test.cpe.22valid +#test.cpe.23invalid', opts=infork02)
+            self.len(4, nodes)
+            for node in nodes:
+                self.true(node.get('_cpe22valid'))
+                self.true(node.get('_cpe23valid'))
+                self.eq(node.get('.seen'), (1577836800000, 1704067200001)) # .seen = (2020, 2024)
+                self.isin('test.cpe.23valid', node.tags)
+                self.isin('test.tagprop', node.tags)
+                self.eq(['score'], node.getTagProps('test.tagprop'))
+                self.eq(11, node.getTagProp('test.tagprop', 'score'))
+
+                nodedata = await s_tests.alist(node.iterData())
+                self.eq(nodedata, [('cpe23', 'wasinvalid'), ('cpe22', 'valid')])
+
+                n1s = await s_tests.alist(node.iterEdgesN1())
+                self.sorteq(n1s, [
+                    ('refs', meta22valid.iden()),
+                    ('refs', meta23wasinvalid.iden()),
+                    ('refs', riskvuln.iden())
+                ])
+
+                for n in (meta22valid, meta23wasinvalid, riskvuln):
+                    n2s = await s_tests.alist(n.iterEdgesN2())
+                    self.isin(('refs', node.iden()), n2s)
+
+                n2s = await s_tests.alist(node.iterEdgesN2())
+                self.sorteq(n2s, [
+                    ('seen', meta23invalid.iden()),
+                    ('seen', meta23wasinvalid.iden()),
+                    ('seen', meta22valid.iden())
+                ])
+
+                for n in (meta23invalid, meta23wasinvalid, meta22valid):
+                    n1s = await s_tests.alist(n.iterEdgesN1())
+                    self.isin(('seen', node.iden()), n1s)
+
+            # There should be nothing in the default view
+            nodes = await core.nodes('.created')
+            self.len(0, nodes)
+
+        orig = s_spooled.Spooled.__anit__
+        for maxval in (s_spooled.MAX_SPOOL_SIZE, 1):
+
+            async def __anit__(self, dirn=None, size=s_spooled.MAX_SPOOL_SIZE, cell=None):
+                await orig(self, dirn=dirn, size=maxval, cell=cell)
+
+            with mock.patch('synapse.lib.spooled.Spooled.__anit__', __anit__):
+                async with self.getRegrCore('model-cpe-migration') as core:
+                    # Make sure the mock worked
+                    migration = await s_modelrev.ModelMigration_0_2_31.anit(core, [])
+                    self.eq(migration.nodes.size, maxval)
+                    self.eq(migration.todos.size, maxval)
+
+                    riskvuln = s_common.ehex(s_common.buid(('risk:vuln', s_common.guid(('risk', 'vuln')))))
+
+                    views = {view.info.get('name'): view for view in core.listViews()}
+                    self.len(5, views)
+
+                    fork00 = views.get('fork00').iden
+                    infork00 = {'view': fork00}
+
+                    fork01 = views.get('fork01').iden
+                    infork01 = {'view': fork01}
+
+                    fork02 = views.get('fork02').iden
+                    infork02 = {'view': fork02}
+
+                    q = '''
+                        $ret = ([])
+                        for ($offs, $form, $valu, $sources) in $lib.model.migration.s.model_0_2_31.listNodes() {
+                            $srcs = ([])
+                            for $src in $lib.sorted($sources) { $srcs.append($src) }
+                            $ret.append(($form, $valu, $srcs))
+                        }
+                        return($ret)
+                    '''
+                    nodelist = await core.callStorm(q)
+                    expected = [
+                        ('meta:seen', (
+                                '008af0047a8350287cde7abe31a7c706',
+                                ('it:sec:cpe', 'cpe:2.3:a:openbsd:openssh:7.4\r\n:*:*:*:*:*:*:*')
+                            ),
+                         (),
+                        ),
+                        ('meta:seen', (
+                                'a7a4739e0a52674df0fa3a8226de0c3f',
+                                ('it:sec:cpe', 'cpe:2.3:a:openbsd:openssh:7.4\r\n:*:*:*:*:*:*:*')
+                            ),
+                         (),
+                        ),
+                        ('meta:seen', (
+                                '008af0047a8350287cde7abe31a7c706',
+                                ('it:sec:cpe', 'cpe:2.3:a:%40ianwalter:merge:*:*:*:*:*:*:*:*')
+                            ),
+                         (),
+                        ),
+                        ('meta:seen', (
+                                'a7a4739e0a52674df0fa3a8226de0c3f',
+                                ('it:sec:cpe', 'cpe:2.3:a:%40ianwalter:merge:*:*:*:*:*:*:*:*')
+                            ),
+                         (),
+                        ),
+                        ('meta:seen', (
+                                'a7a4739e0a52674df0fa3a8226de0c3f',
+                                ('it:sec:cpe', 'cpe:2.3:h:d\\-link:dir\\-850l:*:*:*:*:*:*:*:*')
+                            ),
+                         (),
+                        ),
+                        ('meta:seen', (
+                                'a7a4739e0a52674df0fa3a8226de0c3f',
+                                ('it:sec:cpe', 'cpe:2.3:a:acurax:under_construction_%2f_maintenance_mode:-::~~~wordpress~~:*:*:*:*:*')
+                            ),
+                         (),
+                        ),
+                        ('it:sec:cpe',
+                         'cpe:2.3:a:openbsd:openssh:8.2p1 ubuntu-4ubuntu0.2:*:*:*:*:*:*:*',
+                         tuple(sorted((source22, source23))),
+                        ),
+                        ('meta:seen', (
+                                'a7a4739e0a52674df0fa3a8226de0c3f',
+                                ('it:sec:cpe', 'cpe:2.3:a:openbsd:openssh:8.2p1 ubuntu-4ubuntu0.2:*:*:*:*:*:*:*')
+                            ),
+                         (),
+                        ),
+                        ('meta:seen', (
+                                '008af0047a8350287cde7abe31a7c706',
+                                ('it:sec:cpe', 'cpe:2.3:a:openbsd:openssh:8.2p1 ubuntu-4ubuntu0.2:*:*:*:*:*:*:*')
+                            ),
+                         (),
+                        ),
+                        ('meta:seen', (
+                                'a7a4739e0a52674df0fa3a8226de0c3f',
+                                ('it:sec:cpe', 'cpe:2.3:a:10web:social_feed_for_instagram:1.0.0::~~premium~wordpress~~:*:*:*:*:*')
+                            ),
+                         (),
+                        ),
+                        ('meta:seen', (
+                                'a7a4739e0a52674df0fa3a8226de0c3f',
+                                ('it:sec:cpe', 'cpe:2.3:o:zyxel:nas326_firmware:5.21%28aazf.14%29c0:*:*:*:*:*:*:*')
+                            ),
+                         (),
+                        ),
+                    ]
+                    for item in expected:
+                        self.isin(item, nodelist)
+
+                    cpeidx = nodelist.index(
+                        ('it:sec:cpe',
+                         'cpe:2.3:a:openbsd:openssh:8.2p1 ubuntu-4ubuntu0.2:*:*:*:*:*:*:*',
+                         tuple(sorted((source22, source23)))
+                        )
+                    )
+                    metaidx = nodelist.index(
+                        ('meta:seen', (
+                                'a7a4739e0a52674df0fa3a8226de0c3f',
+                                ('it:sec:cpe', 'cpe:2.3:a:openbsd:openssh:8.2p1 ubuntu-4ubuntu0.2:*:*:*:*:*:*:*')
+                            ),
+                         (),
+                        )
+                    )
+
+                    q = '''
+                        $ret = ([])
+                        for ($offs, $form, $valu, $sources) in $lib.model.migration.s.model_0_2_31.listNodes(form=it:sec:cpe, source=$source22) {
+                            $srcs = ([])
+                            for $src in $lib.sorted($sources) { $srcs.append($src) }
+                            $ret.append(($form, $valu, $srcs))
+                        }
+                        return($ret)
+                    '''
+                    opts = {'vars': {'source22': source22}}
+                    nodelist = await core.callStorm(q, opts=opts)
+                    self.len(1, nodelist)
+                    self.eq(nodelist[0],
+                        ('it:sec:cpe',
+                         'cpe:2.3:a:openbsd:openssh:8.2p1 ubuntu-4ubuntu0.2:*:*:*:*:*:*:*',
+                         tuple(sorted((source22, source23))),
+                        ),
+                    )
+
+                    msgs = await core.stormlist('$lib.model.migration.s.model_0_2_31.printNode((200))')
+                    self.stormIsInWarn('Queued node with offset 200 not found.', msgs)
+
+                    msgs = await core.stormlist('$lib.model.migration.s.model_0_2_31.repairNode((200), "")')
+                    self.stormIsInWarn('Queued node with offset 200 not found.', msgs)
+
+                    msgs = await core.stormlist(f'$lib.model.migration.s.model_0_2_31.printNode(({cpeidx}))')
+                    self.stormHasNoWarnErr(msgs)
+
+                    output = textwrap.dedent(f'''
+                        it:sec:cpe='cpe:2.3:a:openbsd:openssh:8.2p1 ubuntu-4ubuntu0.2:*:*:*:*:*:*:*'
+                          layer: {fork03layr}
+                          layer: {fork00layr}
+                            :_cpe22valid = 0
+                            :_cpe23valid = 0
+                            .seen = (2020/01/01 00:00:00.000, 2021/01/01 00:00:00.000)
+                            #test
+                            #test.cpe
+                            #test.cpe.ival = (2020/01/01 00:00:00.000, 2021/01/01 00:00:00.000)
+                            #test.cpe.23invalid
+                            #test.cpe.22invalid
+                            #test.tagprop
+                            #test.tagprop:score = 0
+                          sources: ['008af0047a8350287cde7abe31a7c706', 'a7a4739e0a52674df0fa3a8226de0c3f']
+                          refs:
+                            layer: {fork01layr}
+                              - it:prod:soft:cpe (iden: 9742664e24fe1a3a37d871b1f62af27453c2945b98f421d753db8436e9a44cc9
+                              - _ext:model:form:cpe (iden: 16e3289346a258c3e3073affad490c1d6ebf1d01295aacc489cdb24658ebc6e7
+                              - inet:flow:dst:cpes (iden: 7d4c31f1364aaf0b4cfaf4b57bb60157f2e86248391ce8ec75d6b7e3cd5f35b7
+                              - inet:flow:src:cpes (iden: 7d4c31f1364aaf0b4cfaf4b57bb60157f2e86248391ce8ec75d6b7e3cd5f35b7
+                              - meta:seen:node (iden: 81973208bc0f5b99250e4cda7889c66e0573c0573bc2a279083d23426ba3c74d
+                              - meta:seen:node (iden: 85bfc442d87a64a8e75d4ff2831281fb156317767612eef9b75c271ff162c4d9
+                            layer: {fork00layr}
+                              - risk:vulnerable:node (iden: 5fddf1b5fa06aa8a39a1eb297712cecf9ca146764c4d6e5c79296b9e9978d2c3
+                          edges:
+                            -(refs)> f0315900f365f45f2e027edc66ed8477d8661dad501d51f3ac8067c36565f07c
+                            <(seen)- 051d93252abe655e43265b89149b6a2d5a8f5f2df33b56c986ab8671c081e394
+                            <(seen)- 6db5f4049ac1916928f41cc5928fa60cd8fe80c453c6b2325324874a184e77da
+                    ''')[1:-1]
+                    self.stormIsInPrint(output, msgs)
+
+                    oldcpe = 'cpe:2.3:a:openbsd:openssh:8.2p1 ubuntu-4ubuntu0.2:*:*:*:*:*:*:*'
+                    newcpe = 'cpe:2.3:a:openbsd:openssh:8.2p1:*:*:*:*:*:*:*'
+
+                    nodes = await core.nodes('_ext:model:form="22i-23i"', opts=infork01)
+                    self.len(1, nodes)
+                    self.none(nodes[0].get('cpe'))
+
+                    nodes = await core.nodes(f'risk:vulnerable=(22invalid, 23invalid, (it:sec:cpe, "{oldcpe}"))', opts=infork00)
+                    self.len(1, nodes)
+                    self.none(nodes[0].get('node'))
+
+                    nodes = await core.nodes('inet:flow=(flow, 22i, 23i)', opts=infork01)
+                    self.len(1, nodes)
+                    self.none(nodes[0].get('dst:cpes'))
+                    self.notin(newcpe, nodes[0].get('src:cpes'))
+
+                    msgs = await core.stormlist(f'$lib.model.migration.s.model_0_2_31.repairNode(({cpeidx}), "{newcpe}")')
+                    self.stormHasNoWarnErr(msgs)
+
+                    # Repair node should be idempotent
+                    msgs = await core.stormlist(f'$lib.model.migration.s.model_0_2_31.repairNode(({cpeidx}), "{newcpe}", $lib.true)')
+                    self.stormHasNoWarnErr(msgs)
+
+                    nodes = await core.nodes('it:sec:cpe:vendor=openbsd +:version="8.2p1"', opts=infork00)
+                    self.len(1, nodes)
+                    self.false(nodes[0].get('_cpe22valid'))
+                    self.false(nodes[0].get('_cpe23valid'))
+                    self.eq(nodes[0].get('.seen'), (1577836800000, 1609459200000))
+                    self.eq(nodes[0].get('edition'), '*')
+                    self.eq(nodes[0].get('language'), '*')
+                    self.eq(nodes[0].get('other'), '*')
+                    self.eq(nodes[0].get('part'), 'a')
+                    self.eq(nodes[0].get('product'), 'openssh')
+                    self.eq(nodes[0].get('sw_edition'), '*')
+                    self.eq(nodes[0].get('target_hw'), '*')
+                    self.eq(nodes[0].get('target_sw'), '*')
+                    self.eq(nodes[0].get('update'), '*')
+                    self.eq(nodes[0].get('vendor'), 'openbsd')
+                    self.eq(nodes[0].get('version'), '8.2p1')
+                    self.eq(nodes[0].get('v2_2'), 'cpe:/a:openbsd:openssh:8.2p1')
+                    self.isin('test.cpe.22invalid', nodes[0].tags)
+                    self.isin('test.cpe.23invalid', nodes[0].tags)
+                    self.isin('test.tagprop', nodes[0].tags)
+                    self.eq(nodes[0].tagprops['test.tagprop'], {'score': 0})
+
+                    edges = await s_tests.alist(nodes[0].iterEdgesN1())
+                    self.len(1, edges)
+                    self.eq(edges, [('refs', riskvuln)])
+
+                    edges = await s_tests.alist(nodes[0].iterEdgesN2())
+                    self.len(0, edges)
+
+                    nodedata = await s_tests.alist(nodes[0].iterData())
+                    self.eq(nodedata, [('cpe22', 'invalid'), ('cpe23', 'invalid')])
+
+                    nodes = await core.nodes('it:sec:cpe:vendor=openbsd +:version="8.2p1"', opts=infork01)
+                    self.len(1, nodes)
+
+                    edges = await s_tests.alist(nodes[0].iterEdgesN1())
+                    self.len(1, edges)
+                    self.eq(edges, [('refs', riskvuln)])
+
+                    edges = await s_tests.alist(nodes[0].iterEdgesN2())
+                    self.len(2, edges)
+                    self.sorteq(edges, [
+                        ('seen', source22iden),
+                        ('seen', source23iden),
+                    ])
+
+                    nodes = await core.nodes('_ext:model:form="22i-23i"', opts=infork01)
+                    self.len(1, nodes)
+                    self.eq(nodes[0].get('cpe'), newcpe)
+
+                    nodes = await core.nodes(f'risk:vulnerable=(22invalid, 23invalid, (it:sec:cpe, "{oldcpe}"))', opts=infork00)
+                    self.len(1, nodes)
+                    self.eq(nodes[0].get('node'), ('it:sec:cpe', newcpe))
+
+                    nodes = await core.nodes('inet:flow=(flow, 22i, 23i)', opts=infork01)
+                    self.len(1, nodes)
+                    self.isin(newcpe, nodes[0].get('dst:cpes'))
+                    self.isin(newcpe, nodes[0].get('src:cpes'))
+
+                    nodes = await core.nodes('it:sec:cpe:vendor=openbsd', opts=infork02)
+                    self.len(2, nodes)
+                    self.eq(nodes[0].get('v2_2'), 'cpe:/a:openbsd:openssh:8.2p1')
+                    self.eq(nodes[1].get('v2_2'), 'cpe:/a:openbsd:openssh_server:7.4')
+
+                    nodes = await core.nodes('it:sec:cpe:vendor="openbsd" +:version="8.2p1" -> meta:seen', opts=infork01)
+                    self.len(0, nodes)
+
+                    valu = ('a7a4739e0a52674df0fa3a8226de0c3f', ('it:sec:cpe', 'cpe:2.3:a:openbsd:openssh:8.2p1:*:*:*:*:*:*:*'))
+                    iden = '81973208bc0f5b99250e4cda7889c66e0573c0573bc2a279083d23426ba3c74d'
+                    q = f'$lib.model.migration.s.model_0_2_31.repairNode(({metaidx}), $valu, $lib.true)'
+
+                    opts = {'vars': {'iden': iden, 'valu': valu}}
+                    msgs = await core.stormlist(q, opts=opts)
+                    self.stormHasNoWarnErr(msgs)
+
+                    nodes = await core.nodes('it:sec:cpe:vendor="openbsd" +:version="8.2p1" -> meta:seen', opts=infork01)
+                    self.len(1, nodes)
+                    self.eq(nodes[0].get('source'), 'a7a4739e0a52674df0fa3a8226de0c3f')
+                    self.eq(nodes[0].get('node'), ('it:sec:cpe', 'cpe:2.3:a:openbsd:openssh:8.2p1:*:*:*:*:*:*:*'))
+
+                    # Check queue status after restoring three nodes
+                    queues = await core.callStorm('return($lib.queue.list())')
+                    [q.pop('meta') for q in queues]
+                    self.len(1, queues)
+                    self.eq(queues, (
+                        {'name': 'model_0_2_31:nodes', 'size': 9, 'offs': 11},
+                    ))
+
+                    # There should be nothing in the default view
+                    nodes = await core.nodes('.created')
+                    self.len(0, nodes)