Revert "Disable VMwareTools detection to avoid unreliable result caused by race-condition when VMwareTools is not ready in guest OS yet and the API is called"
This reverts commit 8e0faaa406651dcd0025b563ed36acbdb733a0d0. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ebc95375 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ebc95375 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ebc95375 Branch: refs/heads/4.2 Commit: ebc95375e23a65d338171d21cf06c31db296d029 Parents: 8e0faaa Author: Kelven Yang <kelv...@gmail.com> Authored: Thu Sep 19 23:05:17 2013 -0700 Committer: Kelven Yang <kelv...@gmail.com> Committed: Thu Sep 19 23:05:17 2013 -0700 ---------------------------------------------------------------------- client/pom.xml | 23 +++++++++++++++----- .../vmware/resource/VmwareResource.java | 17 ++------------- 2 files changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ebc95375/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 119c96e..d25576a 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -16,8 +16,8 @@ <parent> <groupId>org.apache.cloudstack</groupId> <artifactId>cloudstack</artifactId> - <version>4.3.0-SNAPSHOT</version> - </parent> + <version>4.2.0-SNAPSHOT</version> + </parent> <dependencies> <dependency> <groupId>org.apache.cloudstack</groupId> @@ -173,6 +173,7 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> + <version>${cs.mysql.version}</version> <scope>runtime</scope> </dependency> <dependency> @@ -195,6 +196,13 @@ <artifactId>cloud-engine-components-api</artifactId> <version>${project.version}</version> </dependency> + + <dependency> + <groupId>org.apache.cloudstack</groupId> + <artifactId>cloud-engine-compute</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-engine-network</artifactId> @@ -282,6 +290,7 @@ </dependency> </dependencies> <build> + <defaultGoal>install</defaultGoal> <plugins> <plugin> <groupId>ru.concerteza.buildnumber</groupId> @@ -329,8 +338,8 @@ <maxIdleTime>60000</maxIdleTime> </connector> </connectors> - <webXml>${project.build.directory}/generated-webapp/WEB-INF/web.xml</webXml> - <webAppSourceDirectory>${project.build.directory}/generated-webapp</webAppSourceDirectory> + <webXml>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</webXml> + <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory> <webAppConfig> <contextPath>/client</contextPath> <extraClasspath>${project.build.directory}/utilities/scripts/db/;${project.build.directory}/utilities/scripts/db/db/</extraClasspath> @@ -382,7 +391,10 @@ <fileset dir="${basedir}/../scripts" /> </copy> <!-- CLOUDSTACK-1304 --> - <chmod perm="755" file="${basedir}/target/generated-webapp/WEB-INF/classes/scripts/**" type="both" /> + <chmod perm="755"> + <fileset + dir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts" /> + </chmod> <copy todir="${basedir}/target/generated-webapp/WEB-INF/"> <fileset dir="${basedir}/WEB-INF/"> <include name="web.xml" /> @@ -549,6 +561,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> + <version>2.5.1</version> <executions> <execution> <id>copy</id> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ebc95375/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index b80fd40..0e9ce93 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -1659,13 +1659,12 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa throw new Exception(msg); } -/* if(!isVMWareToolsInstalled(vmMo)){ String errMsg = "vmware tools is not installed or not running, cannot add nic to vm " + vmName; s_logger.debug(errMsg); return new PlugNicAnswer(cmd, false, "Unable to execute PlugNicCommand due to " + errMsg); } -*/ + // TODO need a way to specify the control of NIC device type VirtualEthernetCardType nicDeviceType = VirtualEthernetCardType.E1000; @@ -1740,13 +1739,12 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa throw new Exception(msg); } -/* if(!isVMWareToolsInstalled(vmMo)){ String errMsg = "vmware tools not installed or not running, cannot remove nic from vm " + vmName; s_logger.debug(errMsg); return new UnPlugNicAnswer(cmd, false, "Unable to execute unPlugNicCommand due to " + errMsg); } -*/ + VirtualDevice nic = findVirtualNicDevice(vmMo, cmd.getNic().getMac()); if ( nic == null ) { return new UnPlugNicAnswer(cmd, true, "success"); @@ -6871,17 +6869,6 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa private boolean isVMWareToolsInstalled(VirtualMachineMO vmMo) throws Exception{ GuestInfo guestInfo = vmMo.getVmGuestInfo(); - if(guestInfo == null) { - s_logger.error("null GuestInfo is returned"); - return false; - } - - if(guestInfo.getGuestState() == null) { - s_logger.error("null GuestState is returned"); - return false; - } - - s_logger.info("VMwareTools guest state: " + guestInfo.getGuestState()); return (guestInfo != null && guestInfo.getGuestState() != null && guestInfo.getGuestState().equalsIgnoreCase("running")); } }
