Rename OpTestJobqueue and LUTestJobqueue

[ganeti-local] / test / ganeti.rapi.rlib2_unittest.py

diff --git a/test/ganeti.rapi.rlib2_unittest.py b/test/ganeti.rapi.rlib2_unittest.py
index e3cf6e9..c2f7379 100755 (executable)
--- a/test/ganeti.rapi.rlib2_unittest.py
+++ b/test/ganeti.rapi.rlib2_unittest.py
@@ -118,7 +118,7 @@ class TestParseInstanceCreateRequestVersion1(testutils.GanetiTestCase):
 
                 for dry_run in [False, True]:
                   op = self.Parse(data, dry_run)
-                  self.assert_(isinstance(op, opcodes.OpCreateInstance))
+                  self.assert_(isinstance(op, opcodes.OpInstanceCreate))
                   self.assertEqual(op.mode, mode)
                   self.assertEqual(op.disk_template, disk_template)
                   self.assertEqual(op.dry_run, dry_run)
@@ -239,7 +239,7 @@ class TestParseMigrateInstanceRequest(testutils.GanetiTestCase):
           "mode": mode,
           }
         op = self.Parse(name, data)
-        self.assert_(isinstance(op, opcodes.OpMigrateInstance))
+        self.assert_(isinstance(op, opcodes.OpInstanceMigrate))
         self.assertEqual(op.instance_name, name)
         self.assertEqual(op.mode, mode)
         self.assertEqual(op.cleanup, cleanup)
@@ -248,7 +248,7 @@ class TestParseMigrateInstanceRequest(testutils.GanetiTestCase):
     name = "instnohZeex0"
 
     op = self.Parse(name, {})
-    self.assert_(isinstance(op, opcodes.OpMigrateInstance))
+    self.assert_(isinstance(op, opcodes.OpInstanceMigrate))
     self.assertEqual(op.instance_name, name)
     self.assertEqual(op.mode, None)
     self.assertFalse(op.cleanup)
@@ -273,7 +273,7 @@ class TestParseRenameInstanceRequest(testutils.GanetiTestCase):
             }
 
           op = self.Parse(name, data)
-          self.assert_(isinstance(op, opcodes.OpRenameInstance))
+          self.assert_(isinstance(op, opcodes.OpInstanceRename))
           self.assertEqual(op.instance_name, name)
           self.assertEqual(op.new_name, new_name)
           self.assertEqual(op.ip_check, ip_check)
@@ -288,7 +288,7 @@ class TestParseRenameInstanceRequest(testutils.GanetiTestCase):
         }
 
       op = self.Parse(name, data)
-      self.assert_(isinstance(op, opcodes.OpRenameInstance))
+      self.assert_(isinstance(op, opcodes.OpInstanceRename))
       self.assertEqual(op.instance_name, name)
       self.assertEqual(op.new_name, new_name)
       self.assert_(op.ip_check)
@@ -327,7 +327,7 @@ class TestParseModifyInstanceRequest(testutils.GanetiTestCase):
                     }
 
                   op = self.Parse(name, data)
-                  self.assert_(isinstance(op, opcodes.OpSetInstanceParams))
+                  self.assert_(isinstance(op, opcodes.OpInstanceSetParams))
                   self.assertEqual(op.instance_name, name)
                   self.assertEqual(op.hvparams, hvparams)
                   self.assertEqual(op.beparams, beparams)
@@ -344,7 +344,7 @@ class TestParseModifyInstanceRequest(testutils.GanetiTestCase):
     name = "instir8aish31"
 
     op = self.Parse(name, {})
-    self.assert_(isinstance(op, opcodes.OpSetInstanceParams))
+    self.assert_(isinstance(op, opcodes.OpInstanceSetParams))
     self.assertEqual(op.instance_name, name)
     self.assertEqual(op.hvparams, {})
     self.assertEqual(op.beparams, {})
@@ -366,9 +366,9 @@ class TestParseInstanceReinstallRequest(testutils.GanetiTestCase):
 
   def _Check(self, ops, name):
     expcls = [
-      opcodes.OpShutdownInstance,
-      opcodes.OpReinstallInstance,
-      opcodes.OpStartupInstance,
+      opcodes.OpInstanceShutdown,
+      opcodes.OpInstanceReinstall,
+      opcodes.OpInstanceStartup,
       ]
 
     self.assert_(compat.all(isinstance(op, exp)
@@ -423,7 +423,7 @@ class TestParseRenameGroupRequest(testutils.GanetiTestCase):
 
     op = self.Parse(name, data, False)
 
-    self.assert_(isinstance(op, opcodes.OpRenameGroup))
+    self.assert_(isinstance(op, opcodes.OpGroupRename))
     self.assertEqual(op.old_name, name)
     self.assertEqual(op.new_name, "ua0aiyoo")
     self.assertFalse(op.dry_run)
@@ -436,7 +436,7 @@ class TestParseRenameGroupRequest(testutils.GanetiTestCase):
 
     op = self.Parse(name, data, True)
 
-    self.assert_(isinstance(op, opcodes.OpRenameGroup))
+    self.assert_(isinstance(op, opcodes.OpGroupRename))
     self.assertEqual(op.old_name, name)
     self.assertEqual(op.new_name, "ua0aiyoo")
     self.assert_(op.dry_run)