Revision 75c866c2
| b/lib/client/gnt_instance.py | ||
|---|---|---|
| 843 | 843 |
else: |
| 844 | 844 |
mode = opts.migration_mode |
| 845 | 845 |
|
| 846 |
op = opcodes.OpMigrateInstance(instance_name=instance_name, mode=mode,
|
|
| 846 |
op = opcodes.OpInstanceMigrate(instance_name=instance_name, mode=mode,
|
|
| 847 | 847 |
cleanup=opts.cleanup) |
| 848 | 848 |
SubmitOpCode(op, cl=cl, opts=opts) |
| 849 | 849 |
return 0 |
| b/lib/cmdlib.py | ||
|---|---|---|
| 5688 | 5688 |
(instance.name, target_node, msg)) |
| 5689 | 5689 |
|
| 5690 | 5690 |
|
| 5691 |
class LUMigrateInstance(LogicalUnit):
|
|
| 5691 |
class LUInstanceMigrate(LogicalUnit):
|
|
| 5692 | 5692 |
"""Migrate an instance. |
| 5693 | 5693 |
|
| 5694 | 5694 |
This is migration without shutting down, compared to the failover, |
| b/lib/opcodes.py | ||
|---|---|---|
| 886 | 886 |
] |
| 887 | 887 |
|
| 888 | 888 |
|
| 889 |
class OpMigrateInstance(OpCode):
|
|
| 889 |
class OpInstanceMigrate(OpCode):
|
|
| 890 | 890 |
"""Migrate an instance. |
| 891 | 891 |
|
| 892 | 892 |
This migrates (without shutting down an instance) to its secondary |
| b/lib/rapi/rlib2.py | ||
|---|---|---|
| 1207 | 1207 |
def _ParseMigrateInstanceRequest(name, data): |
| 1208 | 1208 |
"""Parses a request for an instance migration. |
| 1209 | 1209 |
|
| 1210 |
@rtype: L{opcodes.OpMigrateInstance}
|
|
| 1210 |
@rtype: L{opcodes.OpInstanceMigrate}
|
|
| 1211 | 1211 |
@return: Instance migration opcode |
| 1212 | 1212 |
|
| 1213 | 1213 |
""" |
| ... | ... | |
| 1215 | 1215 |
cleanup = baserlib.CheckParameter(data, "cleanup", exptype=bool, |
| 1216 | 1216 |
default=False) |
| 1217 | 1217 |
|
| 1218 |
return opcodes.OpMigrateInstance(instance_name=name, mode=mode,
|
|
| 1218 |
return opcodes.OpInstanceMigrate(instance_name=name, mode=mode,
|
|
| 1219 | 1219 |
cleanup=cleanup) |
| 1220 | 1220 |
|
| 1221 | 1221 |
|
| b/test/ganeti.rapi.rlib2_unittest.py | ||
|---|---|---|
| 239 | 239 |
"mode": mode, |
| 240 | 240 |
} |
| 241 | 241 |
op = self.Parse(name, data) |
| 242 |
self.assert_(isinstance(op, opcodes.OpMigrateInstance))
|
|
| 242 |
self.assert_(isinstance(op, opcodes.OpInstanceMigrate))
|
|
| 243 | 243 |
self.assertEqual(op.instance_name, name) |
| 244 | 244 |
self.assertEqual(op.mode, mode) |
| 245 | 245 |
self.assertEqual(op.cleanup, cleanup) |
| ... | ... | |
| 248 | 248 |
name = "instnohZeex0" |
| 249 | 249 |
|
| 250 | 250 |
op = self.Parse(name, {})
|
| 251 |
self.assert_(isinstance(op, opcodes.OpMigrateInstance))
|
|
| 251 |
self.assert_(isinstance(op, opcodes.OpInstanceMigrate))
|
|
| 252 | 252 |
self.assertEqual(op.instance_name, name) |
| 253 | 253 |
self.assertEqual(op.mode, None) |
| 254 | 254 |
self.assertFalse(op.cleanup) |
| b/tools/burnin | ||
|---|---|---|
| 671 | 671 |
Log("Migrating instances")
|
| 672 | 672 |
for instance in self.instances: |
| 673 | 673 |
Log("instance %s", instance, indent=1)
|
| 674 |
op1 = opcodes.OpMigrateInstance(instance_name=instance, mode=None,
|
|
| 674 |
op1 = opcodes.OpInstanceMigrate(instance_name=instance, mode=None,
|
|
| 675 | 675 |
cleanup=False) |
| 676 | 676 |
|
| 677 |
op2 = opcodes.OpMigrateInstance(instance_name=instance, mode=None,
|
|
| 677 |
op2 = opcodes.OpInstanceMigrate(instance_name=instance, mode=None,
|
|
| 678 | 678 |
cleanup=True) |
| 679 | 679 |
Log("migration and migration cleanup", indent=2)
|
| 680 | 680 |
self.ExecOrQueue(instance, [op1, op2]) |
Also available in: Unified diff