Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2B8DF9738 for ; Tue, 11 Sep 2012 01:06:03 +0000 (UTC) Received: (qmail 82888 invoked by uid 500); 11 Sep 2012 01:06:02 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 82845 invoked by uid 500); 11 Sep 2012 01:06:02 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 82829 invoked by uid 99); 11 Sep 2012 01:06:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Sep 2012 01:06:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7F20135452; Tue, 11 Sep 2012 01:06:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alena1108@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Replace db-id by UUID for user VM's vm-id. Message-Id: <20120911010602.7F20135452@tyr.zones.apache.org> Date: Tue, 11 Sep 2012 01:06:02 +0000 (UTC) Replace db-id by UUID for user VM's vm-id. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/663e2503 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/663e2503 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/663e2503 Branch: refs/heads/master Commit: 663e2503348c7b629fc914b5b2adad42a4d16ceb Parents: 9095f0b Author: Fang Wang Authored: Mon Sep 10 17:58:53 2012 -0700 Committer: Alena Prokharchyk Committed: Mon Sep 10 18:01:08 2012 -0700 ---------------------------------------------------------------------- api/src/com/cloud/vm/VirtualMachineProfile.java | 5 +++++ .../network/element/CloudZonesNetworkElement.java | 6 +++--- .../router/VirtualNetworkApplianceManagerImpl.java | 6 +++--- .../com/cloud/vm/VirtualMachineProfileImpl.java | 5 +++++ 4 files changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/663e2503/api/src/com/cloud/vm/VirtualMachineProfile.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/vm/VirtualMachineProfile.java b/api/src/com/cloud/vm/VirtualMachineProfile.java index 30aed4e..57277db 100644 --- a/api/src/com/cloud/vm/VirtualMachineProfile.java +++ b/api/src/com/cloud/vm/VirtualMachineProfile.java @@ -104,6 +104,11 @@ public interface VirtualMachineProfile { */ long getId(); + /** + * @return virtual machine uuid. + */ + String getUuid(); + List getNics(); List getDisks(); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/663e2503/server/src/com/cloud/network/element/CloudZonesNetworkElement.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/element/CloudZonesNetworkElement.java b/server/src/com/cloud/network/element/CloudZonesNetworkElement.java index 5f93cac..6dc4be7 100644 --- a/server/src/com/cloud/network/element/CloudZonesNetworkElement.java +++ b/server/src/com/cloud/network/element/CloudZonesNetworkElement.java @@ -152,7 +152,7 @@ public class CloudZonesNetworkElement extends AdapterBase implements NetworkElem } private VmDataCommand generateVmDataCommand(String vmPrivateIpAddress, - String userData, String serviceOffering, String zoneName, String guestIpAddress, String vmName, String vmInstanceName, long vmId, String publicKey) { + String userData, String serviceOffering, String zoneName, String guestIpAddress, String vmName, String vmInstanceName, String vmUuid, String publicKey) { VmDataCommand cmd = new VmDataCommand(vmPrivateIpAddress, vmName); cmd.addVmData("userdata", "user-data", userData); @@ -163,7 +163,7 @@ public class CloudZonesNetworkElement extends AdapterBase implements NetworkElem cmd.addVmData("metadata", "public-ipv4", guestIpAddress); cmd.addVmData("metadata", "public-hostname", guestIpAddress); cmd.addVmData("metadata", "instance-id", vmInstanceName); - cmd.addVmData("metadata", "vm-id", String.valueOf(vmId)); + cmd.addVmData("metadata", "vm-id", vmUuid); cmd.addVmData("metadata", "public-keys", publicKey); return cmd; @@ -213,7 +213,7 @@ public class CloudZonesNetworkElement extends AdapterBase implements NetworkElem cmds.addCommand( "vmdata", generateVmDataCommand(nic.getIp4Address(), userData, serviceOffering, zoneName, nic.getIp4Address(), uservm.getVirtualMachine().getHostName(), uservm.getVirtualMachine().getInstanceName(), - uservm.getId(), sshPublicKey)); + uservm.getUuid(), sshPublicKey)); try { _agentManager.send(dest.getHost().getId(), cmds); } catch (OperationTimedoutException e) { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/663e2503/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index bc92916..d5dd78c 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -695,7 +695,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian private VmDataCommand generateVmDataCommand(VirtualRouter router, String vmPrivateIpAddress, String userData, String serviceOffering, String zoneName, String guestIpAddress, String vmName, - String vmInstanceName, long vmId, String publicKey, long guestNetworkId) { + String vmInstanceName, String vmUuid, String publicKey, long guestNetworkId) { VmDataCommand cmd = new VmDataCommand(vmPrivateIpAddress, vmName); cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId())); @@ -723,7 +723,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian cmd.addVmData("metadata", "public-hostname", router.getPublicIpAddress()); } cmd.addVmData("metadata", "instance-id", vmInstanceName); - cmd.addVmData("metadata", "vm-id", String.valueOf(vmId)); + cmd.addVmData("metadata", "vm-id", vmUuid); cmd.addVmData("metadata", "public-keys", publicKey); String cloudIdentifier = _configDao.getValue("cloud.identifier"); @@ -2816,7 +2816,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian String zoneName = _dcDao.findById(router.getDataCenterIdToDeployIn()).getName(); cmds.addCommand("vmdata", generateVmDataCommand(router, nic.getIp4Address(), vm.getUserData(), serviceOffering, zoneName, nic.getIp4Address(), - vm.getHostName(), vm.getInstanceName(), vm.getId(), publicKey, nic.getNetworkId())); + vm.getHostName(), vm.getInstanceName(), vm.getUuid(), publicKey, nic.getNetworkId())); } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/663e2503/server/src/com/cloud/vm/VirtualMachineProfileImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/VirtualMachineProfileImpl.java b/server/src/com/cloud/vm/VirtualMachineProfileImpl.java index 6028c95..e83d6a0 100644 --- a/server/src/com/cloud/vm/VirtualMachineProfileImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineProfileImpl.java @@ -128,6 +128,11 @@ public class VirtualMachineProfileImpl implements Virtua return _vm.getId(); } + @Override + public String getUuid() { + return _vm.getUuid(); + } + public void setNics(List nics) { _nics = nics; }