Revision 51951d38
b/lib/cmdlib/instance.py | ||
---|---|---|
3238 | 3238 |
self.LogInfo("Trying to hotplug device...") |
3239 | 3239 |
result = self.rpc.call_hotplug_device(self.instance.primary_node, |
3240 | 3240 |
self.instance, action, dev_type, |
3241 |
device, extra, seq) |
|
3241 |
(device, self.instance), |
|
3242 |
extra, seq) |
|
3242 | 3243 |
if result.fail_msg: |
3243 | 3244 |
self.LogWarning("Could not hotplug device: %s" % result.fail_msg) |
3244 | 3245 |
self.LogInfo("Continuing execution..") |
b/lib/rpc.py | ||
---|---|---|
832 | 832 |
n.netinfo = objects.Network.ToDict(nobj) |
833 | 833 |
return n.ToDict() |
834 | 834 |
|
835 |
def _DeviceDict(self, _, device):
|
|
835 |
def _DeviceDict(self, _, (device, instance)):
|
|
836 | 836 |
if isinstance(device, objects.NIC): |
837 | 837 |
return self._NicDict(None, device) |
838 | 838 |
elif isinstance(device, objects.Disk): |
839 |
return _ObjectToDict(None, device)
|
|
839 |
return self._SingleDiskDictDP(None, (device, instance))
|
|
840 | 840 |
|
841 | 841 |
def _InstDict(self, node, instance, hvp=None, bep=None, osp=None): |
842 | 842 |
"""Convert the given instance to a dict. |
Also available in: Unified diff