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

Koushik Das · Abhinandan Prateek · commit 070856affd4e · 2013-01-18T16:49:52.000+05:30
Signed-off-by: Koushik Das &lt;koushik.das@citrix.com&gt;
Signed-off-by: Abhinandan Prateek &lt;aprateek@apache.org&gt;
diff --git a/core/src/com/cloud/network/resource/TrafficSentinelResource.java b/core/src/com/cloud/network/resource/TrafficSentinelResource.java
@@ -108,7 +108,7 @@ public StartupCommand[] initialize() {
         cmd.setPod("");
         cmd.setPrivateIpAddress(_ip);
         cmd.setStorageIpAddress("");
-        cmd.setVersion("");
+        cmd.setVersion(TrafficSentinelResource.class.getPackage().getImplementationVersion());
         cmd.setGuid(_guid);		
     	return new StartupCommand[]{cmd};
     }
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
@@ -3984,7 +3984,7 @@ public StartupCommand[] initialize() {
         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()];
diff --git a/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java b/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java
@@ -196,7 +196,7 @@ public StartupCommand[] initialize() {
 		cmd.setPod("");
     	cmd.setPrivateIpAddress(_ip);
     	cmd.setStorageIpAddress("");
-    	cmd.setVersion("");
+    	cmd.setVersion(F5BigIpResource.class.getPackage().getImplementationVersion());
     	cmd.setGuid(_guid);
     	return new StartupCommand[]{cmd};
     }
diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
@@ -447,7 +447,7 @@ public StartupCommand[] initialize() {
         cmd.setPod("");
         cmd.setPrivateIpAddress(_ip);
         cmd.setStorageIpAddress("");
-        cmd.setVersion("");
+        cmd.setVersion(JuniperSrxResource.class.getPackage().getImplementationVersion());
         cmd.setGuid(_guid);
         return new StartupCommand[]{cmd};
     }
diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
@@ -369,7 +369,7 @@ public StartupCommand[] initialize() {
         cmd.setPod("");
         cmd.setPrivateIpAddress(_ip);
         cmd.setStorageIpAddress("");
-        cmd.setVersion("");
+        cmd.setVersion(NetscalerResource.class.getPackage().getImplementationVersion());
         cmd.setGuid(_guid);
         return new StartupCommand[]{cmd};
     }
diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/NiciraNvpResource.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/NiciraNvpResource.java
@@ -166,7 +166,7 @@ public StartupCommand[] initialize() {
         sc.setPod("");
         sc.setPrivateIpAddress("");
         sc.setStorageIpAddress("");
-        sc.setVersion("");
+        sc.setVersion(NiciraNvpResource.class.getPackage().getImplementationVersion());
         return new StartupCommand[] { sc };
     }
 
diff --git a/server/src/com/cloud/baremetal/ExternalDhcpResourceBase.java b/server/src/com/cloud/baremetal/ExternalDhcpResourceBase.java
@@ -127,7 +127,7 @@ public StartupCommand[] initialize() {
 		cmd.setPod(_podId);
 		cmd.setPrivateIpAddress(_ip);
 		cmd.setStorageIpAddress("");
-		cmd.setVersion("");
+		cmd.setVersion(ExternalDhcpResourceBase.class.getPackage().getImplementationVersion());
 		cmd.setGuid(_guid);
 		return new StartupCommand[]{cmd};
 	}
diff --git a/server/src/com/cloud/baremetal/PxeServerResourceBase.java b/server/src/com/cloud/baremetal/PxeServerResourceBase.java
@@ -114,7 +114,7 @@ public StartupCommand[] initialize() {
 		cmd.setPod(_podId);
 		cmd.setPrivateIpAddress(_ip);
 		cmd.setStorageIpAddress("");
-		cmd.setVersion("");
+		cmd.setVersion(PxeServerResourceBase.class.getPackage().getImplementationVersion());
 		cmd.setGuid(_guid);
 		return new StartupCommand[]{cmd};
 	}
