Fixed up the simulator to run with windows paths in cygwin

xueyuan · xueyuan · commit bc823f946c24 · 2013-05-06T16:34:41.000-07:00
diff --git 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 MockSecStorageVO() {
 
     }
 
+    @Override
     public long getId() {
         return this.id;
     }
@@ -57,7 +58,7 @@ public String getMountPoint() {
     }
 
     public void setMountPoint(String mountPoint) {
-        this.mountPoint = mountPoint;
+        this.mountPoint = mountPoint.replace('\\', '/');
     }
 
     public String getUrl() {
diff --git 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 void setHostGuid(String hostGuid) {
         this.hostGuid = hostGuid;
     }
 
+    @Override
     public long getId() {
         return this.id;
     }
@@ -91,7 +92,7 @@ public String getMountPoint() {
     }
 
     public void setMountPoint(String mountPoint) {
-        this.mountPoint = mountPoint;
+        this.mountPoint = mountPoint.replace('\\', '/');
     }
 
     public long getCapacity() {
diff --git 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 enum MockVolumeType {
     @Enumerated(value=EnumType.STRING)
     private VMTemplateStorageResourceAssoc.Status status;
 
+    @Override
     public long getId() {
         return id;
     }
@@ -90,7 +91,7 @@ public String getPath() {
     }
 
     public void setPath(String path) {
-        this.path = path;
+        this.path = path.replace('\\', '/');
     }
 
     public long getPoolId() {
diff --git 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>
diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py
@@ -163,6 +163,8 @@ def setUpClass(cls):
             cls.services["account"],
             domainid=domain.id
         )
+        cls.debug(str("============" ))
+        cls.debug(cls.account.id)
 
         cls.service_offering = ServiceOffering.create(
             cls.apiclient,
diff --git a/tools/marvin/pom.xml b/tools/marvin/pom.xml
@@ -220,6 +220,26 @@
       </properties>
       <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>
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ public MockSecStorageVO() {`
`48`	`48`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ @Override`
`51`	`52`	`public long getId() {`
`52`	`53`	`return this.id;`
`53`	`54`	`}`
`@@ -57,7 +58,7 @@ public String getMountPoint() {`
`57`	`58`	`}`
`58`	`59`
`59`	`60`	`public void setMountPoint(String mountPoint) {`
`60`		`- this.mountPoint = mountPoint;`
	`61`	`+ this.mountPoint = mountPoint.replace('\\', '/');`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`public String getUrl() {`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ public void setHostGuid(String hostGuid) {`
`66`	`66`	`this.hostGuid = hostGuid;`
`67`	`67`	`}`
`68`	`68`
	`69`	`+ @Override`
`69`	`70`	`public long getId() {`
`70`	`71`	`return this.id;`
`71`	`72`	`}`
`@@ -91,7 +92,7 @@ public String getMountPoint() {`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`public void setMountPoint(String mountPoint) {`
`94`		`- this.mountPoint = mountPoint;`
	`95`	`+ this.mountPoint = mountPoint.replace('\\', '/');`
`95`	`96`	`}`
`96`	`97`
`97`	`98`	`public long getCapacity() {`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ public enum MockVolumeType {`
`66`	`66`	`@Enumerated(value=EnumType.STRING)`
`67`	`67`	`private VMTemplateStorageResourceAssoc.Status status;`
`68`	`68`
	`69`	`+ @Override`
`69`	`70`	`public long getId() {`
`70`	`71`	`return id;`
`71`	`72`	`}`
`@@ -90,7 +91,7 @@ public String getPath() {`
`90`	`91`	`}`
`91`	`92`
`92`	`93`	`public void setPath(String path) {`
`93`		`- this.path = path;`
	`94`	`+ this.path = path.replace('\\', '/');`
`94`	`95`	`}`
`95`	`96`
`96`	`97`	`public long getPoolId() {`
Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,8 @@ def setUpClass(cls):`
`163`	`163`	`cls.services["account"],`
`164`	`164`	`domainid=domain.id`
`165`	`165`	`)`
	`166`	`+ cls.debug(str("============" ))`
	`167`	`+ cls.debug(cls.account.id)`
`166`	`168`
`167`	`169`	`cls.service_offering = ServiceOffering.create(`
`168`	`170`	`cls.apiclient,`