cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [55/90] [abbrv] git commit: updated refs/heads/ui-cisco-asa1000v-support to c1e9e4d
Date Wed, 08 May 2013 17:49:19 GMT
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/ui-cisco-asa1000v-support
Commit: bc823f946c2493ab315a2b7e7ef7dccce9950994
Parents: 2639b9f
Author: Alex Huang <alex.huang@gmail.com>
Authored: Mon May 6 16:34:03 2013 -0700
Committer: Alex Huang <alex.huang@gmail.com>
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 @@
       <artifactId>cloud-framework-events</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-utils</artifactId>
-      <version>${project.version}</version>
-    </dependency>
   </dependencies>
   <build>
     <defaultGoal>install</defaultGoal>

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 @@
       <build>
         <plugins>
           <plugin>
+            <groupId>org.codehaus.gmaven</groupId>
+            <artifactId>gmaven-plugin</artifactId>
+            <version>1.5</version>
+            <executions>
+              <execution>
+                <id>setproperty</id>
+                <phase>validate</phase>
+                <goals>
+                  <goal>execute</goal>
+                </goals>
+                <configuration>
+                  <source>
+                    pom.properties['resolved.userdir']='${user.dir}'.replace('\','/').replace('D:','/cyg/d');
+                    pom.properties['resolved.marvin.config']='${marvin.config}'.replace('\','/').replace('D:','/cyg/d');
+                  </source>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
             <version>1.2.1</version>
@@ -237,11 +257,11 @@
                   <arguments>
                     <argument>--with-marvin</argument>
                     <argument>--marvin-config</argument>
-                    <argument>${user.dir}/${marvin.config}</argument>
+                    <argument>${resolved.user.dir}/${resolved.marvin.config}</argument>
                     <argument>--load</argument>
                     <argument>-a</argument>
                     <argument>tags=${tag}</argument>
-                    <argument>${user.dir}/${test}</argument>
+                    <argument>${resolved.user.dir}/${test}</argument>
                     <argument>-v</argument>
                   </arguments>
                 </configuration>


Mime
View raw message