diff --git a/server/src/com/cloud/resource/DummyHostServerResource.java b/server/src/com/cloud/resource/DummyHostServerResource.java
@@ -91,7 +91,7 @@ public StartupCommand[] initialize() {
         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};
 	}
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -1772,6 +1772,7 @@ public HostVO fillRoutingHostVO(HostVO host, StartupRoutingCommand ssCmd, Hyperv
         host.setTotalMemory(ssCmd.getMemory());
         host.setSpeed(ssCmd.getSpeed());
         host.setHypervisorType(hyType);
+        host.setHypervisorVersion(ssCmd.getHypervisorVersion());
         return host;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public StartupCommand[] initialize() {`
`108`	`108`	`cmd.setPod("");`
`109`	`109`	`cmd.setPrivateIpAddress(_ip);`
`110`	`110`	`cmd.setStorageIpAddress("");`
`111`		`- cmd.setVersion("");`
	`111`	`+ cmd.setVersion(TrafficSentinelResource.class.getPackage().getImplementationVersion());`
`112`	`112`	`cmd.setGuid(_guid);`
`113`	`113`	`return new StartupCommand[]{cmd};`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public StartupCommand[] initialize() {`
`196`	`196`	`cmd.setPod("");`
`197`	`197`	`cmd.setPrivateIpAddress(_ip);`
`198`	`198`	`cmd.setStorageIpAddress("");`
`199`		`- cmd.setVersion("");`
	`199`	`+ cmd.setVersion(F5BigIpResource.class.getPackage().getImplementationVersion());`
`200`	`200`	`cmd.setGuid(_guid);`
`201`	`201`	`return new StartupCommand[]{cmd};`
`202`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -447,7 +447,7 @@ public StartupCommand[] initialize() {`
`447`	`447`	`cmd.setPod("");`
`448`	`448`	`cmd.setPrivateIpAddress(_ip);`
`449`	`449`	`cmd.setStorageIpAddress("");`
`450`		`- cmd.setVersion("");`
	`450`	`+ cmd.setVersion(JuniperSrxResource.class.getPackage().getImplementationVersion());`
`451`	`451`	`cmd.setGuid(_guid);`
`452`	`452`	`return new StartupCommand[]{cmd};`
`453`	`453`	`}`
Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ public StartupCommand[] initialize() {`
`369`	`369`	`cmd.setPod("");`
`370`	`370`	`cmd.setPrivateIpAddress(_ip);`
`371`	`371`	`cmd.setStorageIpAddress("");`
`372`		`- cmd.setVersion("");`
	`372`	`+ cmd.setVersion(NetscalerResource.class.getPackage().getImplementationVersion());`
`373`	`373`	`cmd.setGuid(_guid);`
`374`	`374`	`return new StartupCommand[]{cmd};`
`375`	`375`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public StartupCommand[] initialize() {`
`166`	`166`	`sc.setPod("");`
`167`	`167`	`sc.setPrivateIpAddress("");`
`168`	`168`	`sc.setStorageIpAddress("");`
`169`		`- sc.setVersion("");`
	`169`	`+ sc.setVersion(NiciraNvpResource.class.getPackage().getImplementationVersion());`
`170`	`170`	`return new StartupCommand[] { sc };`
`171`	`171`	`}`
`172`	`172`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public StartupCommand[] initialize() {`
`127`	`127`	`cmd.setPod(_podId);`
`128`	`128`	`cmd.setPrivateIpAddress(_ip);`
`129`	`129`	`cmd.setStorageIpAddress("");`
`130`		`- cmd.setVersion("");`
	`130`	`+ cmd.setVersion(ExternalDhcpResourceBase.class.getPackage().getImplementationVersion());`
`131`	`131`	`cmd.setGuid(_guid);`
`132`	`132`	`return new StartupCommand[]{cmd};`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public StartupCommand[] initialize() {`
`114`	`114`	`cmd.setPod(_podId);`
`115`	`115`	`cmd.setPrivateIpAddress(_ip);`
`116`	`116`	`cmd.setStorageIpAddress("");`
`117`		`- cmd.setVersion("");`
	`117`	`+ cmd.setVersion(PxeServerResourceBase.class.getPackage().getImplementationVersion());`
`118`	`118`	`cmd.setGuid(_guid);`
`119`	`119`	`return new StartupCommand[]{cmd};`
`120`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public StartupCommand[] initialize() {`
`91`	`91`	`cmd.setPublicIpAddress(getHostStoragePrivateIp());`
`92`	`92`	`cmd.setPublicMacAddress(getHostStorageMacAddress().toString());`
`93`	`93`	`cmd.setPublicNetmask("255.255.0.0");`
`94`		`- cmd.setVersion("1.0");`
	`94`	`+ cmd.setVersion(DummyHostServerResource.class.getPackage().getImplementationVersion());`
`95`	`95`
`96`	`96`	`return new StartupCommand[] {cmd};`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1772,6 +1772,7 @@ public HostVO fillRoutingHostVO(HostVO host, StartupRoutingCommand ssCmd, Hyperv`
`1772`	`1772`	`host.setTotalMemory(ssCmd.getMemory());`
`1773`	`1773`	`host.setSpeed(ssCmd.getSpeed());`
`1774`	`1774`	`host.setHypervisorType(hyType);`
	`1775`	`+ host.setHypervisorVersion(ssCmd.getHypervisorVersion());`
`1775`	`1776`	`return host;`
`1776`	`1777`	`}`
`1777`	`1778`