CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version

Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>

core/src/com/cloud/network/resource/TrafficSentinelResource.java

@@ -108,7 +108,7 @@ public class TrafficSentinelResource implements ServerResource {
         cmd.setPod("");
         cmd.setPrivateIpAddress(_ip);
         cmd.setStorageIpAddress("");
-        cmd.setVersion("");
+        cmd.setVersion(TrafficSentinelResource.class.getPackage().getImplementationVersion());
         cmd.setGuid(_guid);		
     	return new StartupCommand[]{cmd};
     }

plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java

@@ -3984,7 +3984,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
         cmd.setHypervisorType(HypervisorType.VMware);
         cmd.setStateChanges(changes);
         cmd.setCluster(_cluster);
-        cmd.setVersion(hostApiVersion);
+        cmd.setHypervisorVersion(hostApiVersion);
 
         List<StartupStorageCommand> storageCmds = initializeLocalStorage();
         StartupCommand[] answerCmds = new StartupCommand[1 + storageCmds.size()];

plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java

@@ -196,7 +196,7 @@ public class F5BigIpResource implements ServerResource {
 		cmd.setPod("");
     	cmd.setPrivateIpAddress(_ip);
     	cmd.setStorageIpAddress("");
-    	cmd.setVersion("");
+    	cmd.setVersion(F5BigIpResource.class.getPackage().getImplementationVersion());
     	cmd.setGuid(_guid);
     	return new StartupCommand[]{cmd};
     }

plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java

@@ -447,7 +447,7 @@ public class JuniperSrxResource implements ServerResource {
         cmd.setPod("");
         cmd.setPrivateIpAddress(_ip);
         cmd.setStorageIpAddress("");
-        cmd.setVersion("");
+        cmd.setVersion(JuniperSrxResource.class.getPackage().getImplementationVersion());
         cmd.setGuid(_guid);
         return new StartupCommand[]{cmd};
     }

plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java

@@ -369,7 +369,7 @@ public class NetscalerResource implements ServerResource {
         cmd.setPod("");
         cmd.setPrivateIpAddress(_ip);
         cmd.setStorageIpAddress("");
-        cmd.setVersion("");
+        cmd.setVersion(NetscalerResource.class.getPackage().getImplementationVersion());
         cmd.setGuid(_guid);
         return new StartupCommand[]{cmd};
     }

plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/NiciraNvpResource.java

@@ -166,7 +166,7 @@ public class NiciraNvpResource implements ServerResource {
         sc.setPod("");
         sc.setPrivateIpAddress("");
         sc.setStorageIpAddress("");
-        sc.setVersion("");
+        sc.setVersion(NiciraNvpResource.class.getPackage().getImplementationVersion());
         return new StartupCommand[] { sc };
     }
 

server/src/com/cloud/baremetal/ExternalDhcpResourceBase.java

@@ -127,7 +127,7 @@ public class ExternalDhcpResourceBase implements ServerResource {
 		cmd.setPod(_podId);
 		cmd.setPrivateIpAddress(_ip);
 		cmd.setStorageIpAddress("");
-		cmd.setVersion("");
+		cmd.setVersion(ExternalDhcpResourceBase.class.getPackage().getImplementationVersion());
 		cmd.setGuid(_guid);
 		return new StartupCommand[]{cmd};
 	}

server/src/com/cloud/baremetal/PxeServerResourceBase.java

@@ -114,7 +114,7 @@ public class PxeServerResourceBase implements ServerResource {
 		cmd.setPod(_podId);
 		cmd.setPrivateIpAddress(_ip);
 		cmd.setStorageIpAddress("");
-		cmd.setVersion("");
+		cmd.setVersion(PxeServerResourceBase.class.getPackage().getImplementationVersion());
 		cmd.setGuid(_guid);
 		return new StartupCommand[]{cmd};
 	}

server/src/com/cloud/resource/DummyHostServerResource.java

@@ -91,7 +91,7 @@ public class DummyHostServerResource extends ServerResourceBase {
         cmd.setPublicIpAddress(getHostStoragePrivateIp());
         cmd.setPublicMacAddress(getHostStorageMacAddress().toString());
         cmd.setPublicNetmask("255.255.0.0");
-        cmd.setVersion("1.0");
+        cmd.setVersion(DummyHostServerResource.class.getPackage().getImplementationVersion());
 
         return new StartupCommand[] {cmd};
 	}

server/src/com/cloud/resource/ResourceManagerImpl.java

@@ -1772,6 +1772,7 @@ public class ResourceManagerImpl implements ResourceManager, ResourceService, Ma
         host.setTotalMemory(ssCmd.getMemory());
         host.setSpeed(ssCmd.getSpeed());
         host.setHypervisorType(hyType);
+        host.setHypervisorVersion(ssCmd.getHypervisorVersion());
         return host;
     }