Merge pull request #792 from koushik-das/CLOUDSTACK-8826 CLOUDSTACK-8826: XenServer - Use device id passed as part of attach volume API properly
If device id passed as part of API and available then use it otherwise fallback on XS to automatically assign one. For ISO device id used is 3 and it is processed before any other entry to avoid conflict. Signed-off-by: Koushik Das <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/86325cbc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/86325cbc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/86325cbc Branch: refs/heads/master Commit: 86325cbc95abfff038e7929ac8c8d3b3b3bd0267 Parents: d543e2a f5b9a96 Author: Koushik Das <[email protected]> Authored: Tue Sep 22 15:43:17 2015 +0530 Committer: Koushik Das <[email protected]> Committed: Tue Sep 22 15:43:42 2015 +0530 ---------------------------------------------------------------------- .../xenserver/resource/CitrixResourceBase.java | 45 +++++++++----------- .../resource/XenServerStorageProcessor.java | 32 ++++---------- .../xenbase/CitrixStartCommandWrapper.java | 21 ++++++--- 3 files changed, 44 insertions(+), 54 deletions(-) ----------------------------------------------------------------------
