Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 26A4110147 for ; Thu, 9 May 2013 00:20:32 +0000 (UTC) Received: (qmail 4660 invoked by uid 500); 9 May 2013 00:20:19 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 4585 invoked by uid 500); 9 May 2013 00:20:19 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 3196 invoked by uid 99); 9 May 2013 00:20:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 May 2013 00:20:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A571288A353; Thu, 9 May 2013 00:20:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: prachidamle@apache.org To: commits@cloudstack.apache.org Date: Thu, 09 May 2013 00:21:06 -0000 Message-Id: In-Reply-To: <60df0cca76c041c4985289effb9ebff7@git.apache.org> References: <60df0cca76c041c4985289effb9ebff7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [55/91] [abbrv] git commit: updated refs/heads/planner_reserve to fb18223 Fixed up the simulator to run with windows paths in cygwin Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bc823f94 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bc823f94 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bc823f94 Branch: refs/heads/planner_reserve Commit: bc823f946c2493ab315a2b7e7ef7dccce9950994 Parents: 2639b9f Author: Alex Huang Authored: Mon May 6 16:34:03 2013 -0700 Committer: Alex Huang Committed: Mon May 6 16:34:41 2013 -0700 ---------------------------------------------------------------------- .../src/com/cloud/simulator/MockSecStorageVO.java | 3 +- .../src/com/cloud/simulator/MockStoragePoolVO.java | 3 +- .../src/com/cloud/simulator/MockVolumeVO.java | 3 +- server/pom.xml | 5 --- test/integration/smoke/test_vm_life_cycle.py | 2 + tools/marvin/pom.xml | 24 +++++++++++++- 6 files changed, 30 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc823f94/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecStorageVO.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecStorageVO.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecStorageVO.java index 532d2a7..87905ee 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecStorageVO.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockSecStorageVO.java @@ -48,6 +48,7 @@ public class MockSecStorageVO implements InternalIdentity { } + @Override public long getId() { return this.id; } @@ -57,7 +58,7 @@ public class MockSecStorageVO implements InternalIdentity { } public void setMountPoint(String mountPoint) { - this.mountPoint = mountPoint; + this.mountPoint = mountPoint.replace('\\', '/'); } public String getUrl() { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc823f94/plugins/hypervisors/simulator/src/com/cloud/simulator/MockStoragePoolVO.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockStoragePoolVO.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockStoragePoolVO.java index 06aa169..7f1b7cc 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockStoragePoolVO.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockStoragePoolVO.java @@ -66,6 +66,7 @@ public class MockStoragePoolVO implements InternalIdentity { this.hostGuid = hostGuid; } + @Override public long getId() { return this.id; } @@ -91,7 +92,7 @@ public class MockStoragePoolVO implements InternalIdentity { } public void setMountPoint(String mountPoint) { - this.mountPoint = mountPoint; + this.mountPoint = mountPoint.replace('\\', '/'); } public long getCapacity() { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc823f94/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVolumeVO.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVolumeVO.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVolumeVO.java index 6dd59e8..b7191b8 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVolumeVO.java +++ b/plugins/hypervisors/simulator/src/com/cloud/simulator/MockVolumeVO.java @@ -66,6 +66,7 @@ public class MockVolumeVO implements InternalIdentity { @Enumerated(value=EnumType.STRING) private VMTemplateStorageResourceAssoc.Status status; + @Override public long getId() { return id; } @@ -90,7 +91,7 @@ public class MockVolumeVO implements InternalIdentity { } public void setPath(String path) { - this.path = path; + this.path = path.replace('\\', '/'); } public long getPoolId() { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc823f94/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 429d608..808dd3e 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -95,11 +95,6 @@ cloud-framework-events ${project.version} - - org.apache.cloudstack - cloud-utils - ${project.version} - install http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc823f94/test/integration/smoke/test_vm_life_cycle.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py index ae36c64..21c2635 100644 --- a/test/integration/smoke/test_vm_life_cycle.py +++ b/test/integration/smoke/test_vm_life_cycle.py @@ -163,6 +163,8 @@ class TestDeployVM(cloudstackTestCase): cls.services["account"], domainid=domain.id ) + cls.debug(str("============" )) + cls.debug(cls.account.id) cls.service_offering = ServiceOffering.create( cls.apiclient, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc823f94/tools/marvin/pom.xml ---------------------------------------------------------------------- diff --git a/tools/marvin/pom.xml b/tools/marvin/pom.xml index 25134a8..089c445 100644 --- a/tools/marvin/pom.xml +++ b/tools/marvin/pom.xml @@ -221,6 +221,26 @@ + org.codehaus.gmaven + gmaven-plugin + 1.5 + + + setproperty + validate + + execute + + + + pom.properties['resolved.userdir']='${user.dir}'.replace('\','/').replace('D:','/cyg/d'); + pom.properties['resolved.marvin.config']='${marvin.config}'.replace('\','/').replace('D:','/cyg/d'); + + + + + + org.codehaus.mojo exec-maven-plugin 1.2.1 @@ -237,11 +257,11 @@ --with-marvin --marvin-config - ${user.dir}/${marvin.config} + ${resolved.user.dir}/${resolved.marvin.config} --load -a tags=${tag} - ${user.dir}/${test} + ${resolved.user.dir}/${test} -v