You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/03/27 12:12:24 UTC
[1/3] git commit: updated refs/heads/master to 91d8766
Repository: cloudstack
Updated Branches:
refs/heads/master e2fe8e649 -> 91d87666a
Fix paths so they also work with tests on windows.
Sonarcube is great, but has no context and can be wrong, in this
case File.separator is nice if you're running platform independent,
the agent on OVM3 is however NOT platform independent and will break
if we feed it windows separators.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d0e25d96
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d0e25d96
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d0e25d96
Branch: refs/heads/master
Commit: d0e25d96fbdcce830795a5590afdf7f0e3302546
Parents: 7144e9b
Author: Funs <fu...@barred.org>
Authored: Fri Mar 27 11:14:35 2015 +0100
Committer: Funs <fu...@barred.org>
Committed: Fri Mar 27 11:14:35 2015 +0100
----------------------------------------------------------------------
.../hypervisor/ovm3/objects/StoragePlugin.java | 4 +-
.../com/cloud/hypervisor/ovm3/objects/Xen.java | 2 +-
.../ovm3/resources/Ovm3StorageProcessor.java | 56 ++++++++++----------
.../ovm3/resources/helpers/Ovm3StoragePool.java | 2 +-
.../ovm3/resources/helpers/Ovm3VmSupport.java | 4 +-
.../ovm3/objects/StoragePluginTest.java | 2 +-
6 files changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0e25d96/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/StoragePlugin.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/StoragePlugin.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/StoragePlugin.java
index 8dcd896..6782b86 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/StoragePlugin.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/StoragePlugin.java
@@ -469,7 +469,7 @@ public class StoragePlugin extends OvmObject {
sd.setUuid(mntUuid);
sd.setAccessPath(nfsHost + ":" + nfsRemotePath);
if (!mountPoint.contains(mntUuid)) {
- mountPoint += File.separator + mntUuid;
+ mountPoint += "/" + mntUuid;
}
sd.setDetails((HashMap<String, Object>) callWrapper(
"storage_plugin_mount", getPluginType, ss.getDetails(),
@@ -504,7 +504,7 @@ public class StoragePlugin extends OvmObject {
sd.setAccessPath(nfsHost + ":" + remotePath);
sd.setState(1);
ss.setStorageType(FILESYS);
- String mountPoint = localPath + File.separator + mntUuid;
+ String mountPoint = localPath + "/" + mntUuid;
callWrapper("storage_plugin_unmount", getPluginType,
ss.getDetails(), sd.getDetails(), mountPoint, ACTIVE);
return true;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0e25d96/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
index 2bdd0f1..6fdd81b 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
@@ -434,7 +434,7 @@ public class Xen extends OvmObject {
throw new Ovm3ResourceException("No valid disk found for id: "
+ disk);
}
- String[] st = diskPath.split(File.separatorChar == '\\' ? "\\\\" : File.separator);
+ String[] st = diskPath.split("/"Char == '\\' ? "\\\\" : "/");
return st[fi];
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0e25d96/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java
index 7e32aa8..03fd2ea 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3StorageProcessor.java
@@ -156,8 +156,8 @@ public class Ovm3StorageProcessor implements StorageProcessor {
/* disk should have a uuid */
// should also be replaced with getVirtualDiskPath ?
String fileName = UUID.randomUUID().toString() + ".raw";
- String dst = primaryStorage.getPath() + File.separator
- + primaryStorage.getUuid() + File.separator + fileName;
+ String dst = primaryStorage.getPath() + "/"
+ + primaryStorage.getUuid() + "/" + fileName;
try {
StoragePlugin store = new StoragePlugin(c);
if (cmd.getTemplateUrl() != null) {
@@ -198,11 +198,11 @@ public class Ovm3StorageProcessor implements StorageProcessor {
try {
String secPoolUuid = pool.setupSecondaryStorage(srcImageStore.getUrl());
String primaryPoolUuid = destData.getDataStore().getUuid();
- String destPath = config.getAgentOvmRepoPath() + File.separator
- + ovmObject.deDash(primaryPoolUuid) + File.separator
+ String destPath = config.getAgentOvmRepoPath() + "/"
+ + ovmObject.deDash(primaryPoolUuid) + "/"
+ config.getTemplateDir();
String sourcePath = config.getAgentSecStoragePath()
- + File.separator + secPoolUuid;
+ + "/" + secPoolUuid;
Linux host = new Linux(c);
String destUuid = destTemplate.getUuid();
/*
@@ -211,13 +211,13 @@ public class Ovm3StorageProcessor implements StorageProcessor {
* so we can forget about that.
*/
/* TODO: add checksumming */
- String srcFile = sourcePath + File.separator
+ String srcFile = sourcePath + "/"
+ srcData.getPath();
- if (srcData.getPath().endsWith(File.separator)) {
- srcFile = sourcePath + File.separator + srcData.getPath()
- + File.separator + destUuid + ".raw";
+ if (srcData.getPath().endsWith("/")) {
+ srcFile = sourcePath + "/" + srcData.getPath()
+ + "/" + destUuid + ".raw";
}
- String destFile = destPath + File.separator + destUuid + ".raw";
+ String destFile = destPath + "/" + destUuid + ".raw";
LOGGER.debug("CopyFrom: " + srcData.getObjectType() + ","
+ srcFile + " to " + destData.getObjectType() + ","
+ destFile);
@@ -303,16 +303,16 @@ public class Ovm3StorageProcessor implements StorageProcessor {
SnapshotObjectTO srcSnap = (SnapshotObjectTO) srcData;
String secPoolUuid = pool.setupSecondaryStorage(srcData.getDataStore().getUrl());
String srcFile = config.getAgentSecStoragePath()
- + File.separator + secPoolUuid + File.separator
+ + "/" + secPoolUuid + "/"
+ srcSnap.getPath();
// dest
DataTO destData = cmd.getDestTO();
TemplateObjectTO destTemplate = (TemplateObjectTO) destData;
String secPoolUuidTemplate = pool.setupSecondaryStorage(destData.getDataStore().getUrl());
String destDir = config.getAgentSecStoragePath()
- + File.separator + secPoolUuidTemplate + File.separator
+ + "/" + secPoolUuidTemplate + "/"
+ destTemplate.getPath();
- String destFile = destDir + File.separator
+ String destFile = destDir + "/"
+ destTemplate.getUuid() + ".raw";
CloudstackPlugin csp = new CloudstackPlugin(c);
csp.ovsMkdirs(destDir);
@@ -351,9 +351,9 @@ public class Ovm3StorageProcessor implements StorageProcessor {
String storeUrl = dest.getDataStore().getUrl();
String secPoolUuid = pool.setupSecondaryStorage(storeUrl);
String destDir = config.getAgentSecStoragePath()
- + File.separator + secPoolUuid + File.separator
+ + "/" + secPoolUuid + "/"
+ dest.getPath();
- String destFile = destDir + File.separator + src.getPath();
+ String destFile = destDir + "/" + src.getPath();
destFile = destFile.concat(".raw");
// copy
Linux host = new Linux(c);
@@ -369,7 +369,7 @@ public class Ovm3StorageProcessor implements StorageProcessor {
SnapshotObjectTO newSnap = new SnapshotObjectTO();
// newSnap.setPath(destFile);
// damnit frickin crap, no reference whatsoever... could use parent ?
- newSnap.setPath(dest.getPath() + File.separator + src.getPath() + ".raw");
+ newSnap.setPath(dest.getPath() + "/" + src.getPath() + ".raw");
newSnap.setParentSnapshotPath(null);
return new CopyCmdAnswer(newSnap);
} catch (Ovm3ResourceException e) {
@@ -424,8 +424,8 @@ public class Ovm3StorageProcessor implements StorageProcessor {
DataStoreTO store = isoTO.getDataStore();
NfsTO nfsStore = (NfsTO) store;
String secPoolUuid = pool.setupSecondaryStorage(nfsStore.getUrl());
- return config.getAgentSecStoragePath() + File.separator
- + secPoolUuid + File.separator + isoTO.getPath();
+ return config.getAgentSecStoragePath() + "/"
+ + secPoolUuid + "/" + isoTO.getPath();
}
/**
@@ -436,11 +436,11 @@ public class Ovm3StorageProcessor implements StorageProcessor {
*/
public String getVirtualDiskPath(String diskUuid, String storeUuid) throws Ovm3ResourceException {
String d = config.getAgentOvmRepoPath() +
- File.separator +
+ "/" +
ovmObject.deDash(storeUuid) +
- File.separator +
+ "/" +
config.getVirtualDiskDir() +
- File.separator +
+ "/" +
diskUuid;
if (!d.endsWith(".raw")) {
d = d.concat(".raw");
@@ -594,9 +594,9 @@ public class Ovm3StorageProcessor implements StorageProcessor {
Linux host = new Linux(c);
String uuid = host.newUuid();
/* for root volumes this works... */
- String src = vol.getPath() + File.separator + vol.getUuid()
+ String src = vol.getPath() + "/" + vol.getUuid()
+ ".raw";
- String dest = vol.getPath() + File.separator + uuid + ".raw";
+ String dest = vol.getPath() + "/" + uuid + ".raw";
/* seems that sometimes the path is already contains a file
* in case, we just replace it.... (Seems to happen if not ROOT)
*/
@@ -703,9 +703,9 @@ public class Ovm3StorageProcessor implements StorageProcessor {
try {
/* missing uuid */
- String installPath = config.getAgentOvmRepoPath() + File.separator
- + config.getTemplateDir() + File.separator
- + accountId + File.separator + templateId;
+ String installPath = config.getAgentOvmRepoPath() + "/"
+ + config.getTemplateDir() + "/"
+ + accountId + "/" + templateId;
Linux host = new Linux(c);
host.copyFile(volumePath, installPath);
return new CreatePrivateTemplateAnswer(cmd, true, installPath);
@@ -730,7 +730,7 @@ public class Ovm3StorageProcessor implements StorageProcessor {
SnapshotObjectTO srcSnap = (SnapshotObjectTO) srcData;
String secPoolUuid = pool.setupSecondaryStorage(srcImageStore.getUrl());
String srcFile = config.getAgentSecStoragePath()
- + File.separator + secPoolUuid + File.separator
+ + "/" + secPoolUuid + "/"
+ srcSnap.getPath();
// dest
@@ -769,7 +769,7 @@ public class Ovm3StorageProcessor implements StorageProcessor {
// snapshots/accountid/volumeid
String secPoolUuid = pool.setupSecondaryStorage(storeUrl);
String filePath = config.getAgentSecStoragePath()
- + File.separator + secPoolUuid + File.separator
+ + "/" + secPoolUuid + "/"
+ snapUuid + ".raw";
StoragePlugin sp = new StoragePlugin(c);
sp.storagePluginDestroy(secPoolUuid, filePath);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0e25d96/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3StoragePool.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3StoragePool.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3StoragePool.java
index ccea964..6f76eb9 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3StoragePool.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3StoragePool.java
@@ -463,7 +463,7 @@ public class Ovm3StoragePool {
try {
StoragePlugin sp = new StoragePlugin(c);
FileProperties fp = sp.storagePluginGetFileInfo(
- poolUuid, host, destPath + File.separator
+ poolUuid, host, destPath + "/"
+ srcIso.getName());
if (fp.getSize() != srcIso.getTotalSpace()) {
LOGGER.info(" System VM patch ISO file already exists: "
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0e25d96/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3VmSupport.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3VmSupport.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3VmSupport.java
index 6b80350..9ab4390 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3VmSupport.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3VmSupport.java
@@ -392,8 +392,8 @@ public class Ovm3VmSupport {
NfsTO nfsStore = (NfsTO) store;
String secPoolUuid = pool.setupSecondaryStorage(nfsStore
.getUrl());
- String isoPath = config.getAgentSecStoragePath() + File.separator
- + secPoolUuid + File.separator
+ String isoPath = config.getAgentSecStoragePath() + "/"
+ + secPoolUuid + "/"
+ template.getPath();
vm.addIso(isoPath);
/* check if secondary storage is mounted */
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0e25d96/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/StoragePluginTest.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/StoragePluginTest.java b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/StoragePluginTest.java
index bb1d2bc..79eddce 100644
--- a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/StoragePluginTest.java
+++ b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/StoragePluginTest.java
@@ -227,7 +227,7 @@ public class StoragePluginTest {
StorageDetails sd = sPt.storagePluginMountNFS(NFSHOST, NFSPATH,
FSMNTUUID, NFSMNT);
con.setResult(results.simpleResponseWrapWrapper(NFSMOUNTRESPONSEXML));
- NFSMNT = NFSMNT + File.separator + FSMNTUUID;
+ NFSMNT = NFSMNT + "/" + FSMNTUUID;
sd = sPt.storagePluginMountNFS(NFSHOST, NFSPATH, FSMNTUUID, NFSMNT);
results.basicLongTest(Long.valueOf(sd.getSize()), 263166853120L);
results.basicLongTest(Long.valueOf(sd.getFreeSize()), 259377299456L);
[2/3] git commit: updated refs/heads/master to 91d8766
Posted by da...@apache.org.
Only one thing can come from the agent
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e7d7643d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e7d7643d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e7d7643d
Branch: refs/heads/master
Commit: e7d7643dd71b2175a8f553e1659141371c631656
Parents: d0e25d9
Author: Funs <fu...@barred.org>
Authored: Fri Mar 27 11:19:16 2015 +0100
Committer: Funs <fu...@barred.org>
Committed: Fri Mar 27 11:19:16 2015 +0100
----------------------------------------------------------------------
.../ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7d7643d/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
index 6fdd81b..2f28d24 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
@@ -434,7 +434,7 @@ public class Xen extends OvmObject {
throw new Ovm3ResourceException("No valid disk found for id: "
+ disk);
}
- String[] st = diskPath.split("/"Char == '\\' ? "\\\\" : "/");
+ String[] st = diskPath.split("/");
return st[fi];
}
[3/3] git commit: updated refs/heads/master to 91d8766
Posted by da...@apache.org.
Merge branch 'ovm3firefix' of https://github.com/snuf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/91d87666
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/91d87666
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/91d87666
Branch: refs/heads/master
Commit: 91d87666a6b8b8357b1694e049955c736c0a8f1a
Parents: e2fe8e6 e7d7643
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Mar 27 12:11:18 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri Mar 27 12:11:18 2015 +0100
----------------------------------------------------------------------
.../hypervisor/ovm3/objects/StoragePlugin.java | 4 +-
.../com/cloud/hypervisor/ovm3/objects/Xen.java | 2 +-
.../ovm3/resources/Ovm3StorageProcessor.java | 56 ++++++++++----------
.../ovm3/resources/helpers/Ovm3StoragePool.java | 2 +-
.../ovm3/resources/helpers/Ovm3VmSupport.java | 4 +-
.../ovm3/objects/StoragePluginTest.java | 2 +-
6 files changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------