Merge branch 'develop' into feature/feature/ZEN-26894-fix-production-…

…state-sort-error

Products/ZenModel/BatchDeviceLoader.py

@@ -45,11 +45,11 @@
 from zenoss.protocols.protobufs.zep_pb2 import SEVERITY_INFO, SEVERITY_ERROR
 
 def transactional(f):
-    def wrapper(*args):
-        if args[0].options.nocommit:
-            f.__call__(*args)
+    def wrapper(obj, *args, **kwargs):
+        if obj.options.nocommit:
+            return f.__call__(obj, *args, **kwargs)
         else:
-            transact(f).__call__(*args)
+            return transact(f).__call__(obj, *args, **kwargs)
     return wrapper
 
 class BatchDeviceLoader(ZCmdBase):

Products/ZenModel/migrate/tests/test_updateOpenTSDBSkipResolvedTags.py

@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+
+import os
+import unittest
+
+import Globals
+import common
+
+
+class Test_UpdateOpenTSDBSkipResolvedTags(unittest.TestCase, common.ServiceMigrationTestCase):
+    """
+    Test that open tsdb configs have the skip_unresolved_tagvs setting added/set.
+    """
+    initial_servicedef = 'zenoss-resmgr-5.1.5.json'
+    expected_servicedef = 'zenoss-resmgr-5.1.5-updateOpenTSDBSkipUnresolvedTags.json'
+    migration_module_name = 'updateOpenTSDBSkipUnresolvedTags'
+    migration_class_name = 'UpdateOpenTSDBSkipUnresolvedTags'
+
+if __name__ == '__main__':
+    unittest.main()
+