apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace db-id by UUID for user VM's vm-id.

Browse Source
This commit is contained in:
Fang Wang 2012-09-10 17:58:53 -07:00 committed by Alena Prokharchyk
parent 9095f0b268
commit 663e250334
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/com/cloud/vm/VirtualMachineProfile.java
View File

@ -104,6 +104,11 @@ public interface VirtualMachineProfile<T extends VirtualMachine> {
*/ */
long getId(); long getId();
/**
* @return virtual machine uuid.
*/
String getUuid();
List<NicProfile> getNics(); List<NicProfile> getNics();
List<VolumeTO> getDisks(); List<VolumeTO> getDisks();

6
server/src/com/cloud/network/element/CloudZonesNetworkElement.java
View File

@ -152,7 +152,7 @@ public class CloudZonesNetworkElement extends AdapterBase implements NetworkElem
} }
private VmDataCommand generateVmDataCommand(String vmPrivateIpAddress, 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); VmDataCommand cmd = new VmDataCommand(vmPrivateIpAddress, vmName);
cmd.addVmData("userdata", "user-data", userData); 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-ipv4", guestIpAddress);
cmd.addVmData("metadata", "public-hostname", guestIpAddress); cmd.addVmData("metadata", "public-hostname", guestIpAddress);
cmd.addVmData("metadata", "instance-id", vmInstanceName); 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); cmd.addVmData("metadata", "public-keys", publicKey);
return cmd; return cmd;
@ -213,7 +213,7 @@ public class CloudZonesNetworkElement extends AdapterBase implements NetworkElem
cmds.addCommand( cmds.addCommand(
"vmdata", "vmdata",
generateVmDataCommand(nic.getIp4Address(), userData, serviceOffering, zoneName, nic.getIp4Address(), uservm.getVirtualMachine().getHostName(), uservm.getVirtualMachine().getInstanceName(), generateVmDataCommand(nic.getIp4Address(), userData, serviceOffering, zoneName, nic.getIp4Address(), uservm.getVirtualMachine().getHostName(), uservm.getVirtualMachine().getInstanceName(),
uservm.getId(), sshPublicKey)); uservm.getUuid(), sshPublicKey));
try { try {
_agentManager.send(dest.getHost().getId(), cmds); _agentManager.send(dest.getHost().getId(), cmds);
} catch (OperationTimedoutException e) { } catch (OperationTimedoutException e) {

6
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -695,7 +695,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
private VmDataCommand generateVmDataCommand(VirtualRouter router, String vmPrivateIpAddress, String userData, private VmDataCommand generateVmDataCommand(VirtualRouter router, String vmPrivateIpAddress, String userData,
String serviceOffering, String zoneName, String guestIpAddress, String vmName, 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); VmDataCommand cmd = new VmDataCommand(vmPrivateIpAddress, vmName);
cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId())); 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", "public-hostname", router.getPublicIpAddress());
} }
cmd.addVmData("metadata", "instance-id", vmInstanceName); 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); cmd.addVmData("metadata", "public-keys", publicKey);
String cloudIdentifier = _configDao.getValue("cloud.identifier"); String cloudIdentifier = _configDao.getValue("cloud.identifier");
@ -2816,7 +2816,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
String zoneName = _dcDao.findById(router.getDataCenterIdToDeployIn()).getName(); String zoneName = _dcDao.findById(router.getDataCenterIdToDeployIn()).getName();
cmds.addCommand("vmdata", cmds.addCommand("vmdata",
generateVmDataCommand(router, nic.getIp4Address(), vm.getUserData(), serviceOffering, zoneName, nic.getIp4Address(), 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()));
} }

5
server/src/com/cloud/vm/VirtualMachineProfileImpl.java
View File

@ -128,6 +128,11 @@ public class VirtualMachineProfileImpl<T extends VMInstanceVO> implements Virtua
return _vm.getId(); return _vm.getId();
} }
@Override
public String getUuid() {
return _vm.getUuid();
}
public void setNics(List<NicProfile> nics) { public void setNics(List<NicProfile> nics) {
_nics = nics; _nics = nics;
} }