fix upgrade functions version numbers

Author: sebix

intelmq/lib/upgrades.py

@@ -42,8 +42,8 @@
            'v322_url_replacement',
            'v322_removed_feeds_and_bots',
            'v340_deprecations',
-           'v341_blueliv_removal',
-           'v342_new_fields',
+           'v350_blueliv_removal',
+           'v350_new_fields',
            ]
 
 
@@ -976,7 +976,7 @@ def v340_deprecations(configuration, harmonization, dry_run, **kwargs):
     return message or changed, configuration, harmonization
 
 
-def v341_blueliv_removal(configuration, harmonization, dry_run, **kwargs):
+def v350_blueliv_removal(configuration, harmonization, dry_run, **kwargs):
     """
     Remove blueliv collector and parser
     """
@@ -999,7 +999,7 @@ def v341_blueliv_removal(configuration, harmonization, dry_run, **kwargs):
     return message, configuration, harmonization
 
 
-def v342_new_fields(configuration, harmonization, dry_run, **kwargs):
+def v350_new_fields(configuration, harmonization, dry_run, **kwargs):
     """
     Add new fields to IntelMQ Data Format
     """
@@ -1057,8 +1057,7 @@ def v342_new_fields(configuration, harmonization, dry_run, **kwargs):
     ((3, 3, 0), ()),
     ((3, 3, 1), ()),
     ((3, 4, 0), (v340_deprecations, )),
-    ((3, 4, 1), (v341_blueliv_removal, )),
-    ((3, 4, 2), (v342_new_fields, )),
+    ((3, 5, 0), (v350_blueliv_removal, v350_new_fields)),
 ])
 
 ALWAYS = (harmonization,)

intelmq/tests/lib/test_upgrades.py

@@ -616,7 +616,7 @@
         "module": "intelmq.bots.collectors.twitter.collector",
     },
 }
-V341_BLUELIV_REMOVAL = {
+V350_BLUELIV_REMOVAL = {
     "global": {},
     "blueliv-collector": {
         "module": "intelmq.bots.collectors.blueliv.collector_crimeserver"
@@ -865,16 +865,16 @@ def test_v340_twitter_collector(self):
         self.assertIn('twitter-collector', result[0])
         self.assertEqual(V340_TWITTER_COLLECTOR_IN, result[1])
 
-    def test_v341_blueliv_removal(self):
-        """ Test v341_blueliv_removal deprecation warning """
-        result = upgrades.v341_blueliv_removal(V341_BLUELIV_REMOVAL, {}, False)
+    def test_v350_blueliv_removal(self):
+        """ Test v350_blueliv_removal deprecation warning """
+        result = upgrades.v350_blueliv_removal(V350_BLUELIV_REMOVAL, {}, False)
         self.assertIn('blueliv-collector', result[0])
         self.assertIn('blueliv-parser', result[0])
-        self.assertEqual(V341_BLUELIV_REMOVAL, result[1])
+        self.assertEqual(V350_BLUELIV_REMOVAL, result[1])
 
-    def test_v342_new_fields(self):
+    def test_v350_new_fields(self):
         """ Test adding new harmonisation fields """
-        result = upgrades.v342_new_fields({}, {"event": {"old-field": "must stay"}}, False)
+        result = upgrades.v350_new_fields({}, {"event": {"old-field": "must stay"}}, False)
         self.assertTrue(result[0])
         self.assertIn("old-field", result[2]["event"])
         self.assertIn("product.full_name", result[2]["event"])