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

add optionnal port

Browse Source
This commit is contained in:
Olivier Lambert 2015-02-26 22:34:52 +01:00
parent c10e8f5f9a
commit 8b9c932b80
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/api/sr.js
View File

@ -164,6 +164,7 @@ let createIscsi = $coroutine(function ({
nameDescription,
size,
target,
port,
targetIqn,
scsiId,
chapUser,
@ -189,6 +190,12 @@ let createIscsi = $coroutine(function ({
deviceConfig.chapUser = chapUser;
deviceConfig.chapPassword = chapPassword;
}
// if we give another port than default iSCSI
if (port) {
deviceConfig.port = port;
}
$wait(xapi.call(
'SR.create',
host.ref,
@ -212,6 +219,7 @@ createIscsi.params = {
nameLabel: { type: 'string' },
nameDescription: { type: 'string' },
target: { type: 'string' },
port: { type: 'integer' , optional: true},
targetIqn: { type: 'string' },
scsiId: { type: 'string' },
chapUser: { type: 'string' , optional: true },
@ -227,6 +235,7 @@ export {createIscsi};
let probeIscsiIqns = $coroutine(function ({
host,
target:targetIp,
port,
chapUser,
chapPassword
}) {
@ -249,6 +258,11 @@ let probeIscsiIqns = $coroutine(function ({
deviceConfig.chapPassword = chapPassword;
}
// if we give another port than default iSCSI
if (port) {
deviceConfig.port = port;
}
let xml;
try {
@ -291,6 +305,7 @@ probeIscsiIqns.permission = 'admin';
probeIscsiIqns.params = {
host: { type: 'string' },
target: { type: 'string' },
port: { type: 'integer', optional: true },
chapUser: { type: 'string' , optional: true },
chapPassword: { type: 'string' , optional: true },
};
@ -299,10 +314,12 @@ export {probeIscsiIqns};
//--------------------------------------------------------------------
// This function helps to detect all iSCSI ID and LUNs on a Target
// It will return a LUN table
let probeIscsiLuns = $coroutine(function ({
host,
target:targetIp,
port,
targetIqn,
chapUser,
chapPassword
@ -327,6 +344,11 @@ let probeIscsiLuns = $coroutine(function ({
deviceConfig.chapPassword = chapPassword;
}
// if we give another port than default iSCSI
if (port) {
deviceConfig.port = port;
}
let xml;
try {
@ -366,6 +388,7 @@ probeIscsiLuns.permission = 'admin';
probeIscsiLuns.params = {
host: { type: 'string' },
target: { type: 'string' },
port: { type: 'integer' , optional: true},
targetIqn: { type: 'string' },
chapUser: { type: 'string' , optional: true },
chapPassword: { type: 'string' , optional: true },
@ -380,6 +403,7 @@ export {probeIscsiLuns};
let probeIscsiExists = $coroutine(function ({
host,
target:targetIp,
port,
targetIqn,
scsiId,
chapUser,
@ -406,6 +430,10 @@ let probeIscsiExists = $coroutine(function ({
deviceConfig.chapPassword = chapPassword;
}
// if we give another port than default iSCSI
if (port) {
deviceConfig.port = port;
}
let xml = $wait(xapi.call('SR.probe', host.ref, deviceConfig, 'lvmoiscsi', {}));
@ -427,6 +455,7 @@ probeIscsiExists.permission = 'admin';
probeIscsiExists.params = {
host: { type: 'string' },
target: { type: 'string' },
port: { type: 'integer', optional: true },
targetIqn: { type: 'string' },
scsiId: { type: 'string' },
chapUser: { type: 'string' , optional: true },