[HHQ-3235] Add <ResourceInfo> block for service autoIdentifier. Allow…

… updates of this field via sync.
hyperic · Jul 9, 2009 · ceee69b · ceee69b
1 parent 26e14b4
commit ceee69b
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/hqu/hqapi1/app/ResourceController.groovy b/hqu/hqapi1/app/ResourceController.groovy
@@ -57,7 +57,8 @@ class ResourceController extends ApiController {
                     ResourceInfo(key: PROP_INSTALLPATH, value: s.installPath)
                     ResourceInfo(key: PROP_AIIDENIFIER, value: s.autoinventoryIdentifier)
                 } else if (r.isService()) {
-                    // Nothing yet.
+                    def s = r.toService()
+                    ResourceInfo(key: PROP_AIIDENIFIER, value: s.autoinventoryIdentifier)
                 }
             }
         }
@@ -620,6 +621,13 @@ class ResourceController extends ApiController {
                 if (installpath) {
                     config.put(PROP_INSTALLPATH, installpath.'@value')
                 }
+            } else if (prototype.isServicePrototype()) {
+                def aiid = xmlResource['ResourceInfo'].find {
+                    it.'@key' == PROP_AIIDENIFIER
+                }
+                if (aiid) {
+                    config.put(PROP_AIIDENIFIER, aiid.'@value')
+                }
             }
 
             // Update
@@ -696,6 +704,12 @@ class ResourceController extends ApiController {
             } else if (prototype.isServicePrototype()) {
 
                 try {
+                    def aiid = xmlResource['ResourceInfo'].find {
+                        it.'@key' == PROP_AIIDENIFIER
+                    }
+                    if (aiid) {
+                        config.put(PROP_AIIDENIFIER, aiid.'@value')
+                    }
                     resource = prototype.createInstance(parent, name,
                                                         user, config)
                 } catch (IllegalArgumentException e) {