From b0b2d594a0c65fbfa7a729a47ada475966a41c69 Mon Sep 17 00:00:00 2001
From: prachi <prachi@cloud.com>
Date: Fri, 8 Apr 2011 10:49:41 -0700
Subject: [PATCH] Bug 8018 - return cloud identifier in some instance metadata

There's an API call "getCloudIdentifier".  it returns some UUID that uniquely identifies a cloud.

This bug is to set the value of the instace metadata field cloud-identifier to "CloudStack-{result of getCloudIdentifier}.  This metadata is programmed into
the virtual router by the management server.
---
 .../router/VirtualNetworkApplianceManagerImpl.java        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 55d12dd0044..dd6736dca7a 100644
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -621,6 +621,14 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
         cmd.addVmData("metadata", "instance-id", vmInstanceName);
         cmd.addVmData("metadata", "vm-id", String.valueOf(vmId));
         cmd.addVmData("metadata", "public-keys", publicKey);
+        
+        String cloudIdentifier = _configDao.getValue("cloud.identifier");
+    	if (cloudIdentifier == null) {
+    	    cloudIdentifier = "";
+    	}else{
+    		cloudIdentifier = "CloudStack-{"+cloudIdentifier+"}";
+    	}
+        cmd.addVmData("metadata", "cloud-identifier", cloudIdentifier);
 
         return cmd;
     }