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 <[email protected]> Signed-off-by: Abhinandan Prateek <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/070856af Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/070856af Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/070856af Branch: refs/heads/cloud-agent-with-openvswitch Commit: 070856affd4e5b0baef7730aeb2c245775ee6872 Parents: 51c1ca7 Author: Koushik Das <[email protected]> Authored: Thu Jan 17 18:04:36 2013 +0530 Committer: Abhinandan Prateek <[email protected]> Committed: Fri Jan 18 16:49:52 2013 +0530 ---------------------------------------------------------------------- .../network/resource/TrafficSentinelResource.java | 2 +- .../hypervisor/vmware/resource/VmwareResource.java | 2 +- .../cloud/network/resource/F5BigIpResource.java | 2 +- .../cloud/network/resource/JuniperSrxResource.java | 2 +- .../cloud/network/resource/NetscalerResource.java | 2 +- .../cloud/network/resource/NiciraNvpResource.java | 2 +- .../cloud/baremetal/ExternalDhcpResourceBase.java | 2 +- .../com/cloud/baremetal/PxeServerResourceBase.java | 2 +- .../cloud/resource/DummyHostServerResource.java | 2 +- .../com/cloud/resource/ResourceManagerImpl.java | 1 + 10 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/070856af/core/src/com/cloud/network/resource/TrafficSentinelResource.java ---------------------------------------------------------------------- diff --git a/core/src/com/cloud/network/resource/TrafficSentinelResource.java b/core/src/com/cloud/network/resource/TrafficSentinelResource.java index a13e080..22deccf 100644 --- a/core/src/com/cloud/network/resource/TrafficSentinelResource.java +++ b/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}; } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/070856af/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 a444cfe..dd917f7 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 @@ -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()]; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/070856af/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java ---------------------------------------------------------------------- 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 index c9c3711..80a7a85 100644 --- 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 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}; } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/070856af/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java ---------------------------------------------------------------------- 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 index f823ab8..11ff296 100644 --- 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 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}; } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/070856af/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java ---------------------------------------------------------------------- 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 index afb0135..ca8c8a7 100644 --- 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 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}; } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/070856af/plugins/network-elements/nicira-nvp/src/com/cloud/network/resource/NiciraNvpResource.java ---------------------------------------------------------------------- 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 index 12ed72a..027f451 100644 --- 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 class NiciraNvpResource implements ServerResource { sc.setPod(""); sc.setPrivateIpAddress(""); sc.setStorageIpAddress(""); - sc.setVersion(""); + sc.setVersion(NiciraNvpResource.class.getPackage().getImplementationVersion()); return new StartupCommand[] { sc }; } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/070856af/server/src/com/cloud/baremetal/ExternalDhcpResourceBase.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/baremetal/ExternalDhcpResourceBase.java b/server/src/com/cloud/baremetal/ExternalDhcpResourceBase.java index cbfcfd1..69846ac 100644 --- a/server/src/com/cloud/baremetal/ExternalDhcpResourceBase.java +++ b/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}; } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/070856af/server/src/com/cloud/baremetal/PxeServerResourceBase.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/baremetal/PxeServerResourceBase.java b/server/src/com/cloud/baremetal/PxeServerResourceBase.java index c307ccf..46982b1 100644 --- a/server/src/com/cloud/baremetal/PxeServerResourceBase.java +++ b/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}; } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/070856af/server/src/com/cloud/resource/DummyHostServerResource.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/resource/DummyHostServerResource.java b/server/src/com/cloud/resource/DummyHostServerResource.java index 5144a91..d300f6b 100644 --- a/server/src/com/cloud/resource/DummyHostServerResource.java +++ b/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}; } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/070856af/server/src/com/cloud/resource/ResourceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index ffc09f0..b6ee747 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/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; }
