Revision 821d1bd1 daemons/ganeti-noded

b/daemons/ganeti-noded
113 113
    bdev = objects.Disk.FromDict(bdev_s)
114 114
    if bdev is None:
115 115
      raise ValueError("can't unserialize data!")
116
    return backend.CreateBlockDevice(bdev, size, owner, on_primary, info)
116
    return backend.BlockdevCreate(bdev, size, owner, on_primary, info)
117 117

  
118 118
  @staticmethod
119 119
  def perspective_blockdev_remove(params):
......
122 122
    """
123 123
    bdev_s = params[0]
124 124
    bdev = objects.Disk.FromDict(bdev_s)
125
    return backend.RemoveBlockDevice(bdev)
125
    return backend.BlockdevRemove(bdev)
126 126

  
127 127
  @staticmethod
128 128
  def perspective_blockdev_rename(params):
......
130 130

  
131 131
    """
132 132
    devlist = [(objects.Disk.FromDict(ds), uid) for ds, uid in params]
133
    return backend.RenameBlockDevices(devlist)
133
    return backend.BlockdevRename(devlist)
134 134

  
135 135
  @staticmethod
136 136
  def perspective_blockdev_assemble(params):
......
141 141
    bdev = objects.Disk.FromDict(bdev_s)
142 142
    if bdev is None:
143 143
      raise ValueError("can't unserialize data!")
144
    return backend.AssembleBlockDevice(bdev, owner, on_primary)
144
    return backend.BlockdevAssemble(bdev, owner, on_primary)
145 145

  
146 146
  @staticmethod
147 147
  def perspective_blockdev_shutdown(params):
......
152 152
    bdev = objects.Disk.FromDict(bdev_s)
153 153
    if bdev is None:
154 154
      raise ValueError("can't unserialize data!")
155
    return backend.ShutdownBlockDevice(bdev)
155
    return backend.BlockdevShutdown(bdev)
156 156

  
157 157
  @staticmethod
158 158
  def perspective_blockdev_addchildren(params):
......
167 167
    ndevs = [objects.Disk.FromDict(disk_s) for disk_s in ndev_s]
168 168
    if bdev is None or ndevs.count(None) > 0:
169 169
      raise ValueError("can't unserialize data!")
170
    return backend.MirrorAddChildren(bdev, ndevs)
170
    return backend.BlockdevAddchildren(bdev, ndevs)
171 171

  
172 172
  @staticmethod
173 173
  def perspective_blockdev_removechildren(params):
......
182 182
    ndevs = [objects.Disk.FromDict(disk_s) for disk_s in ndev_s]
183 183
    if bdev is None or ndevs.count(None) > 0:
184 184
      raise ValueError("can't unserialize data!")
185
    return backend.MirrorRemoveChildren(bdev, ndevs)
185
    return backend.BlockdevRemovechildren(bdev, ndevs)
186 186

  
187 187
  @staticmethod
188 188
  def perspective_blockdev_getmirrorstatus(params):
......
191 191
    """
192 192
    disks = [objects.Disk.FromDict(dsk_s)
193 193
            for dsk_s in params]
194
    return backend.GetMirrorStatus(disks)
194
    return backend.BlockdevGetmirrorstatus(disks)
195 195

  
196 196
  @staticmethod
197 197
  def perspective_blockdev_find(params):
......
201 201

  
202 202
    """
203 203
    disk = objects.Disk.FromDict(params[0])
204
    return backend.CallBlockdevFind(disk)
204
    return backend.BlockdevFind(disk)
205 205

  
206 206
  @staticmethod
207 207
  def perspective_blockdev_snapshot(params):
......
213 213

  
214 214
    """
215 215
    cfbd = objects.Disk.FromDict(params[0])
216
    return backend.SnapshotBlockDevice(cfbd)
216
    return backend.BlockdevSnapshot(cfbd)
217 217

  
218 218
  @staticmethod
219 219
  def perspective_blockdev_grow(params):
......
222 222
    """
223 223
    cfbd = objects.Disk.FromDict(params[0])
224 224
    amount = params[1]
225
    return backend.GrowBlockDevice(cfbd, amount)
225
    return backend.BlockdevGrow(cfbd, amount)
226 226

  
227 227
  @staticmethod
228 228
  def perspective_blockdev_close(params):
......
230 230

  
231 231
    """
232 232
    disks = [objects.Disk.FromDict(cf) for cf in params[1]]
233
    return backend.CloseBlockDevices(params[0], disks)
233
    return backend.BlockdevClose(params[0], disks)
234 234

  
235 235
  # blockdev/drbd specific methods ----------
236 236

  
......
256 256
    """
257 257
    nodes_ip, disks, instance_name, multimaster = params
258 258
    disks = [objects.Disk.FromDict(cf) for cf in disks]
259
    return backend.DrbdAttachNet(nodes_ip, disks, instance_name, multimaster)
259
    return backend.DrbdAttachNet(nodes_ip, disks,
260
                                     instance_name, multimaster)
260 261

  
261 262
  @staticmethod
262 263
  def perspective_drbd_wait_sync(params):
......
593 594
    """Query detailed information about existing OSes.
594 595

  
595 596
    """
596
    return [os.ToDict() for os in backend.DiagnoseOS()]
597
    return [os_obj.ToDict() for os_obj in backend.DiagnoseOS()]
597 598

  
598 599
  @staticmethod
599 600
  def perspective_os_get(params):

Also available in: Unified diff