Revision 319856a9 daemons/ganeti-noded
b/daemons/ganeti-noded | ||
---|---|---|
97 | 97 |
|
98 | 98 |
""" |
99 | 99 |
bdev_s, size, on_primary, info = params |
100 |
bdev = objects.ConfigObject.Loads(bdev_s)
|
|
100 |
bdev = objects.Disk.FromDict(bdev_s)
|
|
101 | 101 |
if bdev is None: |
102 | 102 |
raise ValueError("can't unserialize data!") |
103 | 103 |
return backend.CreateBlockDevice(bdev, size, on_primary, info) |
... | ... | |
108 | 108 |
|
109 | 109 |
""" |
110 | 110 |
bdev_s = params[0] |
111 |
bdev = objects.ConfigObject.Loads(bdev_s)
|
|
111 |
bdev = objects.Disk.FromDict(bdev_s)
|
|
112 | 112 |
return backend.RemoveBlockDevice(bdev) |
113 | 113 |
|
114 | 114 |
@staticmethod |
... | ... | |
117 | 117 |
|
118 | 118 |
""" |
119 | 119 |
bdev_s, on_primary = params |
120 |
bdev = objects.ConfigObject.Loads(bdev_s)
|
|
120 |
bdev = objects.Disk.FromDict(bdev_s)
|
|
121 | 121 |
if bdev is None: |
122 | 122 |
raise ValueError("can't unserialize data!") |
123 | 123 |
return backend.AssembleBlockDevice(bdev, on_primary) |
... | ... | |
128 | 128 |
|
129 | 129 |
""" |
130 | 130 |
bdev_s = params[0] |
131 |
bdev = objects.ConfigObject.Loads(bdev_s)
|
|
131 |
bdev = objects.Disk.FromDict(bdev_s)
|
|
132 | 132 |
if bdev is None: |
133 | 133 |
raise ValueError("can't unserialize data!") |
134 | 134 |
return backend.ShutdownBlockDevice(bdev) |
... | ... | |
142 | 142 |
|
143 | 143 |
""" |
144 | 144 |
bdev_s, ndev_s = params |
145 |
bdev = objects.ConfigObject.Loads(bdev_s)
|
|
146 |
ndev = objects.ConfigObject.Loads(ndev_s)
|
|
145 |
bdev = objects.Disk.FromDict(bdev_s)
|
|
146 |
ndev = objects.Disk.FromDict(ndev_s)
|
|
147 | 147 |
if bdev is None or ndev is None: |
148 | 148 |
raise ValueError("can't unserialize data!") |
149 | 149 |
return backend.MirrorAddChild(bdev, ndev) |
... | ... | |
157 | 157 |
|
158 | 158 |
""" |
159 | 159 |
bdev_s, ndev_s = params |
160 |
bdev = objects.ConfigObject.Loads(bdev_s)
|
|
161 |
ndev = objects.ConfigObject.Loads(ndev_s)
|
|
160 |
bdev = objects.Disk.FromDict(bdev_s)
|
|
161 |
ndev = objects.Disk.FromDict(ndev_s)
|
|
162 | 162 |
if bdev is None or ndev is None: |
163 | 163 |
raise ValueError("can't unserialize data!") |
164 | 164 |
return backend.MirrorRemoveChild(bdev, ndev) |
... | ... | |
168 | 168 |
"""Return the mirror status for a list of disks. |
169 | 169 |
|
170 | 170 |
""" |
171 |
disks = [objects.ConfigObject.Loads(dsk_s)
|
|
171 |
disks = [objects.Disk.FromDict(dsk_s)
|
|
172 | 172 |
for dsk_s in params] |
173 | 173 |
return backend.GetMirrorStatus(disks) |
174 | 174 |
|
... | ... | |
179 | 179 |
This will try to find but not activate a disk. |
180 | 180 |
|
181 | 181 |
""" |
182 |
disk = objects.ConfigObject.Loads(params[0])
|
|
182 |
disk = objects.Disk.FromDict(params[0])
|
|
183 | 183 |
return backend.FindBlockDevice(disk) |
184 | 184 |
|
185 | 185 |
@staticmethod |
... | ... | |
191 | 191 |
remove by calling the generic block device remove call. |
192 | 192 |
|
193 | 193 |
""" |
194 |
cfbd = objects.ConfigObject.Loads(params[0])
|
|
194 |
cfbd = objects.Disk.FromDict(params[0])
|
|
195 | 195 |
return backend.SnapshotBlockDevice(cfbd) |
196 | 196 |
|
197 | 197 |
# export/import -------------------------- |
... | ... | |
201 | 201 |
"""Export a given snapshot. |
202 | 202 |
|
203 | 203 |
""" |
204 |
disk = objects.ConfigObject.Loads(params[0])
|
|
204 |
disk = objects.Disk.FromDict(params[0])
|
|
205 | 205 |
dest_node = params[1] |
206 |
instance = objects.ConfigObject.Loads(params[2])
|
|
206 |
instance = objects.Instance.FromDict(params[2])
|
|
207 | 207 |
return backend.ExportSnapshot(disk, dest_node, instance) |
208 | 208 |
|
209 | 209 |
@staticmethod |
... | ... | |
211 | 211 |
"""Expose the finalize export functionality. |
212 | 212 |
|
213 | 213 |
""" |
214 |
instance = objects.ConfigObject.Loads(params[0])
|
|
215 |
snap_disks = [objects.ConfigObject.Loads(str_data)
|
|
214 |
instance = objects.Instance.FromDict(params[0])
|
|
215 |
snap_disks = [objects.Disk.FromDict(str_data)
|
|
216 | 216 |
for str_data in params[1]] |
217 | 217 |
return backend.FinalizeExport(instance, snap_disks) |
218 | 218 |
|
... | ... | |
284 | 284 |
|
285 | 285 |
""" |
286 | 286 |
inst_s, os_disk, swap_disk = params |
287 |
inst = objects.ConfigObject.Loads(inst_s)
|
|
287 |
inst = objects.Instance.FromDict(inst_s)
|
|
288 | 288 |
return backend.AddOSToInstance(inst, os_disk, swap_disk) |
289 | 289 |
|
290 | 290 |
@staticmethod |
... | ... | |
293 | 293 |
|
294 | 294 |
""" |
295 | 295 |
inst_s, old_name, os_disk, swap_disk = params |
296 |
inst = objects.ConfigObject.Loads(inst_s)
|
|
296 |
inst = objects.Instance.FromDict(inst_s)
|
|
297 | 297 |
return backend.RunRenameInstance(inst, old_name, os_disk, swap_disk) |
298 | 298 |
|
299 | 299 |
@staticmethod |
... | ... | |
302 | 302 |
|
303 | 303 |
""" |
304 | 304 |
inst_s, os_disk, swap_disk, src_node, src_image = params |
305 |
inst = objects.ConfigObject.Loads(inst_s)
|
|
305 |
inst = objects.Instance.FromDict(inst_s)
|
|
306 | 306 |
return backend.ImportOSIntoInstance(inst, os_disk, swap_disk, |
307 | 307 |
src_node, src_image) |
308 | 308 |
|
... | ... | |
311 | 311 |
"""Shutdown an instance. |
312 | 312 |
|
313 | 313 |
""" |
314 |
instance = objects.ConfigObject.Loads(params[0])
|
|
314 |
instance = objects.Instance.FromDict(params[0])
|
|
315 | 315 |
return backend.ShutdownInstance(instance) |
316 | 316 |
|
317 | 317 |
@staticmethod |
... | ... | |
319 | 319 |
"""Start an instance. |
320 | 320 |
|
321 | 321 |
""" |
322 |
instance = objects.ConfigObject.Loads(params[0])
|
|
322 |
instance = objects.Instance.FromDict(params[0])
|
|
323 | 323 |
extra_args = params[1] |
324 | 324 |
return backend.StartInstance(instance, extra_args) |
325 | 325 |
|
... | ... | |
432 | 432 |
result = [] |
433 | 433 |
for data in os_list: |
434 | 434 |
if isinstance(data, objects.OS): |
435 |
result.append(data.Dumps())
|
|
435 |
result.append(data.ToDict())
|
|
436 | 436 |
elif isinstance(data, errors.InvalidOS): |
437 | 437 |
result.append(data.args) |
438 | 438 |
else: |
... | ... | |
449 | 449 |
""" |
450 | 450 |
name = params[0] |
451 | 451 |
try: |
452 |
os_obj = backend.OSFromDisk(name).Dumps()
|
|
452 |
os_obj = backend.OSFromDisk(name).ToDict()
|
|
453 | 453 |
except errors.InvalidOS, err: |
454 | 454 |
os_obj = err.args |
455 | 455 |
return os_obj |
Also available in: Unified diff