If vSphere platforms are renamed, check to ensure name is unique.

hyperic · Jun 28, 2010 · b7f4a28 · b7f4a28
1 parent 296d38c
commit b7f4a28
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/hqu/hqapi1/app/ResourceController.groovy b/hqu/hqapi1/app/ResourceController.groovy
@@ -651,7 +651,6 @@ class ResourceController extends ApiController {
                 		def anotherPlatformWithSameName = resourceHelper.find('platform':name)
 
                 		if (anotherPlatformWithSameName) {
-                			// rename platform using this convention: name (fqdn)
                 			def uniqueName = generateVSpherePlatformName(name, fqdn.'@value')
                 			name = uniqueName
                 			config.name = uniqueName
@@ -682,6 +681,15 @@ class ResourceController extends ApiController {
                 		// so keep using that name
                 		name = uniqueName
                 		config.name = uniqueName
+                	} else {
+                		// check to see if the new platform name is already used
+                		def platformWithSameName = resourceHelper.find('platform':name)
+
+                		if (platformWithSameName != null
+                				&& platformWithSameName.id != resource.id) {
+                			name = uniqueName
+                			config.name = uniqueName
+                		}
                 	}
                 }