From 66a2d8a0b498e40fb6abc1a7fa081062008049b0 Mon Sep 17 00:00:00 2001 From: Fang Wang Date: Wed, 29 Aug 2012 15:12:28 -0700 Subject: [PATCH] cs-15627 Metadata should not expose "instance-id","vm-id" information to the regular User Description: Add the fix for the instance-id output. instance-id displays the UUID as well now. reviewed-by: vijay --- .../com/cloud/network/element/CloudZonesNetworkElement.java | 6 +++--- .../network/router/VirtualNetworkApplianceManagerImpl.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/src/com/cloud/network/element/CloudZonesNetworkElement.java b/server/src/com/cloud/network/element/CloudZonesNetworkElement.java index 1c8b3be883b..5470e3920ac 100644 --- a/server/src/com/cloud/network/element/CloudZonesNetworkElement.java +++ b/server/src/com/cloud/network/element/CloudZonesNetworkElement.java @@ -148,7 +148,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, String vmUuid, String publicKey) { + String userData, String serviceOffering, String zoneName, String guestIpAddress, String vmName, String vmUuid, String publicKey) { VmDataCommand cmd = new VmDataCommand(vmPrivateIpAddress, vmName); cmd.addVmData("userdata", "user-data", userData); @@ -158,7 +158,7 @@ public class CloudZonesNetworkElement extends AdapterBase implements NetworkElem cmd.addVmData("metadata", "local-hostname", vmName); cmd.addVmData("metadata", "public-ipv4", guestIpAddress); cmd.addVmData("metadata", "public-hostname", guestIpAddress); - cmd.addVmData("metadata", "instance-id", vmInstanceName); + cmd.addVmData("metadata", "instance-id", vmUuid); cmd.addVmData("metadata", "vm-id", vmUuid); cmd.addVmData("metadata", "public-keys", publicKey); @@ -208,7 +208,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(), + generateVmDataCommand(nic.getIp4Address(), userData, serviceOffering, zoneName, nic.getIp4Address(), uservm.getVirtualMachine().getHostName(), uservm.getUuid(), sshPublicKey)); try { _agentManager.send(dest.getHost().getId(), cmds); diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index a5ab9e4f339..2da09b76bfa 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -711,7 +711,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, String vmUuid, String publicKey, long guestNetworkId) { + String vmUuid, String publicKey, long guestNetworkId) { VmDataCommand cmd = new VmDataCommand(vmPrivateIpAddress, vmName); cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getRouterControlIp(router.getId())); @@ -738,7 +738,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian } cmd.addVmData("metadata", "public-hostname", router.getPublicIpAddress()); } - cmd.addVmData("metadata", "instance-id", vmInstanceName); + cmd.addVmData("metadata", "instance-id", vmUuid); cmd.addVmData("metadata", "vm-id", vmUuid); cmd.addVmData("metadata", "public-keys", publicKey); @@ -2911,7 +2911,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.getUuid(), publicKey, nic.getNetworkId())); + vm.getHostName(), vm.getUuid(), publicKey, nic.getNetworkId())); }