Handle clone and copy

.eslintrc.js

@@ -38,15 +38,6 @@ module.exports = {
     // disabled because XAPI objects are using camel case
     camelcase: ['off'],
 
-    'react/jsx-handler-names': 'off',
-
-    // disabled because not always relevant, we might reconsider in the future
-    //
-    // enabled by https://github.com/standard/eslint-config-standard/commit/319b177750899d4525eb1210686f6aca96190b2f
-    //
-    // example: https://github.com/vatesfr/xen-orchestra/blob/31ed3767c67044ca445658eb6b560718972402f2/packages/xen-api/src/index.js#L156-L157
-    'lines-between-class-members': 'off',
-
     'no-console': ['error', { allow: ['warn', 'error'] }],
     'no-var': 'error',
     'node/no-extraneous-import': 'error',

@xen-orchestra/async-map/package.json

@@ -37,7 +37,7 @@
     "@babel/preset-flow": "^7.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.2"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

@xen-orchestra/cr-seed-cli/package.json

@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "golike-defer": "^0.4.1",
-    "xen-api": "^0.27.2"
+    "xen-api": "^0.27.1"
   },
   "scripts": {
     "postversion": "npm publish"

@xen-orchestra/cron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xen-orchestra/cron",
-  "version": "1.0.4",
+  "version": "1.0.3",
   "license": "ISC",
   "description": "Focused, well maintained, cron parser/scheduler",
   "keywords": [
@@ -47,7 +47,7 @@
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-flow": "^7.0.0",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.2"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

@xen-orchestra/cron/src/index.js

@@ -5,16 +5,9 @@ import parse from './parse'
 
 const MAX_DELAY = 2 ** 31 - 1
 
-function nextDelay(schedule) {
-  const now = schedule._createDate()
-  return next(schedule._schedule, now) - now
-}
-
 class Job {
   constructor(schedule, fn) {
     const wrapper = () => {
-      this._isRunning = true
-
       let result
       try {
         result = fn()
@@ -29,34 +22,23 @@ class Job {
       }
     }
     const scheduleNext = () => {
-      this._isRunning = false
-
-      if (this._isEnabled) {
-        const delay = nextDelay(schedule)
-        this._timeout =
-          delay < MAX_DELAY
-            ? setTimeout(wrapper, delay)
-            : setTimeout(scheduleNext, MAX_DELAY)
-      }
+      const delay = schedule._nextDelay()
+      this._timeout =
+        delay < MAX_DELAY
+          ? setTimeout(wrapper, delay)
+          : setTimeout(scheduleNext, MAX_DELAY)
     }
 
-    this._isEnabled = false
-    this._isRunning = false
     this._scheduleNext = scheduleNext
     this._timeout = undefined
   }
 
   start() {
     this.stop()
-
-    this._isEnabled = true
-    if (!this._isRunning) {
-      this._scheduleNext()
-    }
+    this._scheduleNext()
   }
 
   stop() {
-    this._isEnabled = false
     clearTimeout(this._timeout)
   }
 }
@@ -86,6 +68,11 @@ class Schedule {
     return dates
   }
 
+  _nextDelay() {
+    const now = this._createDate()
+    return next(this._schedule, now) - now
+  }
+
   startJob(fn) {
     const job = this.createJob(fn)
     job.start()

@xen-orchestra/cron/src/index.spec.js

@@ -1,62 +0,0 @@
-/* eslint-env jest */
-
-import { createSchedule } from './'
-
-describe('issues', () => {
-  test('stop during async execution', async () => {
-    let nCalls = 0
-    let resolve, promise
-
-    const job = createSchedule('* * * * *').createJob(() => {
-      ++nCalls
-
-      // eslint-disable-next-line promise/param-names
-      promise = new Promise(r => {
-        resolve = r
-      })
-      return promise
-    })
-
-    job.start()
-    jest.runAllTimers()
-
-    expect(nCalls).toBe(1)
-
-    job.stop()
-
-    resolve()
-    await promise
-
-    jest.runAllTimers()
-    expect(nCalls).toBe(1)
-  })
-
-  test('stop then start during async job execution', async () => {
-    let nCalls = 0
-    let resolve, promise
-
-    const job = createSchedule('* * * * *').createJob(() => {
-      ++nCalls
-
-      // eslint-disable-next-line promise/param-names
-      promise = new Promise(r => {
-        resolve = r
-      })
-      return promise
-    })
-
-    job.start()
-    jest.runAllTimers()
-
-    expect(nCalls).toBe(1)
-
-    job.stop()
-    job.start()
-
-    resolve()
-    await promise
-
-    jest.runAllTimers()
-    expect(nCalls).toBe(2)
-  })
-})

@xen-orchestra/defined/package.json

@@ -35,7 +35,7 @@
     "@babel/preset-flow": "^7.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.2"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

@xen-orchestra/emit-async/package.json

@@ -34,7 +34,7 @@
     "@babel/preset-env": "^7.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.2"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

@xen-orchestra/fs/package.json

@@ -49,7 +49,7 @@
     "cross-env": "^5.1.3",
     "dotenv": "^8.0.0",
     "index-modules": "^0.3.0",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.2"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

@xen-orchestra/log/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xen-orchestra/log",
-  "version": "0.2.0",
+  "version": "0.1.4",
   "license": "ISC",
   "description": "",
   "keywords": [],
@@ -40,7 +40,7 @@
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
     "index-modules": "^0.3.0",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.2"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

@xen-orchestra/log/src/configure.js

@@ -19,8 +19,7 @@ const createTransport = config => {
     }
   }
 
-  let { filter } = config
-  let transport = createTransport(config.transport)
+  let { filter, transport } = config
   const level = resolve(config.level)
 
   if (filter !== undefined) {
@@ -52,12 +51,11 @@ const symbol =
     ? Symbol.for('@xen-orchestra/log')
     : '@@@xen-orchestra/log'
 
-const { env } = process
 global[symbol] = createTransport({
   // display warnings or above, and all that are enabled via DEBUG or
   // NODE_DEBUG env
-  filter: [env.DEBUG, env.NODE_DEBUG].filter(Boolean).join(','),
-  level: resolve(env.LOG_LEVEL, LEVELS.INFO),
+  filter: process.env.DEBUG || process.env.NODE_DEBUG,
+  level: LEVELS.INFO,
 
   transport: createConsoleTransport(),
 })

@xen-orchestra/log/src/index.js

@@ -1,5 +1,5 @@
 import createTransport from './transports/console'
-import LEVELS, { resolve } from './levels'
+import LEVELS from './levels'
 
 const symbol =
   typeof Symbol !== 'undefined'
@@ -9,8 +9,7 @@ if (!(symbol in global)) {
   // the default behavior, without requiring `configure` is to avoid
   // logging anything unless it's a real error
   const transport = createTransport()
-  const level = resolve(process.env.LOG_LEVEL, LEVELS.WARN)
-  global[symbol] = log => log.level >= level && transport(log)
+  global[symbol] = log => log.level > LEVELS.WARN && transport(log)
 }
 
 // -------------------------------------------------------------------
@@ -73,5 +72,5 @@ prototype.wrap = function(message, fn) {
   }
 }
 
-export const createLogger = namespace => new Logger(namespace)
+const createLogger = namespace => new Logger(namespace)
 export { createLogger as default }

@xen-orchestra/log/src/levels.js

@@ -13,22 +13,11 @@ for (const name in LEVELS) {
   NAMES[LEVELS[name]] = name
 }
 
-// resolves to the number representation of a level
-//
-// returns `defaultLevel` if invalid
-export const resolve = (level, defaultLevel) => {
-  const type = typeof level
-  if (type === 'number') {
-    if (level in NAMES) {
-      return level
-    }
-  } else if (type === 'string') {
-    const nLevel = LEVELS[level.toUpperCase()]
-    if (nLevel !== undefined) {
-      return nLevel
-    }
+export const resolve = level => {
+  if (typeof level === 'string') {
+    level = LEVELS[level.toUpperCase()]
   }
-  return defaultLevel
+  return level
 }
 
 Object.freeze(LEVELS)

@xen-orchestra/log/src/transports/console.js

@@ -1,23 +1,26 @@
 import LEVELS, { NAMES } from '../levels'
 
+// Bind console methods (necessary for browsers)
+/* eslint-disable no-console */
+const debugConsole = console.log.bind(console)
+const infoConsole = console.info.bind(console)
+const warnConsole = console.warn.bind(console)
+const errorConsole = console.error.bind(console)
+/* eslint-enable no-console */
+
 const { ERROR, INFO, WARN } = LEVELS
 
 const consoleTransport = ({ data, level, namespace, message, time }) => {
   const fn =
-    /* eslint-disable no-console */
     level < INFO
-      ? console.log
+      ? debugConsole
       : level < WARN
-      ? console.info
+      ? infoConsole
       : level < ERROR
-      ? console.warn
-      : console.error
-  /* eslint-enable no-console */
+      ? warnConsole
+      : errorConsole
 
-  const args = [time.toISOString(), namespace, NAMES[level], message]
-  if (data != null) {
-    args.push(data)
-  }
-  fn.apply(console, args)
+  fn('%s - %s - [%s] %s', time.toISOString(), namespace, NAMES[level], message)
+  data != null && fn(data)
 }
 export default () => consoleTransport

@xen-orchestra/mixin/package.json

@@ -37,7 +37,7 @@
     "babel-plugin-dev": "^1.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.2"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

@xen-orchestra/template/.babelrc.js

@@ -1,3 +0,0 @@
-module.exports = require('../../@xen-orchestra/babel-config')(
-  require('./package.json')
-)

@xen-orchestra/template/README.md

@@ -1,62 +0,0 @@
-# @xen-orchestra/template [![Build Status](https://travis-ci.org/vatesfr/xen-orchestra.png?branch=master)](https://travis-ci.org/vatesfr/xen-orchestra)
-
-## Install
-
-Installation of the [npm package](https://npmjs.org/package/@xen-orchestra/template):
-
-```
-> npm install --save @xen-orchestra/template
-```
-
-## Usage
-
-Create a string replacer based on a pattern and a list of rules.
-
-```js
-const myReplacer = compileTemplate('{name}_COPY_\{name}_{id}_%\%', {
-  '{name}': vm => vm.name_label,
-  '{id}': vm => vm.id,
-  '%': (_, i) => i
-})
-
-const newString = myReplacer({
-  name_label: 'foo',
-  id: 42,
-}, 32)
-
-newString === 'foo_COPY_{name}_42_32%' // true
-```
-
-## Development
-
-```
-# Install dependencies
-> yarn
-
-# Run the tests
-> yarn test
-
-# Continuously compile
-> yarn dev
-
-# Continuously run the tests
-> yarn dev-test
-
-# Build for production (automatically called by npm install)
-> yarn build
-```
-
-## Contributions
-
-Contributions are *very* welcomed, either on the documentation or on
-the code.
-
-You may:
-
-- report any [issue](https://github.com/vatesfr/xen-orchestra/issues)
-  you've encountered;
-- fork and create a pull request.
-
-## License
-
-ISC © [Vates SAS](https://vates.fr)

@xen-orchestra/template/package.json

@@ -1,46 +0,0 @@
-{
-  "name": "@xen-orchestra/template",
-  "version": "0.1.0",
-  "license": "ISC",
-  "homepage": "https://github.com/vatesfr/xen-orchestra/tree/master/@xen-orchestra/template",
-  "bugs": "https://github.com/vatesfr/xen-orchestra/issues",
-  "repository": {
-    "directory": "@xen-orchestra/template",
-    "type": "git",
-    "url": "https://github.com/vatesfr/xen-orchestra.git"
-  },
-  "author": {
-    "name": "Julien Fontanet",
-    "email": "julien.fontanet@vates.fr"
-  },
-  "preferGlobal": false,
-  "main": "dist/",
-  "files": [
-    "dist/"
-  ],
-  "browserslist": [
-    ">2%"
-  ],
-  "engines": {
-    "node": ">=6"
-  },
-  "devDependencies": {
-    "@babel/cli": "^7.0.0",
-    "@babel/core": "^7.0.0",
-    "@babel/preset-env": "^7.0.0",
-    "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
-  },
-  "scripts": {
-    "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",
-    "clean": "rimraf dist/",
-    "dev": "cross-env NODE_ENV=development babel --watch --source-maps --out-dir=dist/ src/",
-    "prebuild": "yarn run clean",
-    "predev": "yarn run prebuild",
-    "prepublishOnly": "yarn run build",
-    "postversion": "npm publish --access public"
-  },
-  "dependencies": {
-    "lodash": "^4.17.15"
-  }
-}

@xen-orchestra/template/src/index.js

@@ -1,19 +0,0 @@
-import escapeRegExp from 'lodash/escapeRegExp'
-
-const compareLengthDesc = (a, b) => b.length - a.length
-
-export function compileTemplate(pattern, rules) {
-  const matches = Object.keys(rules)
-    .sort(compareLengthDesc)
-    .map(escapeRegExp)
-    .join('|')
-  const regExp = new RegExp(`\\\\(?:\\\\|${matches})|${matches}`, 'g')
-  return (...params) =>
-    pattern.replace(regExp, match => {
-      if (match[0] === '\\') {
-        return match.slice(1)
-      }
-      const rule = rules[match]
-      return typeof rule === 'function' ? rule(...params) : rule
-    })
-}

@xen-orchestra/template/src/index.spec.js

@@ -1,14 +0,0 @@
-/* eslint-env jest */
-import { compileTemplate } from '.'
-
-it("correctly replaces the template's variables", () => {
-  const replacer = compileTemplate(
-    '{property}_\\{property}_\\\\{property}_{constant}_%_FOO',
-    {
-      '{property}': obj => obj.name,
-      '{constant}': 1235,
-      '%': (_, i) => i,
-    }
-  )
-  expect(replacer({ name: 'bar' }, 5)).toBe('bar_{property}_\\bar_1235_5_FOO')
-})

CHANGELOG.md

@@ -4,133 +4,16 @@
 
 ### Enhancements
 
-- [Support] Ability to check the XOA on the user interface [#4513](https://github.com/vatesfr/xen-orchestra/issues/4513) (PR [#4574](https://github.com/vatesfr/xen-orchestra/pull/4574))
-
-### Bug fixes
-
-- [VM/new-vm] Fix template selection on creating new VM for resource sets [#4565](https://github.com/vatesfr/xen-orchestra/issues/4565) (PR [#4568](https://github.com/vatesfr/xen-orchestra/pull/4568))
-- [VM] Clearer invalid cores per socket error [#4120](https://github.com/vatesfr/xen-orchestra/issues/4120) (PR [#4187](https://github.com/vatesfr/xen-orchestra/pull/4187))
-
-### Released packages
-
-- xo-web v5.50.3
-
-
-## **5.39.0** (2019-09-30)
-
-![Channel: latest](https://badgen.net/badge/channel/latest/yellow)
-
-### Highlights
-
-- [VM/console] Add a button to connect to the VM via the local SSH client (PR [#4415](https://github.com/vatesfr/xen-orchestra/pull/4415))
-- [SDN Controller] Add possibility to encrypt private networks (PR [#4441](https://github.com/vatesfr/xen-orchestra/pull/4441))
-- [Backups] Improve performance by caching VM backups listing (PR [#4509](https://github.com/vatesfr/xen-orchestra/pull/4509))
-- [HUB] VM template store [#1918](https://github.com/vatesfr/xen-orchestra/issues/1918) (PR [#4442](https://github.com/vatesfr/xen-orchestra/pull/4442))
-
-### Enhancements
-
-- [SR/new] Clarify address formats [#4450](https://github.com/vatesfr/xen-orchestra/issues/4450) (PR [#4460](https://github.com/vatesfr/xen-orchestra/pull/4460))
-- [Backup NG/New] Show warning if zstd compression is not supported on a VM [#3892](https://github.com/vatesfr/xen-orchestra/issues/3892) (PRs [#4411](https://github.com/vatesfr/xen-orchestra/pull/4411))
-- [VM/disks] Don't hide disks that are attached to the same VM twice [#4400](https://github.com/vatesfr/xen-orchestra/issues/4400) (PR [#4414](https://github.com/vatesfr/xen-orchestra/pull/4414))
-- [SDN Controller] Ability to configure MTU for private networks (PR [#4491](https://github.com/vatesfr/xen-orchestra/pull/4491))
-- [VM Export] Filenames are now prefixed with datetime [#4503](https://github.com/vatesfr/xen-orchestra/issues/4503)
-- [Settings/Logs] Differenciate XS/XCP-ng errors from XO errors [#4101](https://github.com/vatesfr/xen-orchestra/issues/4101) (PR [#4385](https://github.com/vatesfr/xen-orchestra/pull/4385))
-- [Backups] Improve performance by caching logs consolidation (PR [#4541](https://github.com/vatesfr/xen-orchestra/pull/4541))
-- [New VM] Cloud Init available for all plans (PR [#4543](https://github.com/vatesfr/xen-orchestra/pull/4543))
-- [Servers] IPv6 addresses can be used [#4520](https://github.com/vatesfr/xen-orchestra/issues/4520) (PR [#4521](https://github.com/vatesfr/xen-orchestra/pull/4521)) \
-  Note: They must enclosed in brackets to differentiate with the port, e.g.: `[2001:db8::7334]` or `[ 2001:db8::7334]:4343`
-
-### Bug fixes
-
-- [PBD] Obfuscate cifs password from device config [#4384](https://github.com/vatesfr/xen-orchestra/issues/4384) (PR [#4401](https://github.com/vatesfr/xen-orchestra/pull/4401))
-- [XOSAN] Fix "invalid parameters" error on creating a SR (PR [#4478](https://github.com/vatesfr/xen-orchestra/pull/4478))
-- [Patching] Avoid overloading XCP-ng by reducing the frequency of yum update checks [#4358](https://github.com/vatesfr/xen-orchestra/issues/4358) (PR [#4477](https://github.com/vatesfr/xen-orchestra/pull/4477))
-- [Network] Fix inability to create a bonded network (PR [#4489](https://github.com/vatesfr/xen-orchestra/pull/4489))
-- [Backup restore & Replication] Don't copy `sm_config` to new VDIs which might leads to useless coalesces [#4482](https://github.com/vatesfr/xen-orchestra/issues/4482) (PR [#4484](https://github.com/vatesfr/xen-orchestra/pull/4484))
-- [Home] Fix intermediary "no results" display showed on filtering items [#4420](https://github.com/vatesfr/xen-orchestra/issues/4420) (PR [#4456](https://github.com/vatesfr/xen-orchestra/pull/4456)
-- [Backup NG/New schedule] Properly show user errors in the form [#3831](https://github.com/vatesfr/xen-orchestra/issues/3831) (PR [#4131](https://github.com/vatesfr/xen-orchestra/pull/4131))
-- [VM/Advanced] Fix `"vm.set_domain_type" is not a function` error on switching virtualization mode (PV/HVM) [#4348](https://github.com/vatesfr/xen-orchestra/issues/4348) (PR [#4504](https://github.com/vatesfr/xen-orchestra/pull/4504))
-- [Backup NG/logs] Show warning when zstd compression is selected but not supported [#3892](https://github.com/vatesfr/xen-orchestra/issues/3892) (PR [#4375](https://github.com/vatesfr/xen-orchestra/pull/4375)
-- [Patches] Fix patches installation for CH 8.0 (PR [#4511](https://github.com/vatesfr/xen-orchestra/pull/4511))
-- [Network] Fix inability to set a network name [#4514](https://github.com/vatesfr/xen-orchestra/issues/4514) (PR [4510](https://github.com/vatesfr/xen-orchestra/pull/4510))
-- [Backup NG] Fix race conditions that could lead to disabled jobs still running (PR [4510](https://github.com/vatesfr/xen-orchestra/pull/4510))
-- [XOA] Remove "Updates" and "Licenses" tabs for non admin users (PR [#4526](https://github.com/vatesfr/xen-orchestra/pull/4526))
-- [New VM] Ability to escape [cloud config template](https://xen-orchestra.com/blog/xen-orchestra-5-21/#cloudconfigtemplates) variables [#4486](https://github.com/vatesfr/xen-orchestra/issues/4486) (PR [#4501](https://github.com/vatesfr/xen-orchestra/pull/4501))
-- [Backup NG] Properly log and report if job is already running [#4497](https://github.com/vatesfr/xen-orchestra/issues/4497) (PR [4534](https://github.com/vatesfr/xen-orchestra/pull/4534))
-- [Host] Fix an issue where host was wrongly reporting time inconsistency (PR [#4540](https://github.com/vatesfr/xen-orchestra/pull/4540))
-
-
-### Released packages
-
-- xen-api v0.27.2
-- xo-server-cloud v0.3.0
-- @xen-orchestra/cron v1.0.4
-- xo-server-sdn-controller v0.3.0
-- @xen-orchestra/template v0.1.0
-- xo-server v5.50.1
-- xo-web v5.50.2
-
-
-## **5.38.0** (2019-08-29)
-
-![Channel: stable](https://badgen.net/badge/channel/stable/green)
-
-### Enhancements
-
-- [VM/Attach disk] Display confirmation modal when VDI is already attached [#3381](https://github.com/vatesfr/xen-orchestra/issues/3381) (PR [#4366](https://github.com/vatesfr/xen-orchestra/pull/4366))
-- [Zstd]
-  - [VM/copy, VM/export] Only show zstd option when it's supported [#3892](https://github.com/vatesfr/xen-orchestra/issues/3892) (PRs [#4326](https://github.com/vatesfr/xen-orchestra/pull/4326) [#4368](https://github.com/vatesfr/xen-orchestra/pull/4368))
-  - [VM/Bulk copy] Show warning if zstd compression is not supported on a VM [#3892](https://github.com/vatesfr/xen-orchestra/issues/3892) (PR [#4346](https://github.com/vatesfr/xen-orchestra/pull/4346))
-- [VM import & Continuous Replication] Enable `guessVhdSizeOnImport` by default, this fix some `VDI_IO_ERROR` with XenServer 7.1 and XCP-ng 8.0 (PR [#4436](https://github.com/vatesfr/xen-orchestra/pull/4436))
-- [SDN Controller] Add possibility to create multiple GRE networks and VxLAN networks within a same pool (PR [#4435](https://github.com/vatesfr/xen-orchestra/pull/4435))
-- [SDN Controller] Add possibility to create cross-pool private networks (PR [#4405](https://github.com/vatesfr/xen-orchestra/pull/4405))
-
-### Bug fixes
-
-- [SR/General] Display VDI VM name in SR usage graph (PR [#4370](https://github.com/vatesfr/xen-orchestra/pull/4370))
-- [VM/Attach disk] Fix checking VDI mode (PR [#4373](https://github.com/vatesfr/xen-orchestra/pull/4373))
-- [VM revert] Snapshot before: add admin ACLs on created snapshot [#4331](https://github.com/vatesfr/xen-orchestra/issues/4331) (PR [#4391](https://github.com/vatesfr/xen-orchestra/pull/4391))
-- [Network] Fixed "invalid parameters" error when creating bonded network [#4425](https://github.com/vatesfr/xen-orchestra/issues/4425) (PR [#4429](https://github.com/vatesfr/xen-orchestra/pull/4429))
-
-### Released packages
-
-- xo-server-sdn-controller v0.2.0
-- xo-server-usage-report v0.7.3
-- xo-server v5.48.0
-- xo-web v5.48.1
-
-## **5.37.1** (2019-08-06)
-
-### Enhancements
-
-- [SDN Controller] Let the user choose on which PIF to create a private network (PR [#4379](https://github.com/vatesfr/xen-orchestra/pull/4379))
-
-### Bug fixes
-
-- [SDN Controller] Better detect host shutting down to adapt network topology (PR [#4314](https://github.com/vatesfr/xen-orchestra/pull/4314))
-- [SDN Controller] Add new hosts to pool's private networks (PR [#4382](https://github.com/vatesfr/xen-orchestra/pull/4382))
-
-### Released packages
-
-- xo-server-sdn-controller v0.1.2
-
-## **5.37.0** (2019-07-25)
-
-### Highlights
-
-- [Pool] Ability to add multiple hosts on the pool [#2402](https://github.com/vatesfr/xen-orchestra/issues/2402) (PR [#3716](https://github.com/vatesfr/xen-orchestra/pull/3716))
-- [SR/General] Improve SR usage graph [#3608](https://github.com/vatesfr/xen-orchestra/issues/3608) (PR [#3830](https://github.com/vatesfr/xen-orchestra/pull/3830))
-- [VM] Permission to revert to any snapshot for VM operators [#3928](https://github.com/vatesfr/xen-orchestra/issues/3928) (PR [#4247](https://github.com/vatesfr/xen-orchestra/pull/4247))
-- [Backup NG] Ability to bypass unhealthy VDI chains check [#4324](https://github.com/vatesfr/xen-orchestra/issues/4324) (PR [#4340](https://github.com/vatesfr/xen-orchestra/pull/4340))
-- [VM/console] Multiline copy/pasting [#4261](https://github.com/vatesfr/xen-orchestra/issues/4261) (PR [#4341](https://github.com/vatesfr/xen-orchestra/pull/4341))
-
-### Enhancements
-
 - [Stats] Ability to display last day stats [#4160](https://github.com/vatesfr/xen-orchestra/issues/4160) (PR [#4168](https://github.com/vatesfr/xen-orchestra/pull/4168))
 - [Settings/servers] Display servers connection issues [#4300](https://github.com/vatesfr/xen-orchestra/issues/4300) (PR [#4310](https://github.com/vatesfr/xen-orchestra/pull/4310))
+- [VM] Permission to revert to any snapshot for VM operators [#3928](https://github.com/vatesfr/xen-orchestra/issues/3928) (PR [#4247](https://github.com/vatesfr/xen-orchestra/pull/4247))
 - [VM] Show current operations and progress [#3811](https://github.com/vatesfr/xen-orchestra/issues/3811) (PR [#3982](https://github.com/vatesfr/xen-orchestra/pull/3982))
+- [SR/General] Improve SR usage graph [#3608](https://github.com/vatesfr/xen-orchestra/issues/3608) (PR [#3830](https://github.com/vatesfr/xen-orchestra/pull/3830))
 - [Backup NG/New] Generate default schedule if no schedule is specified [#4036](https://github.com/vatesfr/xen-orchestra/issues/4036) (PR [#4183](https://github.com/vatesfr/xen-orchestra/pull/4183))
 - [Host/Advanced] Ability to edit iSCSI IQN [#4048](https://github.com/vatesfr/xen-orchestra/issues/4048) (PR [#4208](https://github.com/vatesfr/xen-orchestra/pull/4208))
+- [Backup NG] Ability to bypass unhealthy VDI chains check [#4324](https://github.com/vatesfr/xen-orchestra/issues/4324) (PR [#4340](https://github.com/vatesfr/xen-orchestra/pull/4340))
+- [Pool] Ability to add multiple hosts on the pool [#2402](https://github.com/vatesfr/xen-orchestra/issues/2402) (PR [#3716](https://github.com/vatesfr/xen-orchestra/pull/3716))
+- [VM/console] Multiline copy/pasting [#4261](https://github.com/vatesfr/xen-orchestra/issues/4261) (PR [#4341](https://github.com/vatesfr/xen-orchestra/pull/4341))
 - [VM,host] Improved state icons/pills (colors and tooltips) (PR [#4363](https://github.com/vatesfr/xen-orchestra/pull/4363))
 
 ### Bug fixes
@@ -156,6 +39,8 @@
 
 ## **5.36.0** (2019-06-27)
 
+![Channel: latest](https://badgen.net/badge/channel/latest/yellow)
+
 ### Highlights
 
 - [SR/new] Create ZFS storage [#4260](https://github.com/vatesfr/xen-orchestra/issues/4260) (PR [#4266](https://github.com/vatesfr/xen-orchestra/pull/4266))
@@ -193,6 +78,8 @@
 
 ## **5.35.0** (2019-05-29)
 
+![Channel: stable](https://badgen.net/badge/channel/stable/green)
+
 ### Enhancements
 
 - [VM/general] Display 'Started... ago' instead of 'Halted... ago' for paused state [#3750](https://github.com/vatesfr/xen-orchestra/issues/3750) (PR [#4170](https://github.com/vatesfr/xen-orchestra/pull/4170))

CHANGELOG.unreleased.md

@@ -7,14 +7,13 @@
 
 > Users must be able to say: “Nice enhancement, I'm eager to test it”
 
-[Support] Ability to check the XOA on the user interface [#4513](https://github.com/vatesfr/xen-orchestra/issues/4513) (PR [#4574](https://github.com/vatesfr/xen-orchestra/pull/4574))
+- [VM/copy] Only show zstd option when it's supported [#3892](https://github.com/vatesfr/xen-orchestra/issues/3892) (PR [#4326](https://github.com/vatesfr/xen-orchestra/pull/4326))
 
 ### Bug fixes
 
 > Users must be able to say: “I had this issue, happy to know it's fixed”
 
-- [VM/new-vm] Fix template selection on creating new VM for resource sets [#4565](https://github.com/vatesfr/xen-orchestra/issues/4565) (PR [#4568](https://github.com/vatesfr/xen-orchestra/pull/4568))
-- [VM] Clearer invalid cores per socket error [#4120](https://github.com/vatesfr/xen-orchestra/issues/4120) (PR [#4187](https://github.com/vatesfr/xen-orchestra/pull/4187))
+- [SDN Controller] Better detect host shutting down to adapt network topology (PR [#4314](https://github.com/vatesfr/xen-orchestra/pull/4314))
 
 ### Released packages
 
@@ -23,5 +22,6 @@
 >
 > Rule of thumb: add packages on top.
 
-- xo-server v5.51.0
-- xo-web v5.51.0
+- xo-server-sdn-controller v0.1.2
+- xo-server v5.47.0
+- xo-web v5.47.0

PULL_REQUEST_TEMPLATE.md

@@ -1,19 +1,14 @@
 ### Check list
 
-> Check if done.
->
-> Strikethrough if not relevant: ~~example~~ ([doc](https://help.github.com/en/articles/basic-writing-and-formatting-syntax)).
+> Check items when done or if not relevant
 
-- [ ] PR reference the relevant issue (e.g. `Fixes #007` or `See xoa-support#42`)
+- [ ] PR reference the relevant issue (e.g. `Fixes #007`)
 - [ ] if UI changes, a screenshot has been added to the PR
+- [ ] `CHANGELOG.unreleased.md`:
+   - enhancement/bug fix entry added
+   - list of packages to release updated (`${name} v${new version}`)
 - [ ] documentation updated
-- `CHANGELOG.unreleased.md`:
-  - [ ] enhancement/bug fix entry added
-  - [ ] list of packages to release updated (`${name} v${new version}`)
-- **I have tested added/updated features** (and impacted code)
-  - [ ] unit tests (e.g. [`cron/parse.spec.js`](https://github.com/vatesfr/xen-orchestra/blob/b24400b21de1ebafa1099c56bac1de5c988d9202/%40xen-orchestra/cron/src/parse.spec.js))
-  - [ ] if `xo-server` API changes, the corresponding test has been added to/updated on [`xo-server-test`](https://github.com/vatesfr/xen-orchestra/tree/master/packages/xo-server-test)
-  - [ ] at least manual testing
+- [ ] **I have tested added/updated features** (and impacted code)
 
 ### Process
 
@@ -21,10 +16,3 @@
 1. mark it as `WiP:` (Work in Progress) if not ready to be merged
 1. when you want a review, add a reviewer (and only one)
 1. if necessary, update your PR, and re- add a reviewer
-
-From [_the Four Agreements_](https://en.wikipedia.org/wiki/Don_Miguel_Ruiz#The_Four_Agreements):
-
-1. Be impeccable with your word.
-1. Don't take anything personally.
-1. Don't make assumptions.
-1. Always do your best.

docs/README.md

@@ -13,11 +13,11 @@ It aims to be easy to use on any device supporting modern web technologies (HTML
 
 ## XOA quick deploy
 
-Log in to your account and use the deploy form available on [this page](https://xen-orchestra.com/#!/xoa)
+SSH to your XenServer, and execute the following:
 
-> **Note:** no data will be sent to our servers, it's running only between your browser and your host!
-
-[![](./assets/deploy_form.png)](https://xen-orchestra.com/#!/xoa)
+```
+bash -c "$(curl -s http://xoa.io/deploy)"
+```
 
 ### XOA credentials
 

docs/SUMMARY.md

@@ -55,7 +55,6 @@
    * [Emergency Shutdown](emergency_shutdown.md)
    * [Auto scalability](auto_scalability.md)
    * [Forecaster](forecaster.md)
-   * [SDN Controller](sdn_controller.md)
 * [Recipes](recipes.md)
    * [Reverse proxy](reverse_proxy.md)
 * [How to contribute?](contributing.md)

docs/features.md

@@ -15,6 +15,5 @@ We've made multiple categories to help you to find what you need:
 * [Job Manager](scheduler.html)
 * [Alerts](alerts.html)
 * [Load balancing](load_balancing.html)
-* [SDN Controller](sdn_controller.html)
 
 ![](./assets/xo5tablet.jpg)

docs/installation.md

@@ -1,10 +1,14 @@
 
 # Installation
 
-Log in to your account and use the deploy form available on [this page](https://xen-orchestra.com/#!/xoa)
+SSH to your XenServer/XCP-ng host and execute the following:
 
-![](./assets/deploy_form.png)
+```
+bash -c "$(curl -s http://xoa.io/deploy)"
+```
 
-## [More on XOA and alternate deploy](xoa.md)
+This will automatically download/import/start the XOA appliance. Nothing is changed on your host itself, it's 100% safe.
+
+## [More on XOA](xoa.md)
 
 ![](https://xen-orchestra.com/assets/xoa1.png)

docs/sdn_controller.md

@@ -1,60 +0,0 @@
-# SDN Controller
-
-> SDN Controller is available in XOA 5.44 and higher
-
-The SDN Controller enables a user to **create pool-wide and cross-pool** (since XOA 5.48.1) **private networks**.
-
-![](./assets/sdn-controller.png)
-
-## How does it work?
-
-Please read the [dedicated devblog on the SDN Controller](https://xen-orchestra.com/blog/xo-sdn-controller/) and its [extension for cross-pool private networks](https://xen-orchestra.com/blog/devblog-3-extending-the-sdn-controller/).
-
-## Usage
-
-### Network creation
-
-In the network creation view:
-- Select a `pool`
-- Select `Private network`
-- Select an interface on which to create the network's tunnels
-- Select the encapsulation: a choice is offered between `GRE` and `VxLAN`, if `VxLAN` is chosen, then port 4789 must be open for UDP traffic on all the network's hosts (see [the requirements](#vxlan))
-- Choose if the network should be encrypted or not (see [the requirements](#encryption) to use encryption)
-- Select other `pool`s to add them to the network if desired
-  - For each added `pool`: select an interface on which to create the tunnels
-- Create the network
-- Have fun! ☺
-
-***NB:***
-- All hosts in a private network must be able to reach the other hosts' management interface.
-> The term ‘management interface’ is used to indicate the IP-enabled NIC that carries the management traffic.
-- Only 1 encrypted GRE network and 1 encrypted VxLAN network per pool can exist at a time due to Open vSwitch limitation.
-
-### Configuration
-
-Like all other xo-server plugins, it can be configured directly via
-the web interface, see [the plugin documentation](https://xen-orchestra.com/docs/plugins.html).
-
-The plugin's configuration contains:
-- `cert-dir`: The path where the plugin will look for the certificates to create SSL connections with the hosts.
-If none is provided, the plugin will create its own self-signed certificates.
-- `override-certs`: Enable to uninstall the existing SDN controller CA certificate in order to replace it with the plugin's one.
-
-## Requirements
-
-### VxLAN
-
-- On XCP-ng prior to 7.6:
-  - To be able to use `VxLAN`, the following line needs to be added, if not already present, in `/etc/sysconfig/iptables` of all the hosts where `VxLAN` is wanted: `-A xapi-INPUT -p udp -m conntrack --ctstate NEW -m udp --dport 4789 -j ACCEPT`
-
-### Encryption
-
-> Encryption is not available prior to 8.0.
-
-- On XCP-ng 8.0:
-  - To be able to encrypt the networks, `openvswitch-ipsec` package must be installed on all the hosts:
-    - `yum install openvswitch-ipsec --enablerepo=xcp-ng-testing`
-    - `systemctl enable ipsec`
-    - `systemctl enable openvswitch-ipsec`
-    - `systemctl start ipsec`
-    - `systemctl start openvswitch-ipsec`

docs/troubleshooting.md

@@ -110,17 +110,16 @@ $ systemctl restart xo-server
 
 ### Behind a transparent proxy
 
-If you're behind a transparent proxy, you'll probably have issues with the updater (SSL/TLS issues).
+If your are behind a transparent proxy, you'll probably have issues with the updater (SSL/TLS issues).
 
-Run the following commands to allow the updater to work:
+First, run the following commands:
 
 ```
-$ sudo -s
 $ echo NODE_TLS_REJECT_UNAUTHORIZED=0 >> /etc/xo-appliance/env
 $ npm config -g set strict-ssl=false
-$ systemctl restart xoa-updater
 ```
-Now try running an update again.
+
+Then, restart the updater with `systemctl restart xoa-updater`.
 
 ### Updating SSL self-signed certificate
 

docs/updater.md

@@ -41,20 +41,6 @@ However, if you want to start a manual check, you can do it by clicking on the "
 
 ![](./assets/xo5updatebutton.png)
 
-#### Release channel
-In Xen Orchestra, you can make a choice between two different release channels.
-
-##### Stable
-The stable channel is intended to be a version of Xen Orchestra that is already **one month old** (and therefore will benefit from one month of community feedback and various fixes). This way, users more concerned with the stability of their appliance will have the option to stay on a slightly older (and tested) version of XO (still supported by our pro support).
-
-##### Latest
-
-The latest channel will include all the latest improvements available in Xen Orchestra. The version available in latest has already been QA'd by our team, but issues may still occur once deployed in vastly varying environments, such as our user base has.
-
-> To select the release channel of your choice, go to the XOA > Updates view.
-
-![](./assets/release-channels.png)
-
 #### Upgrade
 
 If a new version is found, you'll have an upgrade button and its tooltip displayed:

docs/xoa.md

@@ -22,36 +22,26 @@ For use on huge infrastructure (more than 500+ VMs), feel free to increase the R
 
 ### The quickest way
 
-The **fastest and most secure way** to install Xen Orchestra is to use our web deploy page. Go on https://xen-orchestra.com/#!/xoa and follow instructions.
-
-> **Note:** no data will be sent to our servers, it's running only between your browser and your host!
-
-![](./assets/deploy_form.png)
-
-### Via a bash script
-
-Alternatively, you can deploy it by connecting to your XenServer host and executing the following:
+The fastest way to install Xen Orchestra is to use our appliance deploy script. You can deploy it by connecting to your XenServer host and executing the following:
 
 ```
 bash -c "$(curl -s http://xoa.io/deploy)"
 ```
+**Note:** This won't write or modify anything on your XenServer host: it will just import the XOA VM into your default storage repository.  
 
-> **Note:** This won't write or modify anything on your XenServer host: it will just import the XOA VM into your default storage repository.
-
-Follow the instructions:
+Now follow the instructions:
 
 * Your IP configuration will be requested: it's set to **DHCP by default**, otherwise you can enter a fixed IP address (eg `192.168.0.10`)
 * If DHCP is selected, the script will continue automatically. Otherwise a netmask, gateway, and DNS should be provided.
 * XOA will be deployed on your default storage repository. You can move it elsewhere anytime after.
 
-### Via download the XVA
+### The alternative
 
 Download XOA from xen-orchestra.com. Once you've got the XVA file, you can import it with `xe vm-import filename=xoa_unified.xva` or via XenCenter.
 
 After the VM is imported, you just need to start it with `xe vm-start vm="XOA"` or with XenCenter.
 
 ## First Login
-
 Once you have started the VM, you can access the web UI by putting the IP you configured during deployment into your web browser. If you did not configure an IP or are unsure, try one of the following methods to find it:  
 
 * Run `xe vm-list params=name-label,networks | grep -A 1 XOA` on your host

package.json

@@ -8,8 +8,8 @@
     "benchmark": "^2.1.4",
     "eslint": "^6.0.1",
     "eslint-config-prettier": "^6.0.0",
-    "eslint-config-standard": "14.1.0",
-    "eslint-config-standard-jsx": "^8.1.0",
+    "eslint-config-standard": "12.0.0",
+    "eslint-config-standard-jsx": "^6.0.2",
     "eslint-plugin-eslint-comments": "^3.1.1",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-node": "^9.0.1",
@@ -17,7 +17,7 @@
     "eslint-plugin-react": "^7.6.1",
     "eslint-plugin-standard": "^4.0.0",
     "exec-promise": "^0.7.0",
-    "flow-bin": "^0.106.3",
+    "flow-bin": "^0.102.0",
     "globby": "^10.0.0",
     "husky": "^3.0.0",
     "jest": "^24.1.0",
@@ -42,11 +42,9 @@
     "testEnvironment": "node",
     "testPathIgnorePatterns": [
       "/dist/",
-      "/xo-server-test/",
       "/xo-web/"
     ],
     "testRegex": "\\.spec\\.js$",
-    "timers": "fake",
     "transform": {
       "\\.jsx?$": "babel-jest"
     }

packages/complex-matcher/package.json

@@ -36,7 +36,7 @@
     "@babel/preset-env": "^7.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.1",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.2"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/value-matcher/package.json

@@ -34,7 +34,7 @@
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-flow": "^7.0.0",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.2"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/vhd-cli/package.json

@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@xen-orchestra/fs": "^0.10.1",
-    "cli-progress": "^3.1.0",
+    "cli-progress": "^2.0.0",
     "exec-promise": "^0.7.0",
     "getopts": "^2.2.3",
     "struct-fu": "^1.2.0",
@@ -43,7 +43,7 @@
     "execa": "^2.0.2",
     "index-modules": "^0.3.0",
     "promise-toolbox": "^0.13.0",
-    "rimraf": "^3.0.0",
+    "rimraf": "^2.6.1",
     "tmp": "^0.1.0"
   },
   "scripts": {

packages/vhd-lib/package.json

@@ -43,7 +43,7 @@
     "get-stream": "^5.1.0",
     "index-modules": "^0.3.0",
     "readable-stream": "^3.0.6",
-    "rimraf": "^3.0.0",
+    "rimraf": "^2.6.2",
     "tmp": "^0.1.0"
   },
   "scripts": {

packages/xapi-explore-sr/package.json

@@ -41,7 +41,7 @@
     "human-format": "^0.10.0",
     "lodash": "^4.17.4",
     "pw": "^0.0.4",
-    "xen-api": "^0.27.2"
+    "xen-api": "^0.27.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.1.5",
@@ -49,7 +49,7 @@
     "@babel/preset-env": "^7.1.5",
     "babel-plugin-lodash": "^3.2.11",
     "cross-env": "^5.1.4",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.1"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xen-api/examples/package-lock.json

@@ -1,189 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "event-loop-delay": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/event-loop-delay/-/event-loop-delay-1.0.0.tgz",
-      "integrity": "sha512-8YtyeIWHXrvTqlAhv+fmtaGGARmgStbvocERYzrZ3pwhnQULe5PuvMUTjIWw/emxssoaftfHZsJtkeY8xjiXCg==",
-      "requires": {
-        "napi-macros": "^1.8.2",
-        "node-gyp-build": "^3.7.0"
-      }
-    },
-    "getopts": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/getopts/-/getopts-2.2.5.tgz",
-      "integrity": "sha512-9jb7AW5p3in+IiJWhQiZmmwkpLaR/ccTWdWQCtZM66HJcHHLegowh4q4tSD7gouUyeNvFWRavfK9GXosQHDpFA=="
-    },
-    "golike-defer": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/golike-defer/-/golike-defer-0.4.1.tgz",
-      "integrity": "sha512-x8cq/Fvu32T8cnco3CBDRF+/M2LFmfSIysKfecX09uIK3cFdHcEKBTPlPnEO6lwrdxfjkOIU6dIw3EIlEJeS1A=="
-    },
-    "human-format": {
-      "version": "0.10.1",
-      "resolved": "https://registry.npmjs.org/human-format/-/human-format-0.10.1.tgz",
-      "integrity": "sha512-UzCHToSw3HI9MxH9tYzMr1JbHJbgzr6o0hZCun7sruv59S1leps21bmgpBkkwEvQon5n/2OWKH1iU7BEko02cg=="
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
-    "make-error": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz",
-      "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g=="
-    },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "napi-macros": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/napi-macros/-/napi-macros-1.8.2.tgz",
-      "integrity": "sha512-Tr0DNY4RzTaBG2W2m3l7ZtFuJChTH6VZhXVhkGGjF/4cZTt+i8GcM9ozD+30Lmr4mDoZ5Xx34t2o4GJqYWDGcg=="
-    },
-    "node-gyp-build": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.9.0.tgz",
-      "integrity": "sha512-zLcTg6P4AbcHPq465ZMFNXx7XpKKJh+7kkN699NiQWisR2uWYOWNWqRHAmbnmKiL4e9aLSlmy5U7rEMUXV59+A=="
-    },
-    "prettier-bytes": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/prettier-bytes/-/prettier-bytes-1.0.4.tgz",
-      "integrity": "sha1-mUsCqkb2mcULYle1+qp/4lV+YtY="
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
-    "process-top": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/process-top/-/process-top-1.0.0.tgz",
-      "integrity": "sha512-er8iSmBMslOt5cgIHg9m6zilTPsuUqpEb1yfQ4bDmO80zr/e/5hNn+Tay3CJM/FOBnJo8Bt3fFiDDH6GvIgeAg==",
-      "requires": {
-        "event-loop-delay": "^1.0.0",
-        "prettier-bytes": "^1.0.4"
-      }
-    },
-    "progress-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-2.0.0.tgz",
-      "integrity": "sha1-+sY6Cz0R3qy7CWmrzJOyFLzhntU=",
-      "requires": {
-        "speedometer": "~1.0.0",
-        "through2": "~2.0.3"
-      }
-    },
-    "promise-toolbox": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/promise-toolbox/-/promise-toolbox-0.13.0.tgz",
-      "integrity": "sha512-Z6u7EL9/QyY1zZqeqpEiKS7ygKwZyl0JL0ouno/en6vMliZZc4AmM0aFCrDAVxEyKqj2f3SpkW0lXEfAZsNWiQ==",
-      "requires": {
-        "make-error": "^1.3.2"
-      }
-    },
-    "readable-stream": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
-      "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
-      "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "speedometer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-1.0.0.tgz",
-      "integrity": "sha1-zWccsGdSwivKM3Di8zREC+T8YuI="
-    },
-    "stream-parser": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/stream-parser/-/stream-parser-0.3.1.tgz",
-      "integrity": "sha1-FhhUhpRCACGhGC/wrxkRwSl2F3M=",
-      "requires": {
-        "debug": "2"
-      }
-    },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "throttle": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/throttle/-/throttle-1.0.3.tgz",
-      "integrity": "sha1-ijLkoV8XY9mXlIMXxevjrYpB5Lc=",
-      "requires": {
-        "readable-stream": ">= 0.3.0",
-        "stream-parser": ">= 0.0.2"
-      }
-    },
-    "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        }
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
-    }
-  }
-}

packages/xen-api/examples/package.json

@@ -5,7 +5,7 @@
     "human-format": "^0.10.1",
     "process-top": "^1.0.0",
     "progress-stream": "^2.0.0",
-    "promise-toolbox": "^0.13.0",
+    "promise-toolbox": "^0.11.0",
     "readable-stream": "^3.1.1",
     "throttle": "^1.0.3"
   }

packages/xen-api/examples/yarn.lock

@@ -0,0 +1,179 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+debug@2:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+event-loop-delay@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/event-loop-delay/-/event-loop-delay-1.0.0.tgz#5af6282549494fd0d868c499cbdd33e027978b8c"
+  integrity sha512-8YtyeIWHXrvTqlAhv+fmtaGGARmgStbvocERYzrZ3pwhnQULe5PuvMUTjIWw/emxssoaftfHZsJtkeY8xjiXCg==
+  dependencies:
+    napi-macros "^1.8.2"
+    node-gyp-build "^3.7.0"
+
+getopts@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.2.3.tgz#11d229775e2ec2067ed8be6fcc39d9b4bf39cf7d"
+  integrity sha512-viEcb8TpgeG05+Nqo5EzZ8QR0hxdyrYDp6ZSTZqe2M/h53Bk036NmqG38Vhf5RGirC/Of9Xql+v66B2gp256SQ==
+
+golike-defer@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/golike-defer/-/golike-defer-0.4.1.tgz#7a1cd435d61e461305805d980b133a0f3db4e1cc"
+
+human-format@^0.10.1:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/human-format/-/human-format-0.10.1.tgz#107793f355912e256148d5b5dcf66a0230187ee9"
+  integrity sha512-UzCHToSw3HI9MxH9tYzMr1JbHJbgzr6o0hZCun7sruv59S1leps21bmgpBkkwEvQon5n/2OWKH1iU7BEko02cg==
+
+inherits@^2.0.3, inherits@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+make-error@^1.3.2:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8"
+  integrity sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
+napi-macros@^1.8.2:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-1.8.2.tgz#299265c1d8aa401351ad0675107d751228c03eda"
+  integrity sha512-Tr0DNY4RzTaBG2W2m3l7ZtFuJChTH6VZhXVhkGGjF/4cZTt+i8GcM9ozD+30Lmr4mDoZ5Xx34t2o4GJqYWDGcg==
+
+node-gyp-build@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-3.7.0.tgz#daa77a4f547b9aed3e2aac779eaf151afd60ec8d"
+  integrity sha512-L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w==
+
+prettier-bytes@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/prettier-bytes/-/prettier-bytes-1.0.4.tgz#994b02aa46f699c50b6257b5faaa7fe2557e62d6"
+  integrity sha1-mUsCqkb2mcULYle1+qp/4lV+YtY=
+
+process-nextick-args@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
+
+process-top@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/process-top/-/process-top-1.0.0.tgz#52892bedb581c5abf0df2d0aa5c429e34275cc7e"
+  integrity sha512-er8iSmBMslOt5cgIHg9m6zilTPsuUqpEb1yfQ4bDmO80zr/e/5hNn+Tay3CJM/FOBnJo8Bt3fFiDDH6GvIgeAg==
+  dependencies:
+    event-loop-delay "^1.0.0"
+    prettier-bytes "^1.0.4"
+
+progress-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/progress-stream/-/progress-stream-2.0.0.tgz#fac63a0b3d11deacbb0969abcc93b214bce19ed5"
+  integrity sha1-+sY6Cz0R3qy7CWmrzJOyFLzhntU=
+  dependencies:
+    speedometer "~1.0.0"
+    through2 "~2.0.3"
+
+promise-toolbox@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/promise-toolbox/-/promise-toolbox-0.11.0.tgz#9ed928355355395072dace3f879879504e07d1bc"
+  integrity sha512-bjHk0kq+Ke3J3zbkbbJH6kXCyQZbFHwOTrE/Et7vS0uS0tluoV+PLqU/kEyxl8aARM7v04y2wFoDo/wWAEPvjA==
+  dependencies:
+    make-error "^1.3.2"
+
+"readable-stream@>= 0.3.0", readable-stream@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.1.1.tgz#ed6bbc6c5ba58b090039ff18ce670515795aeb06"
+  integrity sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+readable-stream@~2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+speedometer@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/speedometer/-/speedometer-1.0.0.tgz#cd671cb06752c22bca3370e2f334440be4fc62e2"
+  integrity sha1-zWccsGdSwivKM3Di8zREC+T8YuI=
+
+"stream-parser@>= 0.0.2":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/stream-parser/-/stream-parser-0.3.1.tgz#1618548694420021a1182ff0af1911c129761773"
+  integrity sha1-FhhUhpRCACGhGC/wrxkRwSl2F3M=
+  dependencies:
+    debug "2"
+
+string_decoder@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
+  integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+throttle@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/throttle/-/throttle-1.0.3.tgz#8a32e4a15f1763d997948317c5ebe3ad8a41e4b7"
+  integrity sha1-ijLkoV8XY9mXlIMXxevjrYpB5Lc=
+  dependencies:
+    readable-stream ">= 0.3.0"
+    stream-parser ">= 0.0.2"
+
+through2@~2.0.3:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+  dependencies:
+    readable-stream "~2.3.6"
+    xtend "~4.0.1"
+
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+xtend@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=

packages/xen-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xen-api",
-  "version": "0.27.2",
+  "version": "0.27.1",
   "license": "ISC",
   "description": "Connector to the Xen API",
   "keywords": [
@@ -61,7 +61,7 @@
     "@babel/preset-env": "^7.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.1"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xen-api/src/_parseUrl.js

@@ -1,4 +1,4 @@
-const URL_RE = /^(?:(https?:)\/*)?(?:([^:]+):([^@]+)@)?(?:\[([^\]]+)\]|([^:/]+))(?::([0-9]+))?\/?$/
+const URL_RE = /^(?:(https?:)\/*)?(?:([^:]+):([^@]+)@)?([^/]+?)(?::([0-9]+))?\/?$/
 
 export default url => {
   const matches = URL_RE.exec(url)
@@ -6,15 +6,7 @@ export default url => {
     throw new Error('invalid URL: ' + url)
   }
 
-  const [
-    ,
-    protocol = 'https:',
-    username,
-    password,
-    ipv6,
-    hostname = ipv6,
-    port,
-  ] = matches
+  const [, protocol = 'https:', username, password, hostname, port] = matches
   const parsedUrl = { protocol, hostname, port }
   if (username !== undefined) {
     parsedUrl.username = decodeURIComponent(username)

packages/xo-cli/package.json

@@ -57,7 +57,7 @@
     "@babel/preset-flow": "^7.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.2"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xo-cli/src/index.js

@@ -199,18 +199,7 @@ function main(args) {
     return exports[fnName](args.slice(1))
   }
 
-  return exports.call(args).catch(error => {
-    if (!(error != null && error.code === 10 && 'errors' in error.data)) {
-      throw error
-    }
-
-    const lines = [error.message]
-    const { errors } = error.data
-    errors.forEach(error => {
-      lines.push(`  property ${error.property}: ${error.message}`)
-    })
-    throw lines.join('\n')
-  })
+  return exports.call(args)
 }
 exports = module.exports = main
 

packages/xo-collection/package.json

@@ -36,7 +36,7 @@
     "@babel/preset-env": "^7.0.0",
     "cross-env": "^5.1.3",
     "event-to-promise": "^0.8.0",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.1"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xo-common/package.json

@@ -37,7 +37,7 @@
     "@babel/preset-env": "^7.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.1"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xo-lib/package.json

@@ -42,7 +42,7 @@
     "@babel/preset-env": "^7.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.1"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xo-remote-parser/package.json

@@ -34,7 +34,7 @@
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
     "deep-freeze": "^0.0.1",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.1"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xo-server-auth-google/package.json

@@ -41,7 +41,7 @@
     "@babel/preset-env": "^7.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.1"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xo-server-auth-ldap/package.json

@@ -36,7 +36,7 @@
   "dependencies": {
     "event-to-promise": "^0.8.0",
     "exec-promise": "^0.7.0",
-    "inquirer": "^7.0.0",
+    "inquirer": "^6.0.0",
     "ldapjs": "^1.0.1",
     "lodash": "^4.17.4",
     "promise-toolbox": "^0.13.0"
@@ -47,7 +47,7 @@
     "@babel/preset-env": "^7.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.1"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xo-server-auth-saml/package.json

@@ -41,7 +41,7 @@
     "@babel/preset-env": "^7.0.0",
     "babel-preset-env": "^1.6.1",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.1"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xo-server-backup-reports/package.json

@@ -36,7 +36,7 @@
     "node": ">=6"
   },
   "dependencies": {
-    "@xen-orchestra/log": "^0.2.0",
+    "@xen-orchestra/log": "^0.1.4",
     "human-format": "^0.10.0",
     "lodash": "^4.13.1",
     "moment-timezone": "^0.5.13"
@@ -49,7 +49,7 @@
     "@babel/preset-env": "^7.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.1"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xo-server-cloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-cloud",
-  "version": "0.3.0",
+  "version": "0.2.4",
   "license": "ISC",
   "description": "",
   "keywords": [
@@ -40,7 +40,7 @@
     "@babel/core": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.5.4"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xo-server-cloud/src/index.js

@@ -20,13 +20,9 @@ class XoServerCloud {
   }
 
   async load() {
-    const getResourceCatalog = this._getCatalog.bind(this)
-    getResourceCatalog.description =
-      "Get the list of user's available resources"
+    const getResourceCatalog = () => this._getCatalog()
+    getResourceCatalog.description = 'Get the list of all available resources'
     getResourceCatalog.permission = 'admin'
-    getResourceCatalog.params = {
-      filters: { type: 'object', optional: true },
-    }
 
     const registerResource = ({ namespace }) =>
       this._registerResource(namespace)
@@ -38,29 +34,8 @@ class XoServerCloud {
     }
     registerResource.permission = 'admin'
 
-    const downloadAndInstallResource = this._downloadAndInstallResource.bind(
-      this
-    )
-
-    downloadAndInstallResource.description =
-      'Download and install a resource via cloud plugin'
-
-    downloadAndInstallResource.params = {
-      id: { type: 'string' },
-      namespace: { type: 'string' },
-      version: { type: 'string' },
-      sr: { type: 'string' },
-    }
-
-    downloadAndInstallResource.resolve = {
-      sr: ['sr', 'SR', 'administrate'],
-    }
-
-    downloadAndInstallResource.permission = 'admin'
-
     this._unsetApiMethods = this._xo.addApiMethods({
       cloud: {
-        downloadAndInstallResource,
         getResourceCatalog,
         registerResource,
       },
@@ -91,8 +66,8 @@ class XoServerCloud {
 
   // ----------------------------------------------------------------
 
-  async _getCatalog({ filters } = {}) {
-    const catalog = await this._updater.call('getResourceCatalog', { filters })
+  async _getCatalog() {
+    const catalog = await this._updater.call('getResourceCatalog')
 
     if (!catalog) {
       throw new Error('cannot get catalog')
@@ -115,26 +90,6 @@ class XoServerCloud {
 
   // ----------------------------------------------------------------
 
-  async _downloadAndInstallResource({ id, namespace, sr, version }) {
-    const stream = await this._requestResource({
-      hub: true,
-      id,
-      namespace,
-      version,
-    })
-    const vm = await this._xo.getXapi(sr.$poolId).importVm(stream, {
-      srId: sr.id,
-      type: 'xva',
-    })
-    await vm.update_other_config({
-      'xo:resource:namespace': namespace,
-      'xo:resource:xva:version': version,
-      'xo:resource:xva:id': id,
-    })
-  }
-
-  // ----------------------------------------------------------------
-
   async _registerResource(namespace) {
     const _namespace = (await this._getNamespaces())[namespace]
 
@@ -151,10 +106,8 @@ class XoServerCloud {
 
   // ----------------------------------------------------------------
 
-  async _getNamespaceCatalog({ hub, namespace }) {
-    const namespaceCatalog = (await this._getCatalog({ filters: { hub } }))[
-      namespace
-    ]
+  async _getNamespaceCatalog(namespace) {
+    const namespaceCatalog = (await this._getCatalog())[namespace]
 
     if (!namespaceCatalog) {
       throw new Error(`cannot get catalog: ${namespace} not registered`)
@@ -165,17 +118,14 @@ class XoServerCloud {
 
   // ----------------------------------------------------------------
 
-  async _requestResource({ hub = false, id, namespace, version }) {
+  async _requestResource(namespace, id, version) {
     const _namespace = (await this._getNamespaces())[namespace]
 
-    if (!hub && (!_namespace || !_namespace.registered)) {
+    if (!_namespace || !_namespace.registered) {
       throw new Error(`cannot get resource: ${namespace} not registered`)
     }
 
-    const { _token: token } = await this._getNamespaceCatalog({
-      hub,
-      namespace,
-    })
+    const { _token: token } = await this._getNamespaceCatalog(namespace)
 
     // 2018-03-20 Extra check: getResourceDownloadToken seems to be called without a token in some cases
     if (token === undefined) {

packages/xo-server-load-balancer/package.json

@@ -31,7 +31,7 @@
     "node": ">=6"
   },
   "dependencies": {
-    "@xen-orchestra/cron": "^1.0.4",
+    "@xen-orchestra/cron": "^1.0.3",
     "lodash": "^4.16.2"
   },
   "devDependencies": {

packages/xo-server-perf-alert/package.json

@@ -21,7 +21,7 @@
     "node": ">=6"
   },
   "dependencies": {
-    "@xen-orchestra/cron": "^1.0.4",
+    "@xen-orchestra/cron": "^1.0.3",
     "d3-time-format": "^2.1.1",
     "json5": "^2.0.1",
     "lodash": "^4.17.4"
@@ -33,7 +33,7 @@
     "@babel/preset-flow": "^7.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.2"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xo-server-perf-alert/src/index.js

@@ -680,7 +680,7 @@ ${entry.listItem}
       },
     }
     if (xapiObject.$type === 'VM') {
-      payload.vm_uuid = xapiObject.uuid
+      payload['vm_uuid'] = xapiObject.uuid
     }
     // JSON is not well formed, can't use the default node parser
     return JSON5.parse(

packages/xo-server-sdn-controller/README.md

@@ -1,14 +1,31 @@
 # xo-server-sdn-controller [![Build Status](https://travis-ci.org/vatesfr/xen-orchestra.png?branch=master)](https://travis-ci.org/vatesfr/xen-orchestra)
 
-XO Server plugin that allows the creation of pool-wide and cross-pool private networks.
+XO Server plugin that allows the creation of pool-wide private networks.
 
 ## Install
 
 For installing XO and the plugins from the sources, please take a look at [the documentation](https://xen-orchestra.com/docs/from_the_sources.html).
 
-## Documentation
+## Usage
 
-Please see the plugin's [official documentation](https://xen-orchestra.com/docs/sdn_controller.html).
+### Network creation
+
+In the network creation view, select a `pool` and `Private network`.
+Create the network.
+
+Choice is offer between `GRE` and `VxLAN`, if `VxLAN` is chosen, then the port 4789 must be open for UDP traffic.
+The following line needs to be added, if not already present, in `/etc/sysconfig/iptables` of all the hosts where `VxLAN` is wanted:
+`-A xapi-INPUT -p udp -m conntrack --ctstate NEW -m udp --dport 4789 -j ACCEPT`
+
+### Configuration
+
+Like all other xo-server plugins, it can be configured directly via
+the web interface, see [the plugin documentation](https://xen-orchestra.com/docs/plugins.html).
+
+The plugin's configuration contains:
+- `cert-dir`: A path where to find the certificates to create SSL connections with the hosts.
+If none is provided, the plugin will create its own self-signed certificates.
+- `override-certs:` Whether or not to uninstall an already existing SDN controller CA certificate in order to replace it by the plugin's one.
 
 ## Contributions
 

packages/xo-server-sdn-controller/package.json

@@ -15,24 +15,22 @@
     "predev": "yarn run prebuild",
     "prepublishOnly": "yarn run build"
   },
-  "version": "0.3.0",
+  "version": "0.1.1",
   "engines": {
     "node": ">=6"
   },
   "devDependencies": {
     "@babel/cli": "^7.4.4",
     "@babel/core": "^7.4.4",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.4.4",
     "@babel/plugin-proposal-optional-chaining": "^7.2.0",
     "@babel/preset-env": "^7.4.4",
     "cross-env": "^5.2.0"
   },
   "dependencies": {
-    "@xen-orchestra/log": "^0.2.0",
+    "@xen-orchestra/log": "^0.1.4",
     "lodash": "^4.17.11",
-    "node-openssl-cert": "^0.0.97",
-    "promise-toolbox": "^0.14.0",
-    "uuid": "^3.3.2"
+    "node-openssl-cert": "^0.0.84",
+    "promise-toolbox": "^0.13.0"
   },
   "private": true
 }

packages/xo-server-sdn-controller/src/ovsdb-client.js

@@ -1,8 +1,8 @@
 import assert from 'assert'
 import createLogger from '@xen-orchestra/log'
+import forOwn from 'lodash/forOwn'
 import fromEvent from 'promise-toolbox/fromEvent'
 import { connect } from 'tls'
-import { forOwn, toPairs } from 'lodash'
 
 const log = createLogger('xo:xo-server:sdn-controller:ovsdb-client')
 
@@ -10,57 +10,44 @@ const OVSDB_PORT = 6640
 
 // =============================================================================
 
-function toMap(object) {
-  return ['map', toPairs(object)]
-}
-
-// =============================================================================
-
 export class OvsdbClient {
-  /*
-  Create an SSL connection to an XCP-ng host.
-  Interact with the host's OpenVSwitch (OVS) daemon to create and manage the virtual bridges
-  corresponding to the private networks with OVSDB (OpenVSwitch DataBase) Protocol.
-  See:
-  - OVSDB Protocol: https://tools.ietf.org/html/rfc7047
-  - OVS Tunneling : http://docs.openvswitch.org/en/latest/howto/tunneling/
-  - OVS IPSEC     : http://docs.openvswitch.org/en/latest/howto/ipsec/
-
-  Attributes on created OVS ports (corresponds to a XAPI `PIF` or `VIF`):
-  - `other_config`:
-    - `xo:sdn-controller:cross-pool`       : UUID of the remote network connected by the tunnel
-    - `xo:sdn-controller:private-pool-wide`: `true` if created (and managed) by a SDN Controller
-
-  Attributes on created OVS interfaces:
-  - `options`:
-    - `key`      : Network's VNI
-    - `remote_ip`: Remote IP of the tunnel
-  */
-
   constructor(host, clientKey, clientCert, caCert) {
+    this._host = host
     this._numberOfPortAndInterface = 0
-    this._requestId = 0
-
-    this._adding = []
-
-    this.host = host
+    this._requestID = 0
 
     this.updateCertificates(clientKey, clientCert, caCert)
 
     log.debug('New OVSDB client', {
-      host: this.host.name_label,
+      host: this._host.name_label,
     })
   }
 
   // ---------------------------------------------------------------------------
 
+  get address() {
+    return this._host.address
+  }
+
+  get host() {
+    return this._host.$ref
+  }
+
+  get id() {
+    return this._host.$id
+  }
+
+  get hostMetricsRef() {
+    return this._host.metrics
+  }
+
   updateCertificates(clientKey, clientCert, caCert) {
     this._clientKey = clientKey
     this._clientCert = clientCert
     this._caCert = caCert
 
     log.debug('Certificates have been updated', {
-      host: this.host.name_label,
+      host: this._host.name_label,
     })
   }
 
@@ -70,32 +57,19 @@ export class OvsdbClient {
     networkUuid,
     networkName,
     remoteAddress,
-    encapsulation,
-    key,
-    password,
-    remoteNetwork
+    encapsulation
   ) {
-    if (
-      this._adding.find(
-        elem => elem.id === networkUuid && elem.addr === remoteAddress
-      ) !== undefined
-    ) {
-      return
-    }
-    const adding = { id: networkUuid, addr: remoteAddress }
-    this._adding.push(adding)
-
     const socket = await this._connect()
+    const index = this._numberOfPortAndInterface
+    ++this._numberOfPortAndInterface
+
     const [bridgeUuid, bridgeName] = await this._getBridgeUuidForNetwork(
       networkUuid,
       networkName,
       socket
     )
-    if (bridgeUuid === undefined) {
+    if (bridgeUuid == null) {
       socket.destroy()
-      this._adding = this._adding.filter(
-        elem => elem.id !== networkUuid || elem.addr !== remoteAddress
-      )
       return
     }
 
@@ -107,47 +81,35 @@ export class OvsdbClient {
     )
     if (alreadyExist) {
       socket.destroy()
-      this._adding = this._adding.filter(
-        elem => elem.id !== networkUuid || elem.addr !== remoteAddress
-      )
-      return bridgeName
+      return
     }
 
-    const index = ++this._numberOfPortAndInterface
-    const interfaceName = bridgeName + '_iface' + index
-    const portName = bridgeName + '_port' + index
+    const interfaceName = 'tunnel_iface' + index
+    const portName = 'tunnel_port' + index
 
     // Add interface and port to the bridge
-    const options = { remote_ip: remoteAddress, key: key }
-    if (password !== undefined) {
-      options.psk = password
-    }
+    const options = ['map', [['remote_ip', remoteAddress]]]
     const addInterfaceOperation = {
       op: 'insert',
       table: 'Interface',
       row: {
         type: encapsulation,
-        options: toMap(options),
+        options: options,
         name: interfaceName,
+        other_config: ['map', [['private_pool_wide', 'true']]],
       },
       'uuid-name': 'new_iface',
     }
-
     const addPortOperation = {
       op: 'insert',
       table: 'Port',
       row: {
         name: portName,
         interfaces: ['set', [['named-uuid', 'new_iface']]],
-        other_config: toMap(
-          remoteNetwork !== undefined
-            ? { 'xo:sdn-controller:cross-pool': remoteNetwork }
-            : { 'xo:sdn-controller:private-pool-wide': 'true' }
-        ),
+        other_config: ['map', [['private_pool_wide', 'true']]],
       },
       'uuid-name': 'new_port',
     }
-
     const mutateBridgeOperation = {
       op: 'mutate',
       table: 'Bridge',
@@ -161,11 +123,7 @@ export class OvsdbClient {
       mutateBridgeOperation,
     ]
     const jsonObjects = await this._sendOvsdbTransaction(params, socket)
-
-    this._adding = this._adding.filter(
-      elem => elem.id !== networkUuid || elem.addr !== remoteAddress
-    )
-    if (jsonObjects === undefined) {
+    if (jsonObjects == null) {
       socket.destroy()
       return
     }
@@ -176,14 +134,14 @@ export class OvsdbClient {
     let opResult
     do {
       opResult = jsonObjects[0].result[i]
-      if (opResult?.error !== undefined) {
+      if (opResult != null && opResult.error != null) {
         error = opResult.error
         details = opResult.details
       }
       ++i
-    } while (opResult !== undefined && error === undefined)
+    } while (opResult && !error)
 
-    if (error !== undefined) {
+    if (error != null) {
       log.error('Error while adding port and interface to bridge', {
         error,
         details,
@@ -191,7 +149,7 @@ export class OvsdbClient {
         interface: interfaceName,
         bridge: bridgeName,
         network: networkName,
-        host: this.host.name_label,
+        host: this._host.name_label,
       })
       socket.destroy()
       return
@@ -202,32 +160,26 @@ export class OvsdbClient {
       interface: interfaceName,
       bridge: bridgeName,
       network: networkName,
-      host: this.host.name_label,
+      host: this._host.name_label,
     })
     socket.destroy()
-    return bridgeName
   }
 
-  async resetForNetwork(
-    networkUuid,
-    networkName,
-    crossPoolOnly,
-    remoteNetwork
-  ) {
+  async resetForNetwork(networkUuid, networkName) {
     const socket = await this._connect()
     const [bridgeUuid, bridgeName] = await this._getBridgeUuidForNetwork(
       networkUuid,
       networkName,
       socket
     )
-    if (bridgeUuid === undefined) {
+    if (bridgeUuid == null) {
       socket.destroy()
       return
     }
 
     // Delete old ports created by a SDN controller
     const ports = await this._getBridgePorts(bridgeUuid, bridgeName, socket)
-    if (ports === undefined) {
+    if (ports == null) {
       socket.destroy()
       return
     }
@@ -242,25 +194,12 @@ export class OvsdbClient {
         where,
         socket
       )
-      if (selectResult === undefined) {
+      if (selectResult == null) {
         continue
       }
 
       forOwn(selectResult.other_config[1], config => {
-        // 2019-09-03
-        // Compatibility code, to be removed in 1 year.
-        const oldShouldDelete =
-          (config[0] === 'private_pool_wide' && !crossPoolOnly) ||
-          (config[0] === 'cross_pool' &&
-            (remoteNetwork === undefined || remoteNetwork === config[1]))
-
-        const shouldDelete =
-          (config[0] === 'xo:sdn-controller:private-pool-wide' &&
-            !crossPoolOnly) ||
-          (config[0] === 'xo:sdn-controller:cross-pool' &&
-            (remoteNetwork === undefined || remoteNetwork === config[1]))
-
-        if (shouldDelete || oldShouldDelete) {
+        if (config[0] === 'private_pool_wide' && config[1] === 'true') {
           portsToDelete.push(['uuid', portUuid])
         }
       })
@@ -281,15 +220,15 @@ export class OvsdbClient {
 
     const params = ['Open_vSwitch', mutateBridgeOperation]
     const jsonObjects = await this._sendOvsdbTransaction(params, socket)
-    if (jsonObjects === undefined) {
+    if (jsonObjects == null) {
       socket.destroy()
       return
     }
     if (jsonObjects[0].error != null) {
       log.error('Error while deleting ports from bridge', {
-        error: jsonObjects[0].error,
+        error: jsonObjects.error,
         bridge: bridgeName,
-        host: this.host.name_label,
+        host: this._host.name_label,
       })
       socket.destroy()
       return
@@ -298,7 +237,7 @@ export class OvsdbClient {
     log.debug('Ports deleted from bridge', {
       nPorts: jsonObjects[0].result[0].count,
       bridge: bridgeName,
-      host: this.host.name_label,
+      host: this._host.name_label,
     })
     socket.destroy()
   }
@@ -315,9 +254,9 @@ export class OvsdbClient {
     for (let i = pos; i < data.length; ++i) {
       const c = data.charAt(i)
       if (c === '{') {
-        ++depth
+        depth++
       } else if (c === '}') {
-        --depth
+        depth--
         if (depth === 0) {
           const object = JSON.parse(buffer + data.substr(0, i + 1))
           objects.push(object)
@@ -337,7 +276,11 @@ export class OvsdbClient {
 
   async _getBridgeUuidForNetwork(networkUuid, networkName, socket) {
     const where = [
-      ['external_ids', 'includes', toMap({ 'xs-network-uuids': networkUuid })],
+      [
+        'external_ids',
+        'includes',
+        ['map', [['xs-network-uuids', networkUuid]]],
+      ],
     ]
     const selectResult = await this._select(
       'Bridge',
@@ -345,12 +288,12 @@ export class OvsdbClient {
       where,
       socket
     )
-    if (selectResult === undefined) {
+    if (selectResult == null) {
       log.error('No bridge found for network', {
         network: networkName,
-        host: this.host.name_label,
+        host: this._host.name_label,
       })
-      return []
+      return [null, null]
     }
 
     const bridgeUuid = selectResult._uuid[1]
@@ -366,14 +309,14 @@ export class OvsdbClient {
     socket
   ) {
     const ports = await this._getBridgePorts(bridgeUuid, bridgeName, socket)
-    if (ports === undefined) {
-      return false
+    if (ports == null) {
+      return
     }
 
     for (const port of ports) {
       const portUuid = port[1]
       const interfaces = await this._getPortInterfaces(portUuid, socket)
-      if (interfaces === undefined) {
+      if (interfaces == null) {
         continue
       }
 
@@ -384,7 +327,7 @@ export class OvsdbClient {
           remoteAddress,
           socket
         )
-        if (hasRemote) {
+        if (hasRemote === true) {
           return true
         }
       }
@@ -396,8 +339,8 @@ export class OvsdbClient {
   async _getBridgePorts(bridgeUuid, bridgeName, socket) {
     const where = [['_uuid', '==', ['uuid', bridgeUuid]]]
     const selectResult = await this._select('Bridge', ['ports'], where, socket)
-    if (selectResult === undefined) {
-      return
+    if (selectResult == null) {
+      return null
     }
 
     return selectResult.ports[0] === 'set'
@@ -413,8 +356,8 @@ export class OvsdbClient {
       where,
       socket
     )
-    if (selectResult === undefined) {
-      return
+    if (selectResult == null) {
+      return null
     }
 
     return selectResult.interfaces[0] === 'set'
@@ -430,7 +373,7 @@ export class OvsdbClient {
       where,
       socket
     )
-    if (selectResult === undefined) {
+    if (selectResult == null) {
       return false
     }
 
@@ -455,20 +398,20 @@ export class OvsdbClient {
 
     const params = ['Open_vSwitch', selectOperation]
     const jsonObjects = await this._sendOvsdbTransaction(params, socket)
-    if (jsonObjects === undefined) {
+    if (jsonObjects == null) {
       return
     }
     const jsonResult = jsonObjects[0].result[0]
-    if (jsonResult.error !== undefined) {
+    if (jsonResult.error != null) {
       log.error('Error while selecting columns', {
         error: jsonResult.error,
         details: jsonResult.details,
         columns,
         table,
         where,
-        host: this.host.name_label,
+        host: this._host.name_label,
       })
-      return
+      return null
     }
 
     if (jsonResult.rows.length === 0) {
@@ -476,15 +419,15 @@ export class OvsdbClient {
         columns,
         table,
         where,
-        host: this.host.name_label,
+        host: this._host.name_label,
       })
-      return
+      return null
     }
 
     // For now all select operations should return only 1 row
     assert(
       jsonResult.rows.length === 1,
-      `[${this.host.name_label}] There should be exactly 1 row when searching: '${columns}' in: '${table}' where: '${where}'`
+      `[${this._host.name_label}] There should exactly 1 row when searching: '${columns}' in: '${table}' where: '${where}'`
     )
 
     return jsonResult.rows[0]
@@ -492,7 +435,9 @@ export class OvsdbClient {
 
   async _sendOvsdbTransaction(params, socket) {
     const stream = socket
-    const requestId = ++this._requestId
+
+    const requestId = this._requestID
+    ++this._requestID
     const req = {
       id: requestId,
       method: 'transact',
@@ -504,9 +449,9 @@ export class OvsdbClient {
     } catch (error) {
       log.error('Error while writing into stream', {
         error,
-        host: this.host.name_label,
+        host: this._host.name_label,
       })
-      return
+      return null
     }
 
     let result
@@ -518,9 +463,9 @@ export class OvsdbClient {
       } catch (error) {
         log.error('Error while waiting for stream data', {
           error,
-          host: this.host.name_label,
+          host: this._host.name_label,
         })
-        return
+        return null
       }
 
       jsonObjects = this._parseJson(result)
@@ -537,7 +482,7 @@ export class OvsdbClient {
       ca: this._caCert,
       key: this._clientKey,
       cert: this._clientCert,
-      host: this.host.address,
+      host: this._host.address,
       port: OVSDB_PORT,
       rejectUnauthorized: false,
       requestCert: false,
@@ -550,7 +495,7 @@ export class OvsdbClient {
       log.error('TLS connection failed', {
         error,
         code: error.code,
-        host: this.host.name_label,
+        host: this._host.name_label,
       })
       throw error
     }
@@ -559,7 +504,7 @@ export class OvsdbClient {
       log.error('Socket error', {
         error,
         code: error.code,
-        host: this.host.name_label,
+        host: this._host.name_label,
       })
     })
 

packages/xo-server-test/README.md

@@ -2,8 +2,6 @@
 
 > Test client for Xo-Server
 
-Tests are ran sequentially to avoid concurrency issues.
-
 ## Adding a test
 
 ### Organization
@@ -15,20 +13,15 @@ src
 |   |     └─ index.spec.js.snap
 |   └─ index.spec.js
 ├─ job
-|   └─ index.spec.js
-├─ issues
 ¦   └─ index.spec.js
 ¦
+¦
 ├─ _xoConnection.js
 └─ util.js
 ```
 
-The tests can describe:
-
-  - XO methods or scenarios:
-
-`src/user/index.js`
-```js
+The tests can describe xo methods or scenarios:
+```javascript
 import xo from "../_xoConnection";
 
 describe("user", () => {
@@ -51,16 +44,6 @@ describe("user", () => {
   });
 
 });
-```
-  - issues
-
-`src/issues/index.js`
-```js
- describe("issue", () => {
-  test("5454", () => {
-    /* some tests */
-  })
-})
 ```
 
 ### Best practices
@@ -137,13 +120,6 @@ describe("user", () => {
 
 - You can run only tests related to changed files, and review the failed output by using: `> yarn test --watch`
 
-- ⚠ Warning: snapshots ⚠  
-After each run of the tests, check that snapshots are not inadvertently modified.
-
-- ⚠ Jest known issue ⚠  
-If a test timeout is triggered the next async tests can fail, it's due to an inadvertently modified snapshots.
-As a workaround, you can clean your git working tree and re-run jest using a large timeout: `> yarn test --testTimeout=100000`
-
 ## Contributions
 
 Contributions are *very* welcomed, either on the documentation or on

packages/xo-server-test/package.json

@@ -36,7 +36,6 @@
     "golike-defer": "^0.4.1",
     "jest": "^24.8.0",
     "lodash": "^4.17.11",
-    "promise-toolbox": "^0.13.0",
     "xo-collection": "^0.4.1",
     "xo-common": "^0.2.0",
     "xo-lib": "^0.9.0"
@@ -50,7 +49,6 @@
       "<rootDir>/src/old-tests"
     ],
     "testEnvironment": "node",
-    "testRegex": "\\.spec\\.js$",
-    "maxConcurrency": 1
+    "testRegex": "\\.spec\\.js$"
   }
 }

packages/xo-server-test/sample.config.toml

@@ -3,27 +3,16 @@
   email = ''
   password = ''
 
-[pools]
-  default = ''
-
-[servers]
-  [servers.default]
-    username = ''
-    password = ''
-    host = ''
-
 [vms]
   default = ''
-  # vmToBackup = ''
 
 [templates]
   default = ''
-  templateWithoutDisks = ''
 
 [srs]
   default = ''
 
-[remotes]
-  default = { name = '', url = '' }
-  remote1 = { name = '', url = '' }
-  # remote2 = { name = '', url = '' }
+# resources created before all tests and deleted at the end.
+[preCreatedResources]
+  [preCreatedResources.remotes]
+    default = { name = '', url = '' }

packages/xo-server-test/src/_defaultValues.js

@@ -1,6 +0,0 @@
-export const getDefaultName = () => `xo-server-test ${new Date().toISOString()}`
-
-export const getDefaultSchedule = () => ({
-  name: getDefaultName(),
-  cron: '0 * * * * *',
-})

packages/xo-server-test/src/_xoConnection.js

@@ -2,11 +2,21 @@
 import defer from 'golike-defer'
 import Xo from 'xo-lib'
 import XoCollection from 'xo-collection'
-import { defaultsDeep, find, forOwn, pick } from 'lodash'
-import { fromEvent } from 'promise-toolbox'
+import { find, forOwn } from 'lodash'
 
 import config from './_config'
-import { getDefaultName } from './_defaultValues'
+
+const ARGS_BY_TYPE = {
+  remotes: {
+    getCreationArgs: conf => ['remote.create', conf],
+    getDeletionArgs: res => ['remote.delete', { id: res.id }],
+  },
+}
+
+const getDefaultCredentials = () => {
+  const { email, password } = config.xoConnection
+  return { email, password }
+}
 
 class XoConnection extends Xo {
   constructor(opts) {
@@ -68,10 +78,7 @@ class XoConnection extends Xo {
   }
 
   @defer
-  async connect(
-    $defer,
-    credentials = pick(config.xoConnection, 'email', 'password')
-  ) {
+  async connect($defer, credentials = getDefaultCredentials()) {
     await this.open()
     $defer.onFailure(() => this.close())
 
@@ -86,7 +93,7 @@ class XoConnection extends Xo {
     while (true) {
       try {
         await predicate(obj)
-        return obj
+        return
       } catch (_) {}
       // If failed, wait for next object state/update and retry.
       obj = await this.waitObject(id)
@@ -110,132 +117,48 @@ class XoConnection extends Xo {
   }
 
   async createTempBackupNgJob(params) {
-    // mutate and inject default values
-    defaultsDeep(params, {
-      mode: 'full',
-      name: getDefaultName(),
-      settings: {
-        '': {
-          // it must be enabled because the XAPI might be not able to coalesce VDIs
-          // as fast as the tests run
-          //
-          // see https://xen-orchestra.com/docs/backup_troubleshooting.html#vdi-chain-protection
-          bypassVdiChainsCheck: true,
-
-          // it must be 'never' to avoid race conditions with the plugin `backup-reports`
-          reportWhen: 'never',
-        },
-      },
-    })
-    const id = await this.call('backupNg.createJob', params)
-    this._tempResourceDisposers.push('backupNg.deleteJob', { id })
-    return this.call('backupNg.getJob', { id })
-  }
-
-  async createTempNetwork(params) {
-    const id = await this.call('network.create', {
-      name: 'XO Test',
-      pool: config.pools.default,
-      ...params,
-    })
-    this._tempResourceDisposers.push('network.delete', { id })
-    return this.getOrWaitObject(id)
+    const job = await this.call('backupNg.createJob', params)
+    this._tempResourceDisposers.push('backupNg.deleteJob', { id: job.id })
+    return job
   }
 
   async createTempVm(params) {
-    const id = await this.call('vm.create', {
-      name_label: getDefaultName(),
-      template: config.templates.templateWithoutDisks,
-      ...params,
-    })
+    const id = await this.call('vm.create', params)
     this._tempResourceDisposers.push('vm.delete', { id })
-    return this.waitObjectState(id, vm => {
+    await this.waitObjectState(id, vm => {
       if (vm.type !== 'VM') throw new Error('retry')
     })
+    return id
   }
 
-  async createTempRemote(params) {
-    const remote = await this.call('remote.create', params)
-    this._tempResourceDisposers.push('remote.delete', { id: remote.id })
-    return remote
-  }
-
-  async createTempServer(params) {
-    const servers = await this.call('server.getAll')
-    const server = servers.find(server => server.host === params.host)
-    if (server !== undefined) {
-      if (server.status === 'disconnected') {
-        await this.call('server.enable', { id: server.id })
-        this._durableResourceDisposers.push('server.disable', { id: server.id })
-        await fromEvent(this._objects, 'finish')
+  async createRequiredResources() {
+    const requiredResources = {}
+    const resourcesToCreate = config.preCreatedResources
+    for (const typeOfResources in resourcesToCreate) {
+      const { getCreationArgs, getDeletionArgs } = ARGS_BY_TYPE[typeOfResources]
+      const resources = resourcesToCreate[typeOfResources]
+      for (const resource in resources) {
+        const result = await this.call(...getCreationArgs(resources[resource]))
+        this._durableResourceDisposers.push(...getDeletionArgs(result))
+        requiredResources[typeOfResources] = {
+          ...requiredResources[typeOfResources],
+          [resource]: result,
+        }
       }
-      return
     }
-
-    const id = await this.call('server.add', {
-      ...params,
-      allowUnauthorized: true,
-      autoConnect: false,
-    })
-    this._durableResourceDisposers.push('server.remove', { id })
-    await this.call('server.enable', { id })
-    await fromEvent(this._objects, 'finish')
+    return requiredResources
   }
 
   async getSchedule(predicate) {
     return find(await this.call('schedule.getAll'), predicate)
   }
 
-  async runBackupJob(jobId, scheduleId, { remotes, nExecutions = 1 }) {
-    for (let i = 0; i < nExecutions; i++) {
-      await xo.call('backupNg.runJob', { id: jobId, schedule: scheduleId })
-    }
-    const backups = {}
-    if (remotes !== undefined) {
-      const backupsByRemote = await xo.call('backupNg.listVmBackups', {
-        remotes,
-      })
-      forOwn(backupsByRemote, (backupsByVm, remoteId) => {
-        backups[remoteId] = []
-        forOwn(backupsByVm, vmBackups => {
-          vmBackups.forEach(
-            ({ jobId: backupJobId, scheduleId: backupScheduleId, id }) => {
-              if (jobId === backupJobId && scheduleId === backupScheduleId) {
-                this._tempResourceDisposers.push('backupNg.deleteVmBackup', {
-                  id,
-                })
-                backups[remoteId].push(id)
-              }
-            }
-          )
-        })
-      })
-    }
-
-    forOwn(this.objects.all, (obj, id) => {
-      if (
-        obj.other !== undefined &&
-        obj.other['xo:backup:job'] === jobId &&
-        obj.other['xo:backup:schedule'] === scheduleId
-      ) {
-        this._tempResourceDisposers.push('vm.delete', {
-          id,
-        })
-      }
-    })
-    return backups
-  }
-
-  getBackupLogs(filter) {
-    return this.call('backupNg.getLogs', { _forceRefresh: true, ...filter })
-  }
-
   async _cleanDisposers(disposers) {
     for (let n = disposers.length - 1; n > 0; ) {
       const params = disposers[n--]
       const method = disposers[n--]
       await this.call(method, params).catch(error => {
-        console.warn('deleteTempResources', method, params, error)
+        console.warn('_cleanDisposers', method, params, error)
       })
     }
     disposers.length = 0
@@ -256,9 +179,10 @@ const getConnection = credentials => {
 }
 
 let xo
+let resources
 beforeAll(async () => {
-  // TOFIX: stop tests if the connection is not established properly and show the error
   xo = await getConnection()
+  resources = await xo.createRequiredResources()
 })
 afterAll(async () => {
   await xo.deleteDurableResources()
@@ -267,7 +191,7 @@ afterAll(async () => {
 })
 afterEach(() => xo.deleteTempResources())
 
-export { xo as default }
+export { xo as default, resources }
 
 export const testConnection = ({ credentials }) =>
   getConnection(credentials).then(connection => connection.close())

packages/xo-server-test/src/backupNg/__snapshots__/backupNg.spec.js.snap

@@ -1,6 +1,61 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`backupNg .createJob() : creates a new backup job with schedules 1`] = `
+Object {
+  "id": Any<String>,
+  "mode": "full",
+  "name": "default-backupNg",
+  "settings": Any<Object>,
+  "type": "backup",
+  "userId": Any<String>,
+  "vms": Any<Object>,
+}
+`;
+
+exports[`backupNg .createJob() : creates a new backup job with schedules 2`] = `
+Object {
+  "cron": "0 * * * * *",
+  "enabled": false,
+  "id": Any<String>,
+  "jobId": Any<String>,
+  "name": "scheduleTest",
+}
+`;
+
+exports[`backupNg .createJob() : creates a new backup job without schedules 1`] = `
+Object {
+  "id": Any<String>,
+  "mode": "full",
+  "name": "default-backupNg",
+  "settings": Object {
+    "": Object {
+      "reportWhen": "never",
+    },
+  },
+  "type": "backup",
+  "userId": Any<String>,
+  "vms": Any<Object>,
+}
+`;
+
 exports[`backupNg .runJob() : fails trying to run a backup job with a VM without disks 1`] = `
+Object {
+  "data": Object {
+    "mode": "full",
+    "reportWhen": "never",
+  },
+  "end": Any<Number>,
+  "id": Any<String>,
+  "jobId": Any<String>,
+  "jobName": "default-backupNg",
+  "message": "backup",
+  "scheduleId": Any<String>,
+  "start": Any<Number>,
+  "status": "skipped",
+}
+`;
+
+exports[`backupNg .runJob() : fails trying to run a backup job with a VM without disks 2`] = `
 Object {
   "data": Object {
     "id": Any<String>,
@@ -37,6 +92,23 @@ Array [
 exports[`backupNg .runJob() : fails trying to run a backup job without schedule 1`] = `[JsonRpcError: invalid parameters]`;
 
 exports[`backupNg .runJob() : fails trying to run backup job without retentions 1`] = `
+Object {
+  "data": Object {
+    "mode": "full",
+    "reportWhen": "never",
+  },
+  "end": Any<Number>,
+  "id": Any<String>,
+  "jobId": Any<String>,
+  "jobName": "default-backupNg",
+  "message": "backup",
+  "scheduleId": Any<String>,
+  "start": Any<Number>,
+  "status": "failure",
+}
+`;
+
+exports[`backupNg .runJob() : fails trying to run backup job without retentions 2`] = `
 Object {
   "data": Object {
     "id": Any<String>,
@@ -55,339 +127,35 @@ Object {
 }
 `;
 
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 1`] = `
-Object {
-  "data": Object {
-    "id": Any<String>,
-    "type": "VM",
-  },
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 2`] = `
-Object {
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": "snapshot",
-  "result": Any<String>,
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 3`] = `
-Object {
-  "data": Object {
-    "id": Any<String>,
-    "isFull": true,
-    "type": "remote",
-  },
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 4`] = `
-Object {
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "result": Object {
-    "size": Any<Number>,
-  },
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 5`] = `
-Object {
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "result": Object {
-    "size": Any<Number>,
-  },
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 6`] = `
-Object {
-  "data": Object {
-    "id": Any<String>,
-    "isFull": true,
-    "type": "remote",
-  },
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 7`] = `
-Object {
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "result": Object {
-    "size": Any<Number>,
-  },
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 8`] = `
-Object {
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "result": Object {
-    "size": Any<Number>,
-  },
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 9`] = `
-Object {
-  "data": Object {
-    "id": Any<String>,
-    "type": "VM",
-  },
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 10`] = `
-Object {
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": "snapshot",
-  "result": Any<String>,
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 11`] = `
-Object {
-  "data": Object {
-    "id": Any<String>,
-    "isFull": false,
-    "type": "remote",
-  },
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 12`] = `
-Object {
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "result": Object {
-    "size": Any<Number>,
-  },
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 13`] = `
-Object {
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "result": Object {
-    "size": Any<Number>,
-  },
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 14`] = `
-Object {
-  "data": Object {
-    "id": Any<String>,
-    "isFull": false,
-    "type": "remote",
-  },
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 15`] = `
-Object {
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "result": Object {
-    "size": Any<Number>,
-  },
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 16`] = `
-Object {
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "result": Object {
-    "size": Any<Number>,
-  },
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 17`] = `
-Object {
-  "data": Object {
-    "id": Any<String>,
-    "type": "VM",
-  },
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 18`] = `
-Object {
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": "snapshot",
-  "result": Any<String>,
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 19`] = `
-Object {
-  "data": Object {
-    "id": Any<String>,
-    "isFull": true,
-    "type": "remote",
-  },
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 20`] = `
-Object {
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "result": Object {
-    "size": Any<Number>,
-  },
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 21`] = `
-Object {
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "result": Object {
-    "size": Any<Number>,
-  },
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 22`] = `
-Object {
-  "data": Object {
-    "id": Any<String>,
-    "isFull": true,
-    "type": "remote",
-  },
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 23`] = `
-Object {
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "result": Object {
-    "size": Any<Number>,
-  },
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
-exports[`backupNg execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval 24`] = `
-Object {
-  "end": Any<Number>,
-  "id": Any<String>,
-  "message": Any<String>,
-  "result": Object {
-    "size": Any<Number>,
-  },
-  "start": Any<Number>,
-  "status": "success",
-}
-`;
-
 exports[`backupNg execute three times a rolling snapshot with 2 as retention & revert to an old state 1`] = `
 Object {
+  "data": Object {
+    "mode": "full",
+    "reportWhen": "never",
+  },
   "end": Any<Number>,
   "id": Any<String>,
-  "message": "snapshot",
-  "result": Any<String>,
+  "jobId": Any<String>,
+  "jobName": "default-backupNg",
+  "message": "backup",
+  "scheduleId": Any<String>,
   "start": Any<Number>,
   "status": "success",
 }
 `;
 
 exports[`backupNg execute three times a rolling snapshot with 2 as retention & revert to an old state 2`] = `
+Object {
+  "end": Any<Number>,
+  "id": Any<String>,
+  "message": "snapshot",
+  "result": Any<String>,
+  "start": Any<Number>,
+  "status": "success",
+}
+`;
+
+exports[`backupNg execute three times a rolling snapshot with 2 as retention & revert to an old state 3`] = `
 Object {
   "data": Object {
     "id": Any<String>,

packages/xo-server-test/src/backupNg/backupNg.spec.js

@@ -1,144 +1,94 @@
 /* eslint-env jest */
 
-import { forOwn } from 'lodash'
 import { noSuchObject } from 'xo-common/api-errors'
 
 import config from '../_config'
 import randomId from '../_randomId'
-import xo from '../_xoConnection'
-import { getDefaultName, getDefaultSchedule } from '../_defaultValues'
+import xo, { resources } from '../_xoConnection'
 
-const validateBackupJob = (jobInput, jobOutput, createdSchedule) => {
-  const expectedObj = {
-    id: expect.any(String),
-    mode: jobInput.mode,
-    name: jobInput.name,
-    type: 'backup',
-    settings: {
-      '': jobInput.settings[''],
-    },
-    userId: xo._user.id,
-    vms: jobInput.vms,
-  }
-
-  const schedules = jobInput.schedules
-  if (schedules !== undefined) {
-    const scheduleTmpId = Object.keys(schedules)[0]
-    expect(createdSchedule).toEqual({
-      ...schedules[scheduleTmpId],
-      enabled: false,
-      id: expect.any(String),
-      jobId: jobOutput.id,
-    })
-
-    expectedObj.settings[createdSchedule.id] = jobInput.settings[scheduleTmpId]
-  }
-
-  expect(jobOutput).toEqual(expectedObj)
-}
-
-const validateRootTask = (log, expected) =>
-  expect(log).toEqual({
-    end: expect.any(Number),
-    id: expect.any(String),
-    message: 'backup',
-    start: expect.any(Number),
-    ...expected,
-  })
-
-const validateVmTask = (task, vmId, props) => {
-  expect(task).toMatchSnapshot({
-    data: {
-      id: expect.any(String),
-    },
-    end: expect.any(Number),
-    id: expect.any(String),
-    message: expect.any(String),
-    start: expect.any(Number),
-    ...props,
-  })
-  expect(task.data.id).toBe(vmId)
-}
-
-const validateSnapshotTask = (task, props) =>
-  expect(task).toMatchSnapshot({
-    end: expect.any(Number),
-    id: expect.any(String),
-    result: expect.any(String),
-    start: expect.any(Number),
-    ...props,
-  })
-
-const validateExportTask = (task, srOrRemoteIds, props) => {
-  expect(task).toMatchSnapshot({
-    end: expect.any(Number),
-    id: expect.any(String),
-    message: expect.any(String),
-    start: expect.any(Number),
-    ...props,
-  })
-  expect(srOrRemoteIds).toContain(task.data.id)
-}
-
-const validateOperationTask = (task, props) => {
-  expect(task).toMatchSnapshot({
-    end: expect.any(Number),
-    id: expect.any(String),
-    message: expect.any(String),
-    start: expect.any(Number),
-    ...props,
-  })
+const DEFAULT_SCHEDULE = {
+  name: 'scheduleTest',
+  cron: '0 * * * * *',
 }
 
 describe('backupNg', () => {
+  let defaultBackupNg
+
+  beforeAll(() => {
+    defaultBackupNg = {
+      name: 'default-backupNg',
+      mode: 'full',
+      vms: {
+        id: config.vms.default,
+      },
+      settings: {
+        '': {
+          reportWhen: 'never',
+        },
+      },
+    }
+  })
+
   describe('.createJob() :', () => {
     it('creates a new backup job without schedules', async () => {
-      const jobInput = {
-        mode: 'full',
-        vms: {
-          id: config.vms.default,
-        },
-      }
-      const jobOutput = await xo.createTempBackupNgJob(jobInput)
-      validateBackupJob(jobInput, jobOutput)
+      const backupNg = await xo.createTempBackupNgJob(defaultBackupNg)
+      expect(backupNg).toMatchSnapshot({
+        id: expect.any(String),
+        userId: expect.any(String),
+        vms: expect.any(Object),
+      })
+      expect(backupNg.vms).toEqual(defaultBackupNg.vms)
+      expect(backupNg.userId).toBe(xo._user.id)
     })
 
     it('creates a new backup job with schedules', async () => {
       const scheduleTempId = randomId()
-      const jobInput = {
-        mode: 'full',
+      const { id: jobId } = await xo.createTempBackupNgJob({
+        ...defaultBackupNg,
         schedules: {
-          [scheduleTempId]: getDefaultSchedule(),
+          [scheduleTempId]: DEFAULT_SCHEDULE,
         },
         settings: {
+          ...defaultBackupNg.settings,
           [scheduleTempId]: { snapshotRetention: 1 },
         },
-        vms: {
-          id: config.vms.default,
-        },
-      }
-      const jobOutput = await xo.createTempBackupNgJob(jobInput)
-      validateBackupJob(
-        jobInput,
-        jobOutput,
-        await xo.getSchedule({ jobId: jobOutput.id })
-      )
+      })
+
+      const backupNgJob = await xo.call('backupNg.getJob', { id: jobId })
+
+      expect(backupNgJob).toMatchSnapshot({
+        id: expect.any(String),
+        userId: expect.any(String),
+        settings: expect.any(Object),
+        vms: expect.any(Object),
+      })
+      expect(backupNgJob.vms).toEqual(defaultBackupNg.vms)
+      expect(backupNgJob.userId).toBe(xo._user.id)
+
+      expect(Object.keys(backupNgJob.settings).length).toBe(2)
+      const schedule = await xo.getSchedule({ jobId })
+      expect(typeof schedule).toBe('object')
+      expect(backupNgJob.settings[schedule.id]).toEqual({
+        snapshotRetention: 1,
+      })
+
+      expect(schedule).toMatchSnapshot({
+        id: expect.any(String),
+        jobId: expect.any(String),
+      })
     })
   })
 
   describe('.delete() :', () => {
     it('deletes a backup job', async () => {
       const scheduleTempId = randomId()
-      const jobId = await xo.call('backupNg.createJob', {
-        mode: 'full',
-        name: getDefaultName(),
-        vms: {
-          id: config.vms.default,
-        },
+      const { id: jobId } = await xo.call('backupNg.createJob', {
+        ...defaultBackupNg,
         schedules: {
-          [scheduleTempId]: getDefaultSchedule(),
+          [scheduleTempId]: DEFAULT_SCHEDULE,
         },
         settings: {
+          ...defaultBackupNg.settings,
           [scheduleTempId]: { snapshotRetention: 1 },
         },
       })
@@ -164,19 +114,16 @@ describe('backupNg', () => {
 
   describe('.runJob() :', () => {
     it('fails trying to run a backup job without schedule', async () => {
-      const { id } = await xo.createTempBackupNgJob({
-        vms: {
-          id: config.vms.default,
-        },
-      })
+      const { id } = await xo.createTempBackupNgJob(defaultBackupNg)
       await expect(xo.call('backupNg.runJob', { id })).rejects.toMatchSnapshot()
     })
 
     it('fails trying to run a backup job with no matching VMs', async () => {
       const scheduleTempId = randomId()
       const { id: jobId } = await xo.createTempBackupNgJob({
+        ...defaultBackupNg,
         schedules: {
-          [scheduleTempId]: getDefaultSchedule(),
+          [scheduleTempId]: DEFAULT_SCHEDULE,
         },
         settings: {
           [scheduleTempId]: { snapshotRetention: 1 },
@@ -196,11 +143,11 @@ describe('backupNg', () => {
     })
 
     it('fails trying to run a backup job with non-existent vm', async () => {
-      jest.setTimeout(7e3)
       const scheduleTempId = randomId()
       const { id: jobId } = await xo.createTempBackupNgJob({
+        ...defaultBackupNg,
         schedules: {
-          [scheduleTempId]: getDefaultSchedule(),
+          [scheduleTempId]: DEFAULT_SCHEDULE,
         },
         settings: {
           [scheduleTempId]: { snapshotRetention: 1 },
@@ -214,33 +161,33 @@ describe('backupNg', () => {
       expect(typeof schedule).toBe('object')
 
       await xo.call('backupNg.runJob', { id: jobId, schedule: schedule.id })
-      const [log] = await xo.getBackupLogs({
+      const [log] = await xo.call('backupNg.getLogs', {
         scheduleId: schedule.id,
       })
       expect(log.warnings).toMatchSnapshot()
     })
 
     it('fails trying to run a backup job with a VM without disks', async () => {
-      jest.setTimeout(8e3)
-      await xo.createTempServer(config.servers.default)
-      const { id: vmIdWithoutDisks } = await xo.createTempVm({
+      const vmIdWithoutDisks = await xo.createTempVm({
+        name_label: 'XO Test Without Disks',
         name_description: 'Creating a vm without disks',
-        template: config.templates.templateWithoutDisks,
+        template: config.templates.default,
       })
 
       const scheduleTempId = randomId()
-      const jobInput = {
+      const { id: jobId } = await xo.createTempBackupNgJob({
+        ...defaultBackupNg,
         schedules: {
-          [scheduleTempId]: getDefaultSchedule(),
+          [scheduleTempId]: DEFAULT_SCHEDULE,
         },
         settings: {
+          ...defaultBackupNg.settings,
           [scheduleTempId]: { snapshotRetention: 1 },
         },
         vms: {
           id: vmIdWithoutDisks,
         },
-      }
-      const { id: jobId } = await xo.createTempBackupNgJob(jobInput)
+      })
 
       const schedule = await xo.getSchedule({ jobId })
       expect(typeof schedule).toBe('object')
@@ -251,20 +198,16 @@ describe('backupNg', () => {
           tasks: [vmTask],
           ...log
         },
-      ] = await xo.getBackupLogs({
+      ] = await xo.call('backupNg.getLogs', {
         jobId,
         scheduleId: schedule.id,
       })
-
-      validateRootTask(log, {
-        data: {
-          mode: jobInput.mode,
-          reportWhen: jobInput.settings[''].reportWhen,
-        },
-        jobId,
-        jobName: jobInput.name,
-        scheduleId: schedule.id,
-        status: 'skipped',
+      expect(log).toMatchSnapshot({
+        end: expect.any(Number),
+        id: expect.any(String),
+        jobId: expect.any(String),
+        scheduleId: expect.any(String),
+        start: expect.any(Number),
       })
 
       expect(vmTask).toMatchSnapshot({
@@ -284,28 +227,23 @@ describe('backupNg', () => {
     })
 
     it('fails trying to run backup job without retentions', async () => {
-      jest.setTimeout(7e3)
       const scheduleTempId = randomId()
-      await xo.createTempServer(config.servers.default)
-      const { id: remoteId } = await xo.createTempRemote(config.remotes.default)
-      const jobInput = {
+      const { id: jobId } = await xo.createTempBackupNgJob({
+        ...defaultBackupNg,
         remotes: {
-          id: remoteId,
+          id: resources.remotes.default.id,
         },
         schedules: {
-          [scheduleTempId]: getDefaultSchedule(),
+          [scheduleTempId]: DEFAULT_SCHEDULE,
         },
         settings: {
+          ...defaultBackupNg.settings,
           [scheduleTempId]: {},
         },
         srs: {
           id: config.srs.default,
         },
-        vms: {
-          id: config.vms.default,
-        },
-      }
-      const { id: jobId } = await xo.createTempBackupNgJob(jobInput)
+      })
 
       const schedule = await xo.getSchedule({ jobId })
       expect(typeof schedule).toBe('object')
@@ -316,20 +254,17 @@ describe('backupNg', () => {
           tasks: [task],
           ...log
         },
-      ] = await xo.getBackupLogs({
+      ] = await xo.call('backupNg.getLogs', {
         jobId,
         scheduleId: schedule.id,
       })
 
-      validateRootTask(log, {
-        data: {
-          mode: jobInput.mode,
-          reportWhen: jobInput.settings[''].reportWhen,
-        },
-        jobId,
-        jobName: jobInput.name,
-        scheduleId: schedule.id,
-        status: 'failure',
+      expect(log).toMatchSnapshot({
+        end: expect.any(Number),
+        id: expect.any(String),
+        jobId: expect.any(String),
+        scheduleId: expect.any(String),
+        start: expect.any(Number),
       })
 
       expect(task).toMatchSnapshot({
@@ -349,9 +284,9 @@ describe('backupNg', () => {
   })
 
   test('execute three times a rolling snapshot with 2 as retention & revert to an old state', async () => {
-    jest.setTimeout(6e4)
-    await xo.createTempServer(config.servers.default)
-    let vm = await xo.createTempVm({
+    jest.setTimeout(7e4)
+    const vmId = await xo.createTempVm({
+      name_label: 'XO Test Temp',
       name_description: 'Creating a temporary vm',
       template: config.templates.default,
       VDIs: [
@@ -364,45 +299,48 @@ describe('backupNg', () => {
     })
 
     const scheduleTempId = randomId()
-    const jobInput = {
+    const { id: jobId } = await xo.createTempBackupNgJob({
+      ...defaultBackupNg,
       vms: {
-        id: vm.id,
+        id: vmId,
       },
       schedules: {
-        [scheduleTempId]: getDefaultSchedule(),
+        [scheduleTempId]: DEFAULT_SCHEDULE,
       },
       settings: {
+        ...defaultBackupNg.settings,
         [scheduleTempId]: { snapshotRetention: 2 },
       },
-    }
-    const { id: jobId } = await xo.createTempBackupNgJob(jobInput)
+    })
 
     const schedule = await xo.getSchedule({ jobId })
     expect(typeof schedule).toBe('object')
-
     for (let i = 0; i < 3; i++) {
+      const oldSnapshots = xo.objects.all[vmId].snapshots
       await xo.call('backupNg.runJob', { id: jobId, schedule: schedule.id })
-      vm = await xo.waitObjectState(vm.id, ({ snapshots }) => {
+      await xo.waitObjectState(vmId, ({ snapshots }) => {
         // Test on updating snapshots.
-        expect(snapshots).not.toEqual(vm.snapshots)
+        expect(snapshots).not.toEqual(oldSnapshots)
       })
     }
 
+    const { snapshots, videoram: oldVideoram } = xo.objects.all[vmId]
+
     // Test on the retention, how many snapshots should be saved.
-    expect(vm.snapshots.length).toBe(2)
+    expect(snapshots.length).toBe(2)
 
     const newVideoram = 16
-    await xo.call('vm.set', { id: vm.id, videoram: newVideoram })
-    await xo.waitObjectState(vm.id, ({ videoram }) => {
+    await xo.call('vm.set', { id: vmId, videoram: newVideoram })
+    await xo.waitObjectState(vmId, ({ videoram }) => {
       expect(videoram).toBe(newVideoram.toString())
     })
 
     await xo.call('vm.revert', {
-      snapshot: vm.snapshots[0],
+      snapshot: snapshots[0],
     })
 
-    await xo.waitObjectState(vm.id, ({ videoram }) => {
-      expect(videoram).toBe(vm.videoram)
+    await xo.waitObjectState(vmId, ({ videoram }) => {
+      expect(videoram).toBe(oldVideoram)
     })
 
     const [
@@ -410,20 +348,17 @@ describe('backupNg', () => {
         tasks: [{ tasks: subTasks, ...vmTask }],
         ...log
       },
-    ] = await xo.getBackupLogs({
+    ] = await xo.call('backupNg.getLogs', {
       jobId,
       scheduleId: schedule.id,
     })
 
-    validateRootTask(log, {
-      data: {
-        mode: jobInput.mode,
-        reportWhen: jobInput.settings[''].reportWhen,
-      },
-      jobId,
-      jobName: jobInput.name,
-      scheduleId: schedule.id,
-      status: 'success',
+    expect(log).toMatchSnapshot({
+      end: expect.any(Number),
+      id: expect.any(String),
+      jobId: expect.any(String),
+      scheduleId: expect.any(String),
+      start: expect.any(Number),
     })
 
     const subTaskSnapshot = subTasks.find(
@@ -445,143 +380,6 @@ describe('backupNg', () => {
       message: expect.any(String),
       start: expect.any(Number),
     })
-    expect(vmTask.data.id).toBe(vm.id)
-  })
-
-  test('execute three times a delta backup with 2 remotes, 2 as retention and 2 as fullInterval', async () => {
-    jest.setTimeout(12e5)
-    const {
-      vms: { default: defaultVm, vmToBackup = defaultVm },
-      remotes: { default: defaultRemote, remote1, remote2 = defaultRemote },
-      servers: { default: defaultServer },
-    } = config
-
-    expect(vmToBackup).not.toBe(undefined)
-    expect(remote1).not.toBe(undefined)
-    expect(remote2).not.toBe(undefined)
-
-    await xo.createTempServer(defaultServer)
-    const { id: remoteId1 } = await xo.createTempRemote(remote1)
-    const { id: remoteId2 } = await xo.createTempRemote(remote2)
-    const remotes = [remoteId1, remoteId2]
-
-    const exportRetention = 2
-    const fullInterval = 2
-    const scheduleTempId = randomId()
-    const jobInput = {
-      mode: 'delta',
-      remotes: {
-        id: {
-          __or: remotes,
-        },
-      },
-      schedules: {
-        [scheduleTempId]: getDefaultSchedule(),
-      },
-      settings: {
-        '': {
-          fullInterval,
-        },
-        [remoteId1]: { deleteFirst: true },
-        [scheduleTempId]: { exportRetention },
-      },
-      vms: {
-        id: vmToBackup,
-      },
-    }
-    const { id: jobId } = await xo.createTempBackupNgJob(jobInput)
-
-    const schedule = await xo.getSchedule({ jobId })
-    expect(typeof schedule).toBe('object')
-
-    const nExecutions = 3
-    const backupsByRemote = await xo.runBackupJob(jobId, schedule.id, {
-      remotes,
-      nExecutions,
-    })
-    forOwn(backupsByRemote, backups =>
-      expect(backups.length).toBe(exportRetention)
-    )
-
-    const backupLogs = await xo.getBackupLogs({
-      jobId,
-      scheduleId: schedule.id,
-    })
-    expect(backupLogs.length).toBe(nExecutions)
-
-    backupLogs.forEach(({ tasks = [], ...log }, key) => {
-      validateRootTask(log, {
-        data: {
-          mode: jobInput.mode,
-          reportWhen: jobInput.settings[''].reportWhen,
-        },
-        jobId,
-        jobName: jobInput.name,
-        scheduleId: schedule.id,
-        status: 'success',
-      })
-
-      const numberOfTasks = {
-        export: 0,
-        merge: 0,
-        snapshot: 0,
-        transfer: 0,
-        vm: 0,
-      }
-      tasks.forEach(({ tasks = [], ...vmTask }) => {
-        if (vmTask.data !== undefined && vmTask.data.type === 'VM') {
-          validateVmTask(vmTask, vmToBackup, { status: 'success' })
-          numberOfTasks.vm++
-          tasks.forEach(({ tasks = [], ...subTask }) => {
-            if (subTask.message === 'snapshot') {
-              validateSnapshotTask(subTask, { status: 'success' })
-              numberOfTasks.snapshot++
-            }
-            if (subTask.message === 'export') {
-              validateExportTask(subTask, remotes, {
-                data: {
-                  id: expect.any(String),
-                  isFull: key % fullInterval === 0,
-                  type: 'remote',
-                },
-                status: 'success',
-              })
-              numberOfTasks.export++
-              let mergeTaskKey, transferTaskKey
-              tasks.forEach((operationTask, key) => {
-                if (
-                  operationTask.message === 'transfer' ||
-                  operationTask.message === 'merge'
-                ) {
-                  validateOperationTask(operationTask, {
-                    result: { size: expect.any(Number) },
-                    status: 'success',
-                  })
-                  if (operationTask.message === 'transfer') {
-                    mergeTaskKey = key
-                    numberOfTasks.merge++
-                  } else {
-                    transferTaskKey = key
-                    numberOfTasks.transfer++
-                  }
-                }
-              })
-              expect(
-                subTask.data.id === remoteId1
-                  ? mergeTaskKey > transferTaskKey
-                  : mergeTaskKey < transferTaskKey
-              ).toBe(true)
-            }
-          })
-        }
-      })
-      expect(numberOfTasks).toEqual({
-        export: 2,
-        merge: 2,
-        snapshot: 1,
-        transfer: 2,
-        vm: 1,
-      })
-    })
+    expect(vmTask.data.id).toBe(vmId)
   })
 })

packages/xo-server-test/src/issues/index.spec.js

@@ -1,51 +0,0 @@
-/* eslint-env jest */
-
-import config from '../_config'
-import xo from '../_xoConnection'
-
-describe('issue', () => {
-  test('4507', async () => {
-    await xo.createTempServer(config.servers.default)
-
-    const props = {
-      coresPerSocket: 1,
-      cpuCap: 1,
-    }
-    const vm = await xo.createTempVm(props)
-    expect(vm).toMatchObject(props)
-
-    await xo.call('vm.set', {
-      coresPerSocket: null,
-      cpuCap: null,
-      id: vm.id,
-    })
-    await xo.waitObjectState(vm.id, vm => {
-      expect(vm.coresPerSocket).toBe(undefined)
-      expect(vm.cpuCap).toBe(undefined)
-    })
-  })
-
-  test('4514', async () => {
-    await xo.createTempServer(config.servers.default)
-
-    const oldName = 'Old XO Test name'
-    const { id, name_label } = await xo.createTempNetwork({ name: oldName })
-    expect(name_label).toBe(oldName)
-
-    const newName = 'New XO Test name'
-    await xo.call('network.set', { id, name_label: newName })
-    await xo.waitObjectState(id, ({ name_label }) => {
-      expect(name_label).toBe(newName)
-    })
-  })
-
-  test('4523', async () => {
-    const id = await xo.call('network.create', {
-      name: 'XO Test',
-      pool: config.pools.default,
-    })
-    expect(typeof id).toBe('string')
-
-    await xo.call('network.delete', { id })
-  })
-})

packages/xo-server-test/src/job/job.spec.js

@@ -40,7 +40,6 @@ describe('job', () => {
 
   describe('.create() :', () => {
     it('creates a new job', async () => {
-      jest.setTimeout(6e3)
       const userId = await xo.createTempUser(ADMIN_USER)
       const { email, password } = ADMIN_USER
       await testWithOtherConnection({ email, password }, async xo => {
@@ -209,8 +208,6 @@ describe('job', () => {
     })
 
     it('runs a job', async () => {
-      jest.setTimeout(7e4)
-      await xo.createTempServer(config.servers.default)
       const jobId = await xo.createTempJob(defaultJob)
       const snapshots = xo.objects.all[config.vms.default].snapshots
       await xo.call('job.runSequence', { idSequence: [jobId] })

packages/xo-server-test/src/user/user.spec.js

@@ -35,7 +35,6 @@ describe('user', () => {
         },
       },
       async data => {
-        jest.setTimeout(6e3)
         const userId = await xo.createTempUser(data)
         expect(typeof userId).toBe('string')
         expect(await xo.getUser(userId)).toMatchSnapshot({
@@ -70,7 +69,6 @@ describe('user', () => {
 
   describe('.changePassword() :', () => {
     it('changes the actual user password', async () => {
-      jest.setTimeout(7e3)
       const user = {
         email: 'wayne7@vates.fr',
         password: 'batman',
@@ -151,7 +149,6 @@ describe('user', () => {
         },
       },
       async data => {
-        jest.setTimeout(6e3)
         data.id = await xo.createTempUser(SIMPLE_USER)
         expect(await xo.call('user.set', data)).toBe(true)
         expect(await xo.getUser(data.id)).toMatchSnapshot({

packages/xo-server-transport-email/package.json

@@ -42,7 +42,7 @@
     "@babel/preset-env": "^7.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.1"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xo-server-transport-nagios/package.json

@@ -40,7 +40,7 @@
     "@babel/preset-env": "^7.0.0",
     "babel-preset-env": "^1.5.2",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.1"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xo-server-transport-slack/package.json

@@ -41,7 +41,7 @@
     "@babel/core": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.5.4"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xo-server-transport-xmpp/package.json

@@ -41,7 +41,7 @@
     "@babel/core": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.1"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xo-server-usage-report/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xo-server-usage-report",
-  "version": "0.7.3",
+  "version": "0.7.2",
   "license": "AGPL-3.0",
   "description": "",
   "keywords": [
@@ -36,8 +36,8 @@
   },
   "dependencies": {
     "@xen-orchestra/async-map": "^0.0.0",
-    "@xen-orchestra/cron": "^1.0.4",
-    "@xen-orchestra/log": "^0.2.0",
+    "@xen-orchestra/cron": "^1.0.3",
+    "@xen-orchestra/log": "^0.1.4",
     "handlebars": "^4.0.6",
     "html-minifier": "^4.0.0",
     "human-format": "^0.10.0",
@@ -50,7 +50,7 @@
     "@babel/preset-env": "^7.0.0",
     "babel-plugin-lodash": "^3.3.2",
     "cross-env": "^5.1.3",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.1"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xo-server-usage-report/src/index.js

@@ -19,7 +19,7 @@ import {
   values,
   zipObject,
 } from 'lodash'
-import { ignoreErrors, promisify } from 'promise-toolbox'
+import { promisify } from 'promise-toolbox'
 import { readFile, writeFile } from 'fs'
 
 // ===================================================================
@@ -759,22 +759,14 @@ class UsageReportPlugin {
   }
 
   async _sendReport(storeData) {
-    const xo = this._xo
-    if (xo.sendEmail === undefined) {
-      ignoreErrors.call(xo.unloadPlugin('usage-report'))
-      throw new Error(
-        'The plugin usage-report requires the plugin transport-email to be loaded'
-      )
-    }
-
     const data = await dataBuilder({
-      xo,
+      xo: this._xo,
       storedStatsPath: this._storedStatsPath,
       all: this._conf.all,
     })
 
     await Promise.all([
-      xo.sendEmail({
+      this._xo.sendEmail({
         to: this._conf.emails,
         subject: `[Xen Orchestra] Xo Report - ${currDate}`,
         markdown: `Hi there,

packages/xo-server/config.toml

@@ -17,11 +17,9 @@ createUserOnFirstSignin = true
 # their size just by looking at the beginning of the stream.
 #
 # But it is a guess, not a certainty, it depends on how the VHDs are formatted
-# by XenServer.
-#
-# This has been tested for 5 months, therefore it's enabled by default but can
-# be disabled specifically for a user if necessary.
-guessVhdSizeOnImport = true
+# by XenServer, therefore it's disabled for the moment but can be enabled
+# specifically for a user if necessary.
+guessVhdSizeOnImport = false
 
 # Whether API logs should contains the full request/response on
 # errors.

packages/xo-server/package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "xo-server",
-  "version": "5.50.1",
+  "version": "5.46.0",
   "license": "AGPL-3.0",
   "description": "Server part of Xen-Orchestra",
   "keywords": [
@@ -35,18 +35,17 @@
   "dependencies": {
     "@iarna/toml": "^2.2.1",
     "@xen-orchestra/async-map": "^0.0.0",
-    "@xen-orchestra/cron": "^1.0.4",
+    "@xen-orchestra/cron": "^1.0.3",
     "@xen-orchestra/defined": "^0.0.0",
     "@xen-orchestra/emit-async": "^0.0.0",
     "@xen-orchestra/fs": "^0.10.1",
-    "@xen-orchestra/log": "^0.2.0",
+    "@xen-orchestra/log": "^0.1.4",
     "@xen-orchestra/mixin": "^0.0.0",
     "ajv": "^6.1.1",
     "app-conf": "^0.7.0",
     "archiver": "^3.0.0",
     "async-iterator-to-stream": "^1.0.1",
     "base64url": "^3.0.0",
-    "bind-property-descriptor": "^1.0.0",
     "blocked": "^1.2.1",
     "bluebird": "^3.5.1",
     "body-parser": "^1.18.2",
@@ -124,7 +123,7 @@
     "value-matcher": "^0.2.0",
     "vhd-lib": "^0.7.0",
     "ws": "^6.0.0",
-    "xen-api": "^0.27.2",
+    "xen-api": "^0.27.1",
     "xml2js": "^0.4.19",
     "xo-acl-resolver": "^0.4.1",
     "xo-collection": "^0.4.1",
@@ -150,7 +149,7 @@
     "babel-plugin-transform-dev": "^2.0.1",
     "cross-env": "^5.1.3",
     "index-modules": "^0.3.0",
-    "rimraf": "^3.0.0"
+    "rimraf": "^2.6.2"
   },
   "scripts": {
     "build": "cross-env NODE_ENV=production babel --source-maps --out-dir=dist/ src/",

packages/xo-server/src/_MultiKeyMap.spec.js

@@ -1,34 +0,0 @@
-/* eslint-env jest */
-
-import MultiKeyMap from './_MultiKeyMap'
-
-describe('MultiKeyMap', () => {
-  it('works', () => {
-    const map = new MultiKeyMap()
-
-    const keys = [
-      // null key
-      [],
-      // simple key
-      ['foo'],
-      // composite key
-      ['foo', 'bar'],
-      // reverse composite key
-      ['bar', 'foo'],
-    ]
-    const values = keys.map(() => ({}))
-
-    // set all values first to make sure they are all stored and not only the
-    // last one
-    keys.forEach((key, i) => {
-      map.set(key, values[i])
-    })
-
-    keys.forEach((key, i) => {
-      // copy the key to make sure the array itself is not the key
-      expect(map.get(key.slice())).toBe(values[i])
-      map.delete(key.slice())
-      expect(map.get(key.slice())).toBe(undefined)
-    })
-  })
-})

packages/xo-server/src/_pDebounceWithKey.js

@@ -16,28 +16,13 @@ function scheduleRemoveCacheEntry(keys, expires) {
 
 const defaultKeyFn = () => []
 
-const { slice } = Array.prototype
-
-export const REMOVE_CACHE_ENTRY = {}
-
 // debounce an async function so that all subsequent calls in a delay receive
 // the same result
 //
 // similar to `p-debounce` with `leading` set to `true` but with key support
-//
-// - `delay`: number of milliseconds to cache the response, a function can be
-//   passed to use a custom delay for a call based on its parameters
-export const debounceWithKey = (fn, delay, keyFn = defaultKeyFn) => {
+export default (fn, delay, keyFn = defaultKeyFn) => {
   const cache = new MultiKeyMap()
-  const delayFn = typeof delay === 'number' ? () => delay : delay
-  return function(arg) {
-    if (arg === REMOVE_CACHE_ENTRY) {
-      return removeCacheEntry(
-        cache,
-        ensureArray(keyFn.apply(this, slice.call(arguments, 1)))
-      )
-    }
-
+  return function() {
     const keys = ensureArray(keyFn.apply(this, arguments))
     let promise = cache.get(keys)
     if (promise === undefined) {
@@ -45,15 +30,10 @@ export const debounceWithKey = (fn, delay, keyFn = defaultKeyFn) => {
       const remove = scheduleRemoveCacheEntry.bind(
         cache,
         keys,
-        Date.now() + delayFn.apply(this, arguments)
+        Date.now() + delay
       )
       promise.then(remove, remove)
     }
     return promise
   }
 }
-
-debounceWithKey.decorate = (...params) => (target, name, descriptor) => ({
-  ...descriptor,
-  value: debounceWithKey(descriptor.value, ...params),
-})

packages/xo-server/src/_pDebounceWithKey.spec.js

@@ -1,29 +0,0 @@
-/* eslint-env jest */
-
-import { debounceWithKey, REMOVE_CACHE_ENTRY } from './_pDebounceWithKey'
-
-describe('REMOVE_CACHE_ENTRY', () => {
-  it('clears the cache', async () => {
-    let i = 0
-    const debouncedFn = debounceWithKey(
-      function() {
-        return Promise.resolve(++i)
-      },
-      Infinity,
-      id => id
-    )
-
-    // not cached accross keys
-    expect(await debouncedFn(1)).toBe(1)
-    expect(await debouncedFn(2)).toBe(2)
-
-    // retrieve the already cached values
-    expect(await debouncedFn(1)).toBe(1)
-    expect(await debouncedFn(2)).toBe(2)
-
-    // an entry for a specific key can be removed
-    debouncedFn(REMOVE_CACHE_ENTRY, 1)
-    expect(await debouncedFn(1)).toBe(3)
-    expect(await debouncedFn(2)).toBe(2)
-  })
-})

packages/xo-server/src/api/backup-ng.js

@@ -3,12 +3,11 @@ import { fromCallback } from 'promise-toolbox'
 import { pipeline } from 'readable-stream'
 
 import createNdJsonStream from '../_createNdJsonStream'
-import { REMOVE_CACHE_ENTRY } from '../_pDebounceWithKey'
 import { safeDateFormat } from '../utils'
 
 export function createJob({ schedules, ...job }) {
   job.userId = this.user.id
-  return this.createBackupNgJob(job, schedules).then(({ id }) => id)
+  return this.createBackupNgJob(job, schedules)
 }
 
 createJob.permission = 'admin'
@@ -185,20 +184,7 @@ getAllLogs.params = {
   ndjson: { type: 'boolean', optional: true },
 }
 
-export function getLogs({
-  after,
-  before,
-  limit,
-
-  // TODO: it's a temporary work-around which should be removed
-  // when the consolidated logs will be stored in the DB
-  _forceRefresh = false,
-
-  ...filter
-}) {
-  if (_forceRefresh) {
-    this.getBackupNgLogs(REMOVE_CACHE_ENTRY)
-  }
+export function getLogs({ after, before, limit, ...filter }) {
   return this.getBackupNgLogsSorted({ after, before, limit, filter })
 }
 
@@ -316,7 +302,7 @@ export async function fetchFiles(params) {
   filename += '.zip'
 
   return this.registerHttpRequest(handleFetchFiles, params, {
-    suffix: '/' + encodeURIComponent(filename),
+    suffix: encodeURI(`/${filename}`),
   }).then(url => ({ $getFrom: url }))
 }
 

packages/xo-server/src/api/backup.js

@@ -93,7 +93,7 @@ export async function fetchFiles({ format = 'zip', ...params }) {
     handleFetchFiles,
     { ...params, format },
     {
-      suffix: '/' + encodeURIComponent(fileName),
+      suffix: encodeURI(`/${fileName}`),
     }
   ).then(url => ({ $getFrom: url }))
 }

packages/xo-server/src/api/host.js

@@ -221,7 +221,12 @@ emergencyShutdownHost.resolve = {
 // -------------------------------------------------------------------
 
 export async function isHostServerTimeConsistent({ host }) {
-  return this.getXapi(host).isHostServerTimeConsistent(host._xapiRef)
+  try {
+    await this.getXapi(host).assertConsistentHostServerTime(host._xapiRef)
+    return true
+  } catch (e) {
+    return false
+  }
 }
 
 isHostServerTimeConsistent.params = {

packages/xo-server/src/api/network.js

@@ -1,4 +1,3 @@
-import xapiObjectToXo from '../xapi-object-to-xo'
 import { mapToArray } from '../utils'
 
 export function getBondModes() {
@@ -13,15 +12,13 @@ export async function create({
   mtu = 1500,
   vlan = 0,
 }) {
-  return xapiObjectToXo(
-    await this.getXapi(pool).createNetwork({
-      name,
-      description,
-      pifId: pif && this.getObject(pif, 'PIF')._xapiId,
-      mtu: +mtu,
-      vlan: +vlan,
-    })
-  ).id
+  return this.getXapi(pool).createNetwork({
+    name,
+    description,
+    pifId: pif && this.getObject(pif, 'PIF')._xapiId,
+    mtu: +mtu,
+    vlan: +vlan,
+  })
 }
 
 create.params = {
@@ -119,9 +116,6 @@ set.params = {
     type: 'boolean',
     optional: true,
   },
-  id: {
-    type: 'string',
-  },
   name_description: {
     type: 'string',
     optional: true,

packages/xo-server/src/api/sr.js

@@ -777,7 +777,7 @@ export async function probeIscsiExists({
   )
 
   const srs = []
-  forEach(ensureArray(xml.SRlist.SR), sr => {
+  forEach(ensureArray(xml['SRlist'].SR), sr => {
     // get the UUID of SR connected to this LUN
     srs.push({ uuid: sr.UUID.trim() })
   })
@@ -845,7 +845,7 @@ export async function probeNfsExists({ host, server, serverPath }) {
 
   const srs = []
 
-  forEach(ensureArray(xml.SRlist.SR), sr => {
+  forEach(ensureArray(xml['SRlist'].SR), sr => {
     // get the UUID of SR connected to this LUN
     srs.push({ uuid: sr.UUID.trim() })
   })

packages/xo-server/src/api/vm.js

@@ -9,7 +9,7 @@ import {
   unauthorized,
 } from 'xo-common/api-errors'
 
-import { forEach, map, mapFilter, parseSize, safeDateFormat } from '../utils'
+import { forEach, map, mapFilter, parseSize } from '../utils'
 
 // ===================================================================
 
@@ -150,6 +150,8 @@ export async function create(params) {
   }
 
   const xapiVm = await xapi.createVm(template._xapiId, params, checkLimits)
+  await xapiVm.update_other_config('owner', user.id)
+
   const vm = xapi.xo.addObject(xapiVm)
 
   if (resourceSet) {
@@ -663,15 +665,16 @@ export const clone = defer(async function(
   await checkPermissionOnSrs.call(this, vm)
   const xapi = this.getXapi(vm)
 
-  const { $id: cloneId } = await xapi.cloneVm(vm._xapiRef, {
+  const xapiVm = await xapi.cloneVm(vm._xapiRef, {
     nameLabel: name,
     fast: !fullCopy,
   })
-  $defer.onFailure(() => xapi.deleteVm(cloneId))
+  $defer.onFailure(() => xapi.deleteVm(xapiVm.$id))
+  await xapiVm.update_other_config('owner', this.user.id)
 
   const isAdmin = this.user.permission === 'admin'
   if (!isAdmin) {
-    await this.addAcl(this.user.id, cloneId, 'admin')
+    await this.addAcl(this.user.id, xapiVm.$id, 'admin')
   }
 
   if (vm.resourceSet !== undefined) {
@@ -682,7 +685,7 @@ export const clone = defer(async function(
     )
   }
 
-  return cloneId
+  return xapiVm.$id
 })
 
 clone.params = {
@@ -704,19 +707,26 @@ export async function copy({ compress, name: nameLabel, sr, vm }) {
       await checkPermissionOnSrs.call(this, vm)
     }
 
-    return this.getXapi(vm)
-      .copyVm(vm._xapiId, sr._xapiId, {
-        nameLabel,
-      })
-      .then(vm => vm.$id)
-  }
-
-  return this.getXapi(vm)
-    .remoteCopyVm(vm._xapiId, this.getXapi(sr), sr._xapiId, {
-      compress,
+    const xapiVm = await this.getXapi(vm).copyVm(vm._xapiId, sr._xapiId, {
       nameLabel,
     })
-    .then(({ vm }) => vm.$id)
+    await xapiVm.update_other_config('owner', this.user.id)
+
+    return xapiVm.$id
+  }
+
+  const { vm: xapiVm } = await this.getXapi(vm).remoteCopyVm(
+    vm._xapiId,
+    this.getXapi(sr),
+    sr._xapiId,
+    {
+      compress,
+      nameLabel,
+    }
+  )
+  await xapiVm.update_other_config('owner', this.user.id)
+
+  return xapiVm.$id
 }
 
 copy.params = {
@@ -1137,15 +1147,10 @@ resume.resolve = {
 // -------------------------------------------------------------------
 
 export async function revert({ snapshot, snapshotBefore }) {
-  const { id: userId, permission } = this.user
-  await this.checkPermissions(userId, [[snapshot.$snapshot_of, 'operate']])
-  const newSnapshot = await this.getXapi(snapshot).revertVm(
-    snapshot._xapiId,
-    snapshotBefore
-  )
-  if (snapshotBefore && permission !== 'admin') {
-    await this.addAcl(userId, newSnapshot.$id, 'admin')
-  }
+  await this.checkPermissions(this.user.id, [
+    [snapshot.$snapshot_of, 'operate'],
+  ])
+  return this.getXapi(snapshot).revertVm(snapshot._xapiId, snapshotBefore)
 }
 
 revert.params = {
@@ -1189,11 +1194,7 @@ async function export_({ vm, compress }) {
 
   return {
     $getFrom: await this.registerHttpRequest(handleExport, data, {
-      suffix:
-        '/' +
-        encodeURIComponent(
-          `${safeDateFormat(new Date())} - ${vm.name_label}.xva`
-        ),
+      suffix: encodeURI(`/${vm.name_label}.xva`),
     }),
   }
 }

packages/xo-server/src/api/xosan.js

@@ -85,7 +85,7 @@ async function rateLimitedRetry(action, shouldRetry, retryCount = 20) {
 function createVolumeInfoTypes() {
   function parseHeal(parsed) {
     const bricks = []
-    parsed.healInfo.bricks.brick.forEach(brick => {
+    parsed['healInfo']['bricks']['brick'].forEach(brick => {
       bricks.push(brick)
       if (brick.file) {
         brick.file = ensureArray(brick.file)
@@ -96,21 +96,21 @@ function createVolumeInfoTypes() {
 
   function parseStatus(parsed) {
     const brickDictByUuid = {}
-    const volume = parsed.volStatus.volumes.volume
-    volume.node.forEach(node => {
+    const volume = parsed['volStatus']['volumes']['volume']
+    volume['node'].forEach(node => {
       brickDictByUuid[node.peerid] = brickDictByUuid[node.peerid] || []
       brickDictByUuid[node.peerid].push(node)
     })
     return {
       commandStatus: true,
-      result: { nodes: brickDictByUuid, tasks: volume.tasks },
+      result: { nodes: brickDictByUuid, tasks: volume['tasks'] },
     }
   }
 
   async function parseInfo(parsed) {
-    const volume = parsed.volInfo.volumes.volume
-    volume.bricks = volume.bricks.brick
-    volume.options = volume.options.option
+    const volume = parsed['volInfo']['volumes']['volume']
+    volume['bricks'] = volume['bricks']['brick']
+    volume['options'] = volume['options']['option']
     return { commandStatus: true, result: volume }
   }
 
@@ -118,23 +118,23 @@ function createVolumeInfoTypes() {
     return async function(sr) {
       const glusterEndpoint = this::_getGlusterEndpoint(sr)
       const cmdShouldRetry = result =>
-        !result.commandStatus &&
-        ((result.parsed && result.parsed.cliOutput.opErrno === '30802') ||
+        !result['commandStatus'] &&
+        ((result.parsed && result.parsed['cliOutput']['opErrno'] === '30802') ||
           result.stderr.match(/Another transaction is in progress/))
       const runCmd = async () =>
         glusterCmd(glusterEndpoint, 'volume ' + command, true)
       const commandResult = await rateLimitedRetry(runCmd, cmdShouldRetry, 30)
-      return commandResult.commandStatus
-        ? this::handler(commandResult.parsed.cliOutput, sr)
+      return commandResult['commandStatus']
+        ? this::handler(commandResult.parsed['cliOutput'], sr)
         : commandResult
     }
   }
 
   async function profileType(sr) {
     async function parseProfile(parsed) {
-      const volume = parsed.volProfile
-      volume.bricks = ensureArray(volume.brick)
-      delete volume.brick
+      const volume = parsed['volProfile']
+      volume['bricks'] = ensureArray(volume['brick'])
+      delete volume['brick']
       return { commandStatus: true, result: volume }
     }
 
@@ -143,9 +143,9 @@ function createVolumeInfoTypes() {
 
   async function profileTopType(sr) {
     async function parseTop(parsed) {
-      const volume = parsed.volTop
-      volume.bricks = ensureArray(volume.brick)
-      delete volume.brick
+      const volume = parsed['volTop']
+      volume['bricks'] = ensureArray(volume['brick'])
+      delete volume['brick']
       return { commandStatus: true, result: volume }
     }
 
@@ -326,7 +326,7 @@ async function remoteSsh(glusterEndpoint, cmd, ignoreError = false) {
       }
       messageArray.push(`${key}: ${result[key]}`)
     }
-    messageArray.push('command: ' + result.command.join(' '))
+    messageArray.push('command: ' + result['command'].join(' '))
     messageKeys.splice(messageKeys.indexOf('command'), 1)
     for (const key of messageKeys) {
       messageArray.push(`${key}: ${JSON.stringify(result[key])}`)
@@ -343,7 +343,7 @@ async function remoteSsh(glusterEndpoint, cmd, ignoreError = false) {
         })
         break
       } catch (exception) {
-        if (exception.code !== 'HOST_OFFLINE') {
+        if (exception['code'] !== 'HOST_OFFLINE') {
           throw exception
         }
       }
@@ -370,17 +370,19 @@ async function remoteSsh(glusterEndpoint, cmd, ignoreError = false) {
 }
 
 function findErrorMessage(commandResut) {
-  if (commandResut.exit === 0 && commandResut.parsed) {
-    const cliOut = commandResut.parsed.cliOutput
-    if (cliOut.opErrstr && cliOut.opErrstr.length) {
-      return cliOut.opErrstr
+  if (commandResut['exit'] === 0 && commandResut.parsed) {
+    const cliOut = commandResut.parsed['cliOutput']
+    if (cliOut['opErrstr'] && cliOut['opErrstr'].length) {
+      return cliOut['opErrstr']
     }
     // "peer probe" returns it's "already in peer" error in cliOutput/output
-    if (cliOut.output && cliOut.output.length) {
-      return cliOut.output
+    if (cliOut['output'] && cliOut['output'].length) {
+      return cliOut['output']
     }
   }
-  return commandResut.stderr.length ? commandResut.stderr : commandResut.stdout
+  return commandResut['stderr'].length
+    ? commandResut['stderr']
+    : commandResut['stdout']
 }
 
 async function glusterCmd(glusterEndpoint, cmd, ignoreError = false) {
@@ -390,15 +392,15 @@ async function glusterCmd(glusterEndpoint, cmd, ignoreError = false) {
     true
   )
   try {
-    result.parsed = parseXml(result.stdout)
+    result.parsed = parseXml(result['stdout'])
   } catch (e) {
     // pass, we never know if a message can be parsed or not, so we just try
   }
-  if (result.exit === 0) {
-    const cliOut = result.parsed.cliOutput
+  if (result['exit'] === 0) {
+    const cliOut = result.parsed['cliOutput']
     // we have found cases where opErrno is !=0 and opRet was 0, albeit the operation was an error.
     result.commandStatus =
-      cliOut.opRet.trim() === '0' && cliOut.opErrno.trim() === '0'
+      cliOut['opRet'].trim() === '0' && cliOut['opErrno'].trim() === '0'
     result.error = findErrorMessage(result)
   } else {
     result.commandStatus = false
@@ -791,7 +793,7 @@ export const createSR = defer(async function(
       host: param.host.$id,
       vm: { id: param.vm.$id, ip: param.address },
       underlyingSr: param.underlyingSr.$id,
-      arbiter: !!param.arbiter,
+      arbiter: !!param['arbiter'],
     }))
     await xapi.xo.setData(xosanSrRef, 'xosan_config', {
       version: 'beta2',
@@ -819,14 +821,12 @@ export const createSR = defer(async function(
 createSR.description = 'create gluster VM'
 createSR.permission = 'admin'
 createSR.params = {
-  brickSize: { type: 'number', optional: true },
   srs: {
     type: 'array',
     items: {
       type: 'string',
     },
   },
-  template: { type: 'object' },
   pif: {
     type: 'string',
   },
@@ -1162,11 +1162,11 @@ async function _prepareGlusterVm(
 }
 
 async function _importGlusterVM(xapi, template, lvmsrId) {
-  const templateStream = await this.requestResource({
-    id: template.id,
-    namespace: 'xosan',
-    version: template.version,
-  })
+  const templateStream = await this.requestResource(
+    'xosan',
+    template.id,
+    template.version
+  )
   const newVM = await xapi.importVm(templateStream, {
     srId: lvmsrId,
     type: 'xva',
@@ -1298,7 +1298,7 @@ export const addBricks = defer(async function(
         underlyingSr: newSr,
       })
     }
-    const arbiterNode = data.nodes.find(n => n.arbiter)
+    const arbiterNode = data.nodes.find(n => n['arbiter'])
     if (arbiterNode) {
       await glusterCmd(
         glusterEndpoint,
@@ -1533,11 +1533,8 @@ export async function downloadAndInstallXosanPack({ id, version, pool }) {
   }
 
   const xapi = this.getXapi(pool.id)
-  const res = await this.requestResource({
-    id,
-    namespace: 'xosan',
-    version,
-  })
+  const res = await this.requestResource('xosan', id, version)
+
   await xapi.installSupplementalPackOnAllHosts(res)
   await xapi.pool.update_other_config(
     'xosan_pack_installation_time',

packages/xo-server/src/logs-cli.js

@@ -6,7 +6,6 @@ import ndjson from 'ndjson'
 import parseArgs from 'minimist'
 import sublevel from 'level-sublevel'
 import util from 'util'
-import { join as joinPath } from 'path'
 import { repair as repairDb } from 'level'
 
 import { forEach } from './utils'
@@ -175,7 +174,6 @@ export default async function main() {
   }
 
   const config = await appConf.load('xo-server', {
-    appDir: joinPath(__dirname, '..'),
     ignoreUnknownFormats: true,
   })
 

packages/xo-server/src/sensitive-values.js

@@ -26,12 +26,7 @@ export const merge = (newValue, oldValue) => {
 
 export const obfuscate = value => replace(value, OBFUSCATED_VALUE)
 
-const SENSITIVE_PARAMS = {
-  __proto__: null,
-  cifspassword: true,
-  password: true,
-  token: true,
-}
+const SENSITIVE_PARAMS = { __proto__: null, password: true, token: true }
 
 export function replace(value, replacement) {
   function helper(value, name) {

packages/xo-server/src/xapi-object-to-xo.js

@@ -1,4 +1,3 @@
-import * as sensitiveValues from './sensitive-values'
 import ensureArray from './_ensureArray'
 import {
   extractProperty,
@@ -486,10 +485,7 @@ const TRANSFORMS = {
       attached: Boolean(obj.currently_attached),
       host: link(obj, 'host'),
       SR: link(obj, 'SR'),
-      device_config: sensitiveValues.replace(
-        obj.device_config,
-        '* obfuscated *'
-      ),
+      device_config: obj.device_config,
       otherConfig: obj.other_config,
     }
   },

packages/xo-server/src/xapi/index.js

@@ -734,19 +734,9 @@ export default class Xapi extends XapiBase {
       const { SR } = vdi
       let childrenMap = cache[SR]
       if (childrenMap === undefined) {
-        const xapi = vdi.$xapi
         childrenMap = cache[SR] = groupBy(
-          vdi.$SR.VDIs,
-
-          // if for any reasons, the VDI is undefined, simply ignores it instead
-          // of failing
-          ref => {
-            try {
-              return xapi.getObjectByRef(ref).sm_config['vhd-parent']
-            } catch (error) {
-              log.warn('missing VDI in _assertHealthyVdiChain', { error })
-            }
-          }
+          vdi.$SR.$VDIs,
+          _ => _.sm_config['vhd-parent']
         )
       }
 
@@ -1576,7 +1566,7 @@ export default class Xapi extends XapiBase {
       }
     } else {
       // Find the original template by name (*sigh*).
-      const templateNameLabel = vm.other_config.base_template_name
+      const templateNameLabel = vm.other_config['base_template_name']
       const template =
         templateNameLabel &&
         find(
@@ -1692,15 +1682,12 @@ export default class Xapi extends XapiBase {
   }
 
   async createVdi({
-    // blindly copying `sm_config` from another VDI can create problems,
-    // therefore it is ignored by this method
-    //
-    // see https://github.com/vatesfr/xen-orchestra/issues/4482
     name_description,
     name_label,
     other_config = {},
     read_only = false,
     sharable = false,
+    sm_config,
     SR,
     tags,
     type = 'user',
@@ -1720,6 +1707,7 @@ export default class Xapi extends XapiBase {
         other_config,
         read_only: Boolean(read_only),
         sharable: Boolean(sharable),
+        sm_config,
         SR: sr.$ref,
         tags,
         type,
@@ -2041,7 +2029,6 @@ export default class Xapi extends XapiBase {
       )
     )
   }
-
   @deferrable
   async createNetwork(
     $defer,
@@ -2359,22 +2346,14 @@ export default class Xapi extends XapiBase {
     )
   }
 
-  async _getHostServerTimeShift(hostRef) {
-    return Math.abs(
-      parseDateTime(await this.call('host.get_servertime', hostRef)).getTime() -
-        Date.now()
-    )
-  }
-
-  async isHostServerTimeConsistent(hostRef) {
-    return (await this._getHostServerTimeShift(hostRef)) < 30e3
-  }
-
   async assertConsistentHostServerTime(hostRef) {
-    if (!(await this.isHostServerTimeConsistent(hostRef))) {
+    const delta =
+      parseDateTime(await this.call('host.get_servertime', hostRef)).getTime() -
+      Date.now()
+    if (Math.abs(delta) > 30e3) {
       throw new Error(
         `host server time and XOA date are not consistent with each other (${ms(
-          await this._getHostServerTimeShift(hostRef)
+          delta
         )})`
       )
     }

packages/xo-server/src/xapi/mixins/patching.js

@@ -6,7 +6,6 @@ import { filter, find, pickBy, some } from 'lodash'
 
 import ensureArray from '../../_ensureArray'
 import { debounce } from '../../decorators'
-import { debounceWithKey } from '../../_pDebounceWithKey'
 import { forEach, mapFilter, mapToArray, parseXml } from '../../utils'
 
 import { extractOpaqueRef, useUpdateSystem } from '../utils'
@@ -36,28 +35,6 @@ const log = createLogger('xo:xapi')
 
 const _isXcp = host => host.software_version.product_brand === 'XCP-ng'
 
-const XCP_NG_DEBOUNCE_TIME_MS = 60000
-
-// list all yum updates available for a XCP-ng host
-// (hostObject) → { uuid: patchObject }
-async function _listXcpUpdates(host) {
-  return JSON.parse(
-    await this.call(
-      'host.call_plugin',
-      host.$ref,
-      'updater.py',
-      'check_update',
-      {}
-    )
-  )
-}
-
-const _listXcpUpdateDebounced = debounceWithKey(
-  _listXcpUpdates,
-  XCP_NG_DEBOUNCE_TIME_MS,
-  host => host.$ref
-)
-
 // =============================================================================
 
 export default {
@@ -164,8 +141,19 @@ export default {
 
   // LIST ----------------------------------------------------------------------
 
-  _listXcpUpdates,
-  _listXcpUpdateDebounced,
+  // list all yum updates available for a XCP-ng host
+  // (hostObject) → { uuid: patchObject }
+  async _listXcpUpdates(host) {
+    return JSON.parse(
+      await this.call(
+        'host.call_plugin',
+        host.$ref,
+        'updater.py',
+        'check_update',
+        {}
+      )
+    )
+  },
 
   // list all patches provided by Citrix for this host version regardless
   // of if they're installed or not
@@ -267,7 +255,7 @@ export default {
         )) !== undefined
       ) {
         if (getAll) {
-          log.debug(
+          log(
             `patch ${patch.name} (${id}) conflicts with installed patch ${conflictId}`
           )
           return
@@ -283,7 +271,7 @@ export default {
         )) !== undefined
       ) {
         if (getAll) {
-          log.debug(`patches ${id} and ${conflictId} conflict with eachother`)
+          log(`patches ${id} and ${conflictId} conflict with eachother`)
           return
         }
         throw new Error(
@@ -318,7 +306,7 @@ export default {
   listMissingPatches(hostId) {
     const host = this.getObject(hostId)
     return _isXcp(host)
-      ? this._listXcpUpdateDebounced(host)
+      ? this._listXcpUpdates(host)
       : // TODO: list paid patches of free hosts as well so the UI can show them
         this._listInstallablePatches(host)
   },

packages/xo-server/src/xapi/mixins/vm.js

@@ -276,20 +276,19 @@ export default {
         if (virtualizationMode !== 'pv' && virtualizationMode !== 'hvm') {
           throw new Error(`The virtualization mode must be 'pv' or 'hvm'`)
         }
-        return vm.set_domain_type !== undefined
-          ? vm.set_domain_type(virtualizationMode)
-          : vm.set_HVM_boot_policy(
+        return vm
+          .set_domain_type(virtualizationMode)
+          ::pCatch({ code: 'MESSAGE_METHOD_UNKNOWN' }, () =>
+            vm.set_HVM_boot_policy(
               virtualizationMode === 'hvm' ? 'Boot order' : ''
             )
+          )
       },
     },
 
     coresPerSocket: {
       set: (coresPerSocket, vm) =>
-        vm.update_platform(
-          'cores-per-socket',
-          coresPerSocket !== null ? String(coresPerSocket) : null
-        ),
+        vm.update_platform('cores-per-socket', String(coresPerSocket)),
     },
 
     CPUs: 'cpus',
@@ -315,8 +314,7 @@ export default {
 
     cpuCap: {
       get: vm => vm.VCPUs_params.cap && +vm.VCPUs_params.cap,
-      set: (cap, vm) =>
-        vm.update_VCPUs_params('cap', cap !== null ? String(cap) : null),
+      set: (cap, vm) => vm.update_VCPUs_params('cap', String(cap)),
     },
 
     cpuMask: {
@@ -465,9 +463,8 @@ export default {
 
   async revertVm(snapshotId, snapshotBefore = true) {
     const snapshot = this.getObject(snapshotId)
-    let newSnapshot
     if (snapshotBefore) {
-      newSnapshot = await this._snapshotVm(snapshot.$snapshot_of)
+      await this._snapshotVm(snapshot.$snapshot_of)
     }
     await this.callAsync('VM.revert', snapshot.$ref)
     if (snapshot.snapshot_info['power-state-at-snapshot'] === 'Running') {
@@ -478,7 +475,6 @@ export default {
         this.resumeVm(vm.$id)::ignoreErrors()
       }
     }
-    return newSnapshot
   },
 
   async resumeVm(vmId) {

packages/xo-server/src/xapi/utils.js

@@ -332,7 +332,7 @@ export const makeEditObject = specs => {
 
 export const useUpdateSystem = host => {
   // Match Xen Center's condition: https://github.com/xenserver/xenadmin/blob/f3a64fc54bbff239ca6f285406d9034f57537d64/XenModel/Utils/Helpers.cs#L420
-  return versionSatisfies(host.software_version.platform_version, '>=2.1.1')
+  return versionSatisfies(host.software_version.platform_version, '^2.1.1')
 }
 
 export const canSrHaveNewVdiOfSize = (sr, minSize) =>

packages/xo-server/src/xo-mixins/api.js

@@ -3,7 +3,6 @@ import kindOf from 'kindof'
 import ms from 'ms'
 import schemaInspector from 'schema-inspector'
 import { forEach, isFunction } from 'lodash'
-import { getBoundPropertyDescriptor } from 'bind-property-descriptor'
 import { MethodNotFound } from 'json-rpc-peer'
 
 import * as methods from '../api'
@@ -220,29 +219,17 @@ export default class Api {
       throw new MethodNotFound(name)
     }
 
-    // create the context which is an augmented XO
-    const context = (() => {
-      const descriptors = {
-        api: {
-          // Used by system.*().
-          value: this,
-        },
-        session: {
-          value: session,
-        },
-      }
-
-      let obj = xo
-      do {
-        Object.getOwnPropertyNames(obj).forEach(name => {
-          if (!(name in descriptors)) {
-            descriptors[name] = getBoundPropertyDescriptor(obj, name, xo)
-          }
-        })
-      } while ((obj = Reflect.getPrototypeOf(obj)) !== null)
-
-      return Object.create(null, descriptors)
-    })()
+    // FIXME: it can cause issues if there any property assignments in
+    // XO methods called from the API.
+    const context = Object.create(xo, {
+      api: {
+        // Used by system.*().
+        value: this,
+      },
+      session: {
+        value: session,
+      },
+    })
 
     // Fetch and inject the current user.
     const userId = session.get('user_id', undefined)