Merge branch 'next-release'

src/models/server.js

@@ -11,4 +11,12 @@ export class Servers extends Collection {
   get Model () {
     return Server
   }
+
+  async create ({host, username, password}) {
+    if (await this.exists({host})) {
+      throw new Error('server already exists')
+    }
+
+    return await this.add({host, username, password})
+  }
 }

src/xapi-objects-to-xo.js

@@ -56,7 +56,7 @@ export function pool (obj) {
     HA_enabled: Boolean(obj.ha_enabled),
     master: link(obj, 'master'),
     name_description: obj.name_description,
-    name_label: obj.name_label
+    name_label: obj.name_label || obj.$master.name_label
 
     // TODO
     // - ? networks = networksByPool.items[pool.id] (network.$pool.id)
@@ -109,6 +109,7 @@ export function host (obj) {
       }
     })(),
     patches: link(obj, 'patches'),
+    powerOnMode: obj.power_on_mode,
     power_state: isRunning ? 'Running' : 'Halted',
     version: obj.software_version.product_version,
 

src/xo.js

@@ -652,7 +652,7 @@ export default class Xo extends EventEmitter {
     await this.backupVm({vm, pathToFile: backupFullPath, compress})
 
     const promises = []
-    for (let surplus = backups.length + 1;surplus > 0;surplus--) {
+    for (let surplus = backups.length - (depth - 1); surplus > 0; surplus--) {
       const oldBackup = backups.shift()
       promises.push(fs.unlinkAsync(`${path}/${oldBackup}`))
     }
@@ -691,7 +691,7 @@ export default class Xo extends EventEmitter {
     // FIXME: We are storing passwords which is bad!
     //        Could we use tokens instead?
     // TODO: use plain objects
-    const server = await this._servers.add({host, username, password})
+    const server = await this._servers.create({host, username, password})
 
     return server.properties
   }