NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix array check

Browse Source
This commit is contained in:
Olivier Lambert 2015-02-27 15:00:02 +01:00
parent d15c8b16f3
commit bb31693a4d
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/api/sr.js
View File

@ -1,9 +1,16 @@
import forEach from 'lodash.foreach';
import isArray from 'lodash.isarray';
import {$coroutine, $wait} from '../fibers-utils';
import {parseXml} from '../utils';
//====================================================================
function ensureArray(value) {
return isArray(value) ? value : [value];
}
//====================================================================
let set = $coroutine(function (params) {
let SR;
try {
@ -257,7 +264,7 @@ let probeNfs = $coroutine(function ({
xml = parseXml(xml);
let nfsExports = [];
forEach(xml['nfs-exports'], nfsExport => {
forEach(ensureArray(xml['nfs-exports'].Export), nfsExport => {
nfsExports.push({
path: nfsExport.Path.trim(),
acl: nfsExport.Accesslist.trim()
@ -411,7 +418,7 @@ let probeIscsiIqns = $coroutine(function ({
xml = parseXml(xml);
let targets = [];
forEach(xml['iscsi-target-iqns'].TGT, target => {
forEach(ensureArray(xml['iscsi-target-iqns'].TGT), target => {
// if the target is on another IP adress, do not display it
if (target.IPAddress.trim() === targetIp) {
targets.push({
@ -494,7 +501,7 @@ let probeIscsiLuns = $coroutine(function ({
xml = parseXml(xml);
let luns = [];
forEach(xml['iscsi-target'], lun => {
forEach(ensureArray(xml['iscsi-target'].LUN), lun => {
luns.push({
id: lun.LUNid.trim(),
vendor: lun.vendor.trim(),