Revision 153d9724 daemons/ganeti-noded
b/daemons/ganeti-noded | ||
---|---|---|
135 | 135 |
return backend.ShutdownBlockDevice(bdev) |
136 | 136 |
|
137 | 137 |
@staticmethod |
138 |
def perspective_blockdev_addchild(params): |
|
138 |
def perspective_blockdev_addchildren(params):
|
|
139 | 139 |
"""Add a child to a mirror device. |
140 | 140 |
|
141 | 141 |
Note: this is only valid for mirror devices. It's the caller's duty |
... | ... | |
144 | 144 |
""" |
145 | 145 |
bdev_s, ndev_s = params |
146 | 146 |
bdev = objects.Disk.FromDict(bdev_s) |
147 |
ndev = objects.Disk.FromDict(ndev_s)
|
|
148 |
if bdev is None or ndev is None:
|
|
147 |
ndevs = [objects.Disk.FromDict(disk_s) for disk_s in ndev_s]
|
|
148 |
if bdev is None or ndevs.count(None) > 0:
|
|
149 | 149 |
raise ValueError("can't unserialize data!") |
150 |
return backend.MirrorAddChild(bdev, ndev)
|
|
150 |
return backend.MirrorAddChildren(bdev, ndevs)
|
|
151 | 151 |
|
152 | 152 |
@staticmethod |
153 |
def perspective_blockdev_removechild(params): |
|
153 |
def perspective_blockdev_removechildren(params):
|
|
154 | 154 |
"""Remove a child from a mirror device. |
155 | 155 |
|
156 | 156 |
This is only valid for mirror devices, of course. It's the callers |
... | ... | |
159 | 159 |
""" |
160 | 160 |
bdev_s, ndev_s = params |
161 | 161 |
bdev = objects.Disk.FromDict(bdev_s) |
162 |
ndev = objects.Disk.FromDict(ndev_s)
|
|
163 |
if bdev is None or ndev is None:
|
|
162 |
ndevs = [objects.Disk.FromDict(disk_s) for disk_s in ndev_s]
|
|
163 |
if bdev is None or ndevs.count(None) > 0:
|
|
164 | 164 |
raise ValueError("can't unserialize data!") |
165 |
return backend.MirrorRemoveChild(bdev, ndev)
|
|
165 |
return backend.MirrorRemoveChildren(bdev, ndevs)
|
|
166 | 166 |
|
167 | 167 |
@staticmethod |
168 | 168 |
def perspective_blockdev_getmirrorstatus(params): |
Also available in: Unified diff