[BZ 1080552] Add the value of the name attribute of the host element …

…to the resource name. This is applicable only to host controllers for now.
rhq-project · May 6, 2014 · f72a2c4 · f72a2c4
1 parent d039b7e
commit f72a2c4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/...ugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/...ugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
@@ -220,7 +220,7 @@ protected DiscoveredResourceDetails buildResourceDetails(ResourceDiscoveryContex
 
         String key = createKeyForLocalResource(serverPluginConfig);
         HostPort hostPort = hostConfig.getDomainControllerHostPort(commandLine);
-        String name = buildDefaultResourceName(hostPort, managementHostPort, productType);
+        String name = buildDefaultResourceName(hostPort, managementHostPort, productType, hostConfig.getHostName());
         String description = buildDefaultResourceDescription(hostPort, productType);
         String version = getVersion(homeDir, productType);
 
@@ -428,7 +428,8 @@ protected File getLogFile(File logDir) {
 
     protected abstract String getLogFileName();
 
-    protected abstract String buildDefaultResourceName(HostPort hostPort, HostPort managementHostPort, JBossProductType productType);
+    protected abstract String buildDefaultResourceName(HostPort hostPort, HostPort managementHostPort,
+        JBossProductType productType, String serverName);
 
     protected abstract String buildDefaultResourceDescription(HostPort hostPort, JBossProductType productType);
 
@@ -458,7 +459,7 @@ public DiscoveredResourceDetails discoverResource(Configuration pluginConfig,
         managementHostPort.host = hostname;
         managementHostPort.port = port;
         String key = createKeyForRemoteResource(hostname + ":" + port);
-        String name = buildDefaultResourceName(hostPort, managementHostPort, productType);
+        String name = buildDefaultResourceName(hostPort, managementHostPort, productType, null);
         String version = productInfo.getProductVersion();
         String description = buildDefaultResourceDescription(hostPort, productType);
 
@@ -484,7 +485,7 @@ public ResourceUpgradeReport upgrade(ResourceUpgradeContext inventoriedResource)
         boolean hasLocalResourcePrefix = currentResourceKey.startsWith(LOCAL_RESOURCE_KEY_PREFIX);
         boolean hasRemoteResourcePrefix = currentResourceKey.startsWith(REMOTE_RESOURCE_KEY_PREFIX);
         if (!hasLocalResourcePrefix && !hasRemoteResourcePrefix) {
-            // Resource key in wrong format 
+            // Resource key in wrong format
             upgraded = true;
             if (new File(currentResourceKey).isDirectory()) {
                 // Old key format for a local resource (key is base dir)

diff --git a/...ns/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java b/...ns/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java
@@ -18,7 +18,6 @@
  */
 package org.rhq.modules.plugins.jbossas7;
 
-import org.rhq.core.pluginapi.util.CommandLineOption;
 import org.rhq.core.system.ProcessInfo;
 import org.rhq.modules.plugins.jbossas7.helper.HostPort;
 
@@ -64,11 +63,18 @@ protected String getLogFileName() {
     }
 
     @Override
-    protected String buildDefaultResourceName(HostPort hostPort, HostPort managementHostPort, JBossProductType productType) {
+    protected String buildDefaultResourceName(HostPort hostPort, HostPort managementHostPort,
+        JBossProductType productType, String serverName) {
         boolean isDomainController = hostPort.isLocal;
         String instanceType = (isDomainController) ? "Domain Controller" : "Host Controller";
+
+        if (serverName != null && !serverName.trim().isEmpty()) {
+            return String.format("%s %s (%s %s:%d)", productType.SHORT_NAME, instanceType, serverName,
+                managementHostPort.host, managementHostPort.port);
+        }
+
         return String.format("%s %s (%s:%d)", productType.SHORT_NAME, instanceType, managementHostPort.host,
-                managementHostPort.port);
+            managementHostPort.port);
     }
 
     @Override

diff --git a/...gins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java b/...gins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java
@@ -64,7 +64,12 @@ protected String getLogFileName() {
 
     @Override
     protected String buildDefaultResourceName(HostPort hostPort, HostPort managementHostPort,
-        JBossProductType productType) {
+        JBossProductType productType, String serverName) {
+        if (serverName != null && !serverName.trim().isEmpty()) {
+            return String.format("%s (%s %s:%d)", productType.SHORT_NAME, serverName, managementHostPort.host,
+                managementHostPort.port);
+        }
+
         return String.format("%s (%s:%d)", productType.SHORT_NAME, managementHostPort.host, managementHostPort.port);
     }