rhq-commits July 2011

rhq-commits@lists.fedorahosted.org

12 participants
245 discussions

[rhq] 2 commits - modules/enterprise
by ips 11 Jul '11

11 Jul '11

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) New commits: commit c45b0da4437328530ac99cae0044c32c882526b0 Merge: b8dc201 054b9b6 Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Jul 11 15:06:43 2011 -0400 Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq commit b8dc20126741ce3670ead2da43ff40c515bc4a15 Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Jul 11 15:03:50 2011 -0400 don't display Monitoring tab for a compat group that has no metrics defined diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java index e980129..88d754b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. + * Copyright (C) 2005-2011 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -261,9 +261,11 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource } private void updateMonitoringTab(final int groupId, GroupCategory groupCategory, Set<ResourceTypeFacet> facets) { - boolean visible; ViewFactory viewFactory; - if (updateTab(this.monitoringTab, groupCategory == GroupCategory.COMPATIBLE, true)) { + // TODO: Once we add an Availability subtab, the Monitoring tab will always be visible, even for groups with + // no metrics. + boolean visible = hasMetricsOfType(this.groupComposite, null); + if (updateTab(this.monitoringTab, visible, true)) { visible = hasMetricsOfType(this.groupComposite, DataType.MEASUREMENT); viewFactory = (!visible) ? null : new ViewFactory() { @Override

1 0

[rhq] Branch 'drift' - 2 commits - modules/enterprise modules/plugins
by mazz 11 Jul '11

11 Jul '11

modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml | 7 ++-- modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml | 16 ++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) New commits: commit 6875f2a02765737685e3f2dea3b04df421aee5e2 Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Jul 11 14:57:23 2011 -0400 add the ability to perform drift monitoring on platform resources diff --git a/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml index 40f6975..d5f3932 100644 --- a/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml @@ -39,6 +39,14 @@ </destination-base-dir> </bundle-target> '> + <!ENTITY driftConfig ' + <drift-configuration name="File System"> + <basedir> + <value-context>fileSystem</value-context> + <value-name>/</value-name> + </basedir> + </drift-configuration> +'> <!ENTITY metrics ' <metric displayName="Hostname" property="Trait.hostname" @@ -257,6 +265,7 @@ </configuration> </content> + &driftConfig; &bundleTarget; </platform> @@ -353,6 +362,7 @@ </content> --> + &driftConfig; &bundleTarget; </platform> @@ -372,6 +382,7 @@ &platformCpu; &metrics; &syslogEventDefinition; + &driftConfig; &bundleTarget; </platform> @@ -385,6 +396,7 @@ &nativeMetrics; &platformCpu; &metrics; + &driftConfig; &bundleTarget; </platform> @@ -397,6 +409,7 @@ &nativeMetrics; &platformCpu; &metrics; + &driftConfig; &bundleTarget; </platform> @@ -409,6 +422,7 @@ &nativeMetrics; &platformCpu; &metrics; + &driftConfig; &bundleTarget; </platform> @@ -426,6 +440,7 @@ &platformCpu; &metrics; &syslogEventDefinition; + &driftConfig; &bundleTarget; </platform> @@ -436,6 +451,7 @@ &platformSubcategories; &platformOperations; &metrics; + &driftConfig; &bundleTarget; </platform> commit 5310603b07fae5e9f05b51629268cbb7d94f8b7a Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Jul 11 14:52:58 2011 -0400 fix InventoryManagerBeanTest diff --git a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml index cf2c277..6efb823 100644 --- a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml +++ b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml @@ -5,6 +5,10 @@ <rhq_conf_prop_def_enum/> <rhq_config_prop_constr/> + <rhq_config/> + <rhq_config_property/> + <rhq_config_template/> + <rhq_resource_type id="1" name="TestServer1" category="SERVER" @@ -75,9 +79,6 @@ <rhq_operation_def/> <rhq_package_type/> <rhq_bundle_type/> - <rhq_config/> - <rhq_config_property/> - <rhq_config_template/> <rhq_resource id="1" resource_type_id="1"

1 0

[rhq] Branch 'mod_cluster_plugin' - modules/plugins
by snegrea 11 Jul '11

11 Jul '11

modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ContextComponent.java | 30 +++++ modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ProxyInfo.java | 56 ++++++++-- modules/plugins/mod-cluster/src/test/java/org/rhq/plugins/modcluster/test/ProxyInfoTest.java | 23 +++- modules/plugins/mod-cluster/src/test/resources/proxy_config/proxy_config_2.txt | 16 ++ 4 files changed, 111 insertions(+), 14 deletions(-) New commits: commit ae2f827b434bb95c2bcf76f7d5a3e1e07f910d90 Author: Stefan Negrea <snegrea(a)redhat.com> Date: Mon Jul 11 13:23:22 2011 -0500 Added availability attribute for contexts. Also improved unit test and coverage. diff --git a/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ContextComponent.java b/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ContextComponent.java index 922197a..8512ed5 100644 --- a/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ContextComponent.java +++ b/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ContextComponent.java @@ -21,6 +21,7 @@ package org.rhq.plugins.modcluster; import org.mc4j.ems.connection.bean.EmsBean; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.pluginapi.operation.OperationResult; import org.rhq.plugins.jmx.MBeanResourceComponent; @@ -36,18 +37,43 @@ public class ContextComponent extends MBeanResourceComponent<MBeanResourceCompon } @Override + public AvailabilityType getAvailability() { + ClassLoader cl = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(getEmsBean().getClass().getClassLoader()); + String rawProxyInfo = (String) getEmsBean().getAttribute("proxyInfo").refresh().toString(); + ProxyInfo proxyInfo = new ProxyInfo(rawProxyInfo); + + ProxyInfo.Context context = ProxyInfo.Context.fromString(resourceContext.getResourceKey()); + + ProxyInfo.Context currentContext = proxyInfo.getAvailableContexts().get( + proxyInfo.getAvailableContexts().indexOf(context)); + + if (currentContext.isEnabled()) { + return AvailabilityType.UP; + } + + return AvailabilityType.DOWN; + } catch (Exception e) { + log.info(e); + return AvailabilityType.DOWN; + } finally { + Thread.currentThread().setContextClassLoader(cl); + } + } + + @Override public OperationResult invokeOperation(String name, Configuration parameters) throws Exception { if ("enableContext".equals(name) || "disableContext".equals(name) || "stopContext".equals(name)) { ProxyInfo.Context context = ProxyInfo.Context.fromString(resourceContext.getResourceKey()); - System.out.println(context.toString()); ClassLoader cl = Thread.currentThread().getContextClassLoader(); try { Thread.currentThread().setContextClassLoader(getEmsBean().getClass().getClassLoader()); Object resultObject = getEmsBean().getOperation(name).invoke( - new Object[] { context.host, context.path }); + new Object[] { context.getHost(), context.getPath() }); return new OperationResult(String.valueOf(resultObject)); } finally { diff --git a/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ProxyInfo.java b/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ProxyInfo.java index 40b24f9..c517364 100644 --- a/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ProxyInfo.java +++ b/modules/plugins/mod-cluster/src/main/java/org/rhq/plugins/modcluster/ProxyInfo.java @@ -50,9 +50,7 @@ public class ProxyInfo { String host = vhostPieces[1].trim(); host = host.substring(host.indexOf(":") + 1).trim(); - System.out.println(identifier + "--" + host); availableVHosts.put(identifier, new Vhost(identifier, host)); - } Pattern contextPattern = Pattern.compile("Context.*[\n|}]"); @@ -65,9 +63,14 @@ public class ProxyInfo { String identifier = contextPieces[0]; identifier = identifier.substring(identifier.indexOf("[") + 1, identifier.indexOf("]")); identifier = identifier.substring(0, identifier.lastIndexOf(":")); + + String rawIsEnabled = contextPieces[2]; + rawIsEnabled = rawIsEnabled.substring(rawIsEnabled.indexOf(':') + 1).trim(); + boolean isEnabled = rawIsEnabled.equals("ENABLED") ? true : false; + Vhost relatedVhost = availableVHosts.get(identifier); - availableContexts.add(new Context(relatedVhost.getHost(), actualContext)); + availableContexts.add(new Context(relatedVhost.getHost(), actualContext, isEnabled)); } } @@ -95,12 +98,18 @@ public class ProxyInfo { } public static class Context { - String path; - String host; + private String path; + private String host; + private boolean isEnabled; public Context(String host, String path) { + this(path, host, false); + } + + public Context(String host, String path, boolean isEnabled) { this.path = path; this.host = host; + this.isEnabled = isEnabled; } public String getPath() { @@ -111,14 +120,49 @@ public class ProxyInfo { return host; } + public boolean isEnabled() { + return isEnabled; + } + @Override public String toString() { return host + ":" + path; } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((host == null) ? 0 : host.hashCode()); + result = prime * result + ((path == null) ? 0 : path.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Context other = (Context) obj; + if (host == null) { + if (other.host != null) + return false; + } else if (!host.equals(other.host)) + return false; + if (path == null) { + if (other.path != null) + return false; + } else if (!path.equals(other.path)) + return false; + return true; + } + public static Context fromString(String stringRepresentation) { String part[] = stringRepresentation.trim().split(":"); - return new Context(part[0], part[1]); + return new Context(part[1], part[0]); } } } \ No newline at end of file diff --git a/modules/plugins/mod-cluster/src/test/java/org/rhq/plugins/modcluster/test/ProxyInfoTest.java b/modules/plugins/mod-cluster/src/test/java/org/rhq/plugins/modcluster/test/ProxyInfoTest.java index be5e987..41bf26a 100644 --- a/modules/plugins/mod-cluster/src/test/java/org/rhq/plugins/modcluster/test/ProxyInfoTest.java +++ b/modules/plugins/mod-cluster/src/test/java/org/rhq/plugins/modcluster/test/ProxyInfoTest.java @@ -37,15 +37,26 @@ public class ProxyInfoTest { @Test public void testProxyInfo() throws IOException { - String testConfiguration = readConfigFile("/proxy_config/proxy_config_1.txt"); + String[] availableFiles = new String[] { "/proxy_config/proxy_config_1.txt", "/proxy_config/proxy_config_2.txt" }; - ProxyInfo proxyInfo = new ProxyInfo(testConfiguration); + for (String testConfigurationFile : availableFiles) { + String testConfiguration = readConfigFile(testConfigurationFile); + ProxyInfo proxyInfo = new ProxyInfo(testConfiguration); - for (ProxyInfo.Context context : proxyInfo.getAvailableContexts()) { - log.info(context.toString()); - } + for (ProxyInfo.Context context : proxyInfo.getAvailableContexts()) { + log.info(context.toString() + " - " + context.isEnabled()); + + log.info(proxyInfo.getAvailableContexts().indexOf(context)); + + assert (proxyInfo.getAvailableContexts().indexOf(context) != -1) : "Equals and hash functions not implemented correctly for " + + ProxyInfo.Context.class.getCanonicalName(); - assert (proxyInfo.getAvailableContexts().size() != 0) : "Raw proxy info parsing failed!"; + assert (context.equals(ProxyInfo.Context.fromString(context.toString())) == true) : "fromString and toString are not equivalent for:" + + ProxyInfo.Context.class.getCanonicalName(); + } + + assert (proxyInfo.getAvailableContexts().size() != 0) : "Raw proxy info parsing failed!"; + } } private String readConfigFile(String filePath) throws IOException { diff --git a/modules/plugins/mod-cluster/src/test/resources/proxy_config/proxy_config_2.txt b/modules/plugins/mod-cluster/src/test/resources/proxy_config/proxy_config_2.txt new file mode 100644 index 0000000..573967a --- /dev/null +++ b/modules/plugins/mod-cluster/src/test/resources/proxy_config/proxy_config_2.txt @@ -0,0 +1,16 @@ +{mobile-work/192.168.1.40:6666=Node: [1],Name: 4e6189af-0502-3305-8ff3-fad7fee8b516,Balancer: mycluster,LBGroup: ,Host: 127.0.0.1,Port: 8009,Type: ajp,Flushpackets: Off,Flushwait: 10,Ping: 10,Smax: 26,Ttl: 60,Elected: 3690,Read: 27864911,Transfered: 0,Connected: 0,Load: 100 +Node: [2],Name: node2,Balancer: mycluster,LBGroup: ,Host: 127.0.0.1,Port: 8009,Type: ajp,Flushpackets: Off,Flushwait: 10,Ping: 10,Smax: 26,Ttl: 60,Elected: 148,Read: 57994,Transfered: 0,Connected: 0,Load: 100 +Vhost: [1:1:1], Alias: test-agent-1 +Vhost: [2:1:2], Alias: remote-agent-2 +Context: [1:1:1], Context: /invoker, Status: DISABLED +Context: [1:1:2], Context: /loaddemo, Status: DISABLED +Context: [1:1:3], Context: /jbossws, Status: DISABLED +Context: [1:1:4], Context: /juddi, Status: DISABLED +Context: [1:1:5], Context: /jbossmq-httpil, Status: DISABLED +Context: [1:1:6], Context: /web-console, Status: DISABLED +Context: [1:1:7], Context: /jmx-console, Status: DISABLED +Context: [1:1:8], Context: /, Status: DISABLED +Context: [2:1:9], Context: /, Status: ENABLED +Context: [2:1:10], Context: /loaddemo, Status: ENABLED +Context: [2:1:11], Context: /juddi, Status: ENABLED +Context: [2:1:12], Context: /invoker, Status: ENABLED} \ No newline at end of file

1 0

[rhq] modules/enterprise
by John Sanda 11 Jul '11

11 Jul '11

modules/enterprise/gui/installer-war/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) New commits: commit 054b9b6c59aafe646b0f72d4f047c7a0f1424adf Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 11 14:01:14 2011 -0400 Adding activation property for oracle profile The oracle profile was not getting activated on hudson, resulting in the db installation/upgrade tests running on oracle. The tests fail because they only support postgresql currently. diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index f5bcd34..517399c 100644 --- a/modules/enterprise/gui/installer-war/pom.xml +++ b/modules/enterprise/gui/installer-war/pom.xml @@ -340,6 +340,12 @@ <profile> <id>oracle</id> + <activation> + <property> + <name>rhq.test.db.type</name> + <value>oracle</value> + </property> + </activation> <build> <plugins> <plugin>

1 0

[rhq] 47 commits - modules/core modules/enterprise modules/helpers modules/plugins modules/test-utils pom.xml
by lkrejci 11 Jul '11

11 Jul '11

modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java | 88 + modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeDelegate.java | 9 modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java | 63 modules/core/plugin-container/src/test/java/org/rhq/test/pc/PluginContainerSetup.java | 3 modules/core/plugin-container/src/test/java/org/rhq/test/pc/PluginContainerTest.java | 4 modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java | 72 modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java | 14 modules/helpers/inventory-serializer/inventory-serializer.sh | 4 modules/helpers/inventory-serializer/pom.xml | 127 + modules/helpers/inventory-serializer/src/main/java/org/rhq/helpers/inventoryserializer/Main.java | 221 ++ modules/helpers/inventory-serializer/src/main/java/org/rhq/helpers/inventoryserializer/util/ChildFirstClassLoader.java | 125 + modules/helpers/inventory-serializer/src/main/resources/log4j.properties | 8 modules/helpers/pom.xml | 2 modules/plugins/apache/pom.xml | 123 + modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java | 14 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java | 37 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java | 40 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VHostSpec.java | 4 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VirtualHostLegacyResourceKeyUtil.java | 90 - modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java | 12 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java | 776 ++++++++++ modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeConfigurationWithIncludesFromRHQ1_3Test.java | 36 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeMessyConfigurationFromRHQ1_3Test.java | 35 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeNestedConfigurationFromRHQ1_3Test.java | 171 ++ modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeSimpleConfigurationFromRHQ1_3Test.java | 153 + modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeConfigurationWithIncludesFromRHQ3_0_0Test.java | 36 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeMessyConfigurationFromRHQ3_0_0Test.java | 34 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeNestedConfigurationFromRHQ3_0_0Test.java | 378 ++++ modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java | 332 ++++ modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeConfigurationWithIncludesFromRHQ3_0_1Test.java | 38 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeMessyConfigurationFromRHQ3_0_1Test.java | 38 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeNestedConfigurationFromRHQ3_0_1Test.java | 479 ++++++ modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java | 467 ++++++ modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeConfigurationWithIncludesFromRHQ3_0_2Test.java | 34 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeMessyConfigurationFromRHQ3_0_2Test.java | 36 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeNestedConfigurationFromRHQ3_0_2Test.java | 206 ++ modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeSimpleConfigurationFromRHQ3_0_2Test.java | 180 ++ modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java | 453 +++++ modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java | 147 + modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/StandAloneContainer.java | 75 modules/plugins/apache/src/test/resources/full-configurations/1.3.x/includes/1.vhost.conf | 9 modules/plugins/apache/src/test/resources/full-configurations/1.3.x/includes/2.vhost.conf | 9 modules/plugins/apache/src/test/resources/full-configurations/1.3.x/includes/httpd.conf | 40 modules/plugins/apache/src/test/resources/full-configurations/1.3.x/mess/1.vhost.conf | 17 modules/plugins/apache/src/test/resources/full-configurations/1.3.x/mess/2.vhost.conf | 13 modules/plugins/apache/src/test/resources/full-configurations/1.3.x/mess/httpd.conf | 40 modules/plugins/apache/src/test/resources/full-configurations/1.3.x/nested/httpd.conf | 68 modules/plugins/apache/src/test/resources/full-configurations/1.3.x/simple/httpd.conf | 47 modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/1.vhost.conf | 9 modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/2.vhost.conf | 9 modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/httpd.conf | 29 modules/plugins/apache/src/test/resources/full-configurations/2.2.x/mess/1.vhost.conf | 17 modules/plugins/apache/src/test/resources/full-configurations/2.2.x/mess/2.vhost.conf | 13 modules/plugins/apache/src/test/resources/full-configurations/2.2.x/mess/httpd.conf | 29 modules/plugins/apache/src/test/resources/full-configurations/2.2.x/nested/httpd.conf | 57 modules/plugins/apache/src/test/resources/full-configurations/2.2.x/simple/httpd.conf | 47 modules/plugins/apache/src/test/resources/log4j.xml | 2 modules/plugins/apache/src/test/resources/mocked-inventories/generating.query | 1 modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory-single-vhost.xml | 215 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory.xml | 539 ++++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/mess/inventory-single-vhost.xml | 215 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/mess/inventory.xml | 543 ++++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/nested/inventory-single-vhost.xml | 215 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/nested/inventory.xml | 543 ++++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory-single-vhost.xml | 215 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory.xml | 539 ++++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp-anyaddr.xml | 538 ++++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp.xml | 462 +++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-without-snmp.xml | 538 ++++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/mess/inventory-with-snmp.xml | 313 ++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/mess/inventory-without-snmp.xml | 310 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/nested/inventory-with-snmp.xml | 313 ++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/nested/inventory-without-snmp.xml | 310 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp-anyaddr.xml | 538 ++++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml | 462 +++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml | 538 ++++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-duplicate-main.xml | 538 ++++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp-anyaddr.xml | 538 ++++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp.xml | 462 +++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-without-snmp.xml | 538 ++++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-duplicate-main.xml | 386 ++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-snmp-anyaddr.xml | 310 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-snmp.xml | 310 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-without-snmp.xml | 310 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-duplicate-main.xml | 386 ++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-snmp-anyaddr.xml | 310 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-snmp.xml | 310 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-without-snmp.xml | 310 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml | 538 ++++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml | 538 ++++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml | 462 +++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml | 538 ++++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/includes/inventory-single-vhost.xml | 215 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/includes/inventory.xml | 539 ++++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/mess/inventory-single-vhost.xml | 215 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/mess/inventory.xml | 377 ++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/nested/inventory-single-vhost.xml | 215 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/nested/inventory.xml | 377 ++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/simple/inventory-single-vhost.xml | 215 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/simple/inventory.xml | 539 ++++++ modules/plugins/apache/src/test/resources/snmpd.conf | 141 + modules/test-utils/src/main/java/org/rhq/test/ObjectCollectionSerializer.java | 239 +++ modules/test-utils/src/main/java/org/rhq/test/TokenReplacingProperties.java | 300 +++ modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java | 201 ++ modules/test-utils/src/test/java/org/rhq/test/test/ObjectCollectionSerializerTest.java | 181 ++ pom.xml | 6 106 files changed, 23359 insertions(+), 151 deletions(-) New commits: commit 04e6a23b75298ee26a6b21da54bbe56d1a74e4db Merge: 8aede51 c2e13e2 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jul 11 19:39:58 2011 +0200 Merge branch 'apache-integration-tests' commit c2e13e2556bf584d352314be028333328569502b Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jul 11 19:34:24 2011 +0200 Apache integration tests now only explicitly executed by passing -Dapache.integration.tests, the httpd binary now downloaded as a maven dependency so that we don't require some complicated setup outside of the build process. diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 65d1bb2..41625fb 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -119,11 +119,57 @@ <activation> <property> - <name>maven.test.skip</name> - <value>!true</value> + <name>apache.integration.tests</name> </property> </activation> + <properties> + <httpd.version>2.2.17</httpd.version> + <httpd.install.dir>${basedir}/target/itest/httpd</httpd.install.dir> + </properties> + + <repositories> + <repository> + <id>Httpd binary repo</id> + <name>Repository containing a binaries of httpd to be used with the tests</name> + <url>http://jon01.mw.lab.eng.bos.redhat.com:8042/m2-repo</url> + </repository> + </repositories> + + <dependencies> +  + <dependency> + <groupId>org.apache</groupId> + <artifactId>httpd</artifactId> + <version>${httpd.version}</version> + <scope>test</scope> + <type>zip</type> + </dependency> + </dependencies> + <build> <plugins>  @@ -144,6 +190,7 @@ <mkdir dir="target/itest" /> <mkdir dir="target/itest/plugins" /> <mkdir dir="target/itest/lib" /> + <mkdir dir="target/itest/httpd" /> <copy toDir="target/itest/plugins" flatten="true"> <fileset dir="${settings.localRepository}/"> <include name="org/rhq/rhq-platform-plugin/${project.version}/rhq-platform-plugin-${project.version}.jar" /> @@ -206,7 +253,30 @@ </move> </then> </if> - <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> + <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> + +  + <unzip dest="target/itest/httpd"> + <fileset dir="${settings.localRepository}/org/apache/httpd/${httpd.version}" includes="*.zip" /> + </unzip> + <move todir="target/itest/httpd"> + <fileset dir="target/itest/httpd/httpd-${httpd.version}/x86" /> + </move> + <if> + <or> + <os family="unix" arch="x86_64" /> + <os family="unix" arch="amd64" /> + </or> + <then> + <move todir="target/itest/httpd"> + <fileset dir="target/itest/httpd/httpd-${httpd.version}/x86_64" /> + </move> + </then> + </if> + <delete dir="target/itest/httpd/httpd-${httpd.version}" /> + <chmod perm="ugo+rx"> + <fileset dir="target/itest/httpd/bin" /> + </chmod> </tasks> </configuration> <goals> @@ -241,10 +311,8 @@ <project.artifactId>${project.artifactId}</project.artifactId> <project.version>${project.version}</project.version> - <apache2.install.dir>PASS THIS IN FROM THE COMMAND LINE</apache2.install.dir> - <apache2.exe.path>bin/httpd</apache2.exe.path> - <apache1.install.dir>PASS THIS IN FROM THE COMMAND LINE</apache1.install.dir> - <apache1.exe.path>bin/httpd</apache1.exe.path> + <apache2.install.dir>${httpd.install.dir}</apache2.install.dir> + <apache2.exe.path>${httpd.install.dir}/bin/httpd</apache2.exe.path>   +  + <childResources> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>${vhost4.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/nested/inventory-single-vhost.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/nested/inventory-single-vhost.xml new file mode 100644 index 0000000..00ac425 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/nested/inventory-single-vhost.xml @@ -0,0 +1,215 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/nested/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/nested/inventory.xml new file mode 100644 index 0000000..2804e4a --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/nested/inventory.xml @@ -0,0 +1,543 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10021</id> + <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> + <resourceKey>${vhost2.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587648</ctime> + <mtime>1307353587648</mtime> + <itime>1307353587648</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10135</id> + <version>0</version> + <ctime>1307353587666</ctime> + <mtime>1307353587666</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10136</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587667</ctime> + <mtime>1307353587667</mtime> + <propertySimple> + <id>10685</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10684</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10687</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10688</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>4</stringValue> + </propertySimple> + <propertySimple> + <id>10686</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + +  + <childResources> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>${vhost4.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory-single-vhost.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory-single-vhost.xml new file mode 100644 index 0000000..00ac425 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory-single-vhost.xml @@ -0,0 +1,215 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp.xml index ff9d715..8b3e0ff 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp.xml @@ -398,7 +398,7 @@ <propertySimple> <id>10795</id> <name>url</name> - <stringValue>http://${localhost}:${port1}/</stringValue> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10709</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/mess/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/mess/inventory-with-snmp.xml new file mode 100644 index 0000000..89bfa5a --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/mess/inventory-with-snmp.xml @@ -0,0 +1,313 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> +  + <resourceKey>${main.rhq4.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/mess/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/mess/inventory-without-snmp.xml new file mode 100644 index 0000000..b054c63 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/mess/inventory-without-snmp.xml @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10041</id> + <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1309116183350</ctime> + <mtime>1309116225316</mtime> + <itime>1309116225316</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10046</id> + <uuid>908ea047-889e-4978-a61f-d96e8b1c6d17</uuid> + <resourceKey>${vhost4.rhq4.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + <itime>1309117635788</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10241</id> + <version>0</version> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10242</id> + <version>0</version> + <ctime>1309117635790</ctime> + <mtime>1309117635790</mtime> + <propertySimple> + <id>10858</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10857</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10860</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10859</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10048</id> + <uuid>704a31f3-7f5f-46c1-9bda-70f2645c9604</uuid> + <resourceKey>${main.rhq4.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635810</ctime> + <mtime>1309117635810</mtime> + <itime>1309117635810</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10245</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10246</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + <propertySimple> + <id>10926</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10925</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10928</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10927</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10201</id> + <version>0</version> + <ctime>1309116183368</ctime> + <mtime>1309116183368</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10211</id> + <version>0</version> + <ctime>1309117523737</ctime> + <mtime>1309117523737</mtime> + <propertySimple> + <id>10863</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10862</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10861</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10865</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10864</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10867</id> + <name>snmpAgentHost</name> + <stringValue>${unresolvable.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10866</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10869</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10868</id> + <name>url</name> + <stringValue>http://${servername}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10870</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10871</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10872</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10873</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10874</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10875</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10876</id> + <name>snmpAgentPort</name> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10877</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + <propertySimple> + <id>10878</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/nested/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/nested/inventory-with-snmp.xml new file mode 100644 index 0000000..89bfa5a --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/nested/inventory-with-snmp.xml @@ -0,0 +1,313 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> +  + <resourceKey>${main.rhq4.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/nested/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/nested/inventory-without-snmp.xml new file mode 100644 index 0000000..b054c63 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/nested/inventory-without-snmp.xml @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10041</id> + <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1309116183350</ctime> + <mtime>1309116225316</mtime> + <itime>1309116225316</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10046</id> + <uuid>908ea047-889e-4978-a61f-d96e8b1c6d17</uuid> + <resourceKey>${vhost4.rhq4.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + <itime>1309117635788</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10241</id> + <version>0</version> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10242</id> + <version>0</version> + <ctime>1309117635790</ctime> + <mtime>1309117635790</mtime> + <propertySimple> + <id>10858</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10857</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10860</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10859</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10048</id> + <uuid>704a31f3-7f5f-46c1-9bda-70f2645c9604</uuid> + <resourceKey>${main.rhq4.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635810</ctime> + <mtime>1309117635810</mtime> + <itime>1309117635810</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10245</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10246</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + <propertySimple> + <id>10926</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10925</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10928</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10927</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10201</id> + <version>0</version> + <ctime>1309116183368</ctime> + <mtime>1309116183368</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10211</id> + <version>0</version> + <ctime>1309117523737</ctime> + <mtime>1309117523737</mtime> + <propertySimple> + <id>10863</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10862</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10861</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10865</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10864</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10867</id> + <name>snmpAgentHost</name> + <stringValue>${unresolvable.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10866</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10869</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10868</id> + <name>url</name> + <stringValue>http://${servername}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10870</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10871</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10872</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10873</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10874</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10875</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10876</id> + <name>snmpAgentPort</name> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10877</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + <propertySimple> + <id>10878</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml index ff9d715..8b3e0ff 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml @@ -398,7 +398,7 @@ <propertySimple> <id>10795</id> <name>url</name> - <stringValue>http://${localhost}:${port1}/</stringValue> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10709</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp.xml index ff9d715..8b3e0ff 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp.xml @@ -398,7 +398,7 @@ <propertySimple> <id>10795</id> <name>url</name> - <stringValue>http://${localhost}:${port1}/</stringValue> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10709</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-duplicate-main.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-duplicate-main.xml new file mode 100644 index 0000000..19e4531 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-duplicate-main.xml @@ -0,0 +1,386 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>100371</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac90</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-snmp-anyaddr.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-snmp-anyaddr.xml new file mode 100644 index 0000000..2a09b04 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-snmp-anyaddr.xml @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>20037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>0.0.0.0:${port1}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://0.0.0.0:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-snmp.xml new file mode 100644 index 0000000..95f21d0 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-snmp.xml @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-without-snmp.xml new file mode 100644 index 0000000..b3d2dea --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-without-snmp.xml @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10041</id> + <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1309116183350</ctime> + <mtime>1309116225316</mtime> + <itime>1309116225316</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10046</id> + <uuid>908ea047-889e-4978-a61f-d96e8b1c6d17</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + <itime>1309117635788</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10241</id> + <version>0</version> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10242</id> + <version>0</version> + <ctime>1309117635790</ctime> + <mtime>1309117635790</mtime> + <propertySimple> + <id>10858</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10857</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10860</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10859</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10048</id> + <uuid>704a31f3-7f5f-46c1-9bda-70f2645c9604</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635810</ctime> + <mtime>1309117635810</mtime> + <itime>1309117635810</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10245</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10246</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + <propertySimple> + <id>10926</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10925</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10928</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10927</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10201</id> + <version>0</version> + <ctime>1309116183368</ctime> + <mtime>1309116183368</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10211</id> + <version>0</version> + <ctime>1309117523737</ctime> + <mtime>1309117523737</mtime> + <propertySimple> + <id>10863</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10862</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10861</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10865</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10864</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10867</id> + <name>snmpAgentHost</name> + <stringValue>${unresolvable.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10866</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10869</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10868</id> + <name>url</name> + <stringValue>http://${servername}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10870</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10871</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10872</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10873</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10874</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10875</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10876</id> + <name>snmpAgentPort</name> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10877</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + <propertySimple> + <id>10878</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-duplicate-main.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-duplicate-main.xml new file mode 100644 index 0000000..19e4531 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-duplicate-main.xml @@ -0,0 +1,386 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>100371</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac90</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-snmp-anyaddr.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-snmp-anyaddr.xml new file mode 100644 index 0000000..2a09b04 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-snmp-anyaddr.xml @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>20037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>0.0.0.0:${port1}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://0.0.0.0:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-snmp.xml new file mode 100644 index 0000000..95f21d0 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-snmp.xml @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-without-snmp.xml new file mode 100644 index 0000000..b3d2dea --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-without-snmp.xml @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10041</id> + <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1309116183350</ctime> + <mtime>1309116225316</mtime> + <itime>1309116225316</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10046</id> + <uuid>908ea047-889e-4978-a61f-d96e8b1c6d17</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + <itime>1309117635788</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10241</id> + <version>0</version> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10242</id> + <version>0</version> + <ctime>1309117635790</ctime> + <mtime>1309117635790</mtime> + <propertySimple> + <id>10858</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10857</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10860</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10859</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10048</id> + <uuid>704a31f3-7f5f-46c1-9bda-70f2645c9604</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635810</ctime> + <mtime>1309117635810</mtime> + <itime>1309117635810</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10245</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10246</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + <propertySimple> + <id>10926</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10925</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10928</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10927</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10201</id> + <version>0</version> + <ctime>1309116183368</ctime> + <mtime>1309116183368</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10211</id> + <version>0</version> + <ctime>1309117523737</ctime> + <mtime>1309117523737</mtime> + <propertySimple> + <id>10863</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10862</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10861</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10865</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10864</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10867</id> + <name>snmpAgentHost</name> + <stringValue>${unresolvable.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10866</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10869</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10868</id> + <name>url</name> + <stringValue>http://${servername}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10870</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10871</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10872</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10873</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10874</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10875</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10876</id> + <name>snmpAgentPort</name> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10877</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + <propertySimple> + <id>10878</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml index ff9d715..8b3e0ff 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml @@ -398,7 +398,7 @@ <propertySimple> <id>10795</id> <name>url</name> - <stringValue>http://${localhost}:${port1}/</stringValue> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10709</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/includes/inventory-single-vhost.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/includes/inventory-single-vhost.xml new file mode 100644 index 0000000..00ac425 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/includes/inventory-single-vhost.xml @@ -0,0 +1,215 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/mess/inventory-single-vhost.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/mess/inventory-single-vhost.xml new file mode 100644 index 0000000..00ac425 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/mess/inventory-single-vhost.xml @@ -0,0 +1,215 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/mess/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/mess/inventory.xml new file mode 100644 index 0000000..b6a4bc9 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/mess/inventory.xml @@ -0,0 +1,377 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10021</id> + <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> + <resourceKey>${vhost2.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587648</ctime> + <mtime>1307353587648</mtime> + <itime>1307353587648</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10135</id> + <version>0</version> + <ctime>1307353587666</ctime> + <mtime>1307353587666</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10136</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587667</ctime> + <mtime>1307353587667</mtime> + <propertySimple> + <id>10685</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10684</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10687</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10688</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>4</stringValue> + </propertySimple> + <propertySimple> + <id>10686</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>${vhost4.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/nested/inventory-single-vhost.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/nested/inventory-single-vhost.xml new file mode 100644 index 0000000..00ac425 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/nested/inventory-single-vhost.xml @@ -0,0 +1,215 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/nested/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/nested/inventory.xml new file mode 100644 index 0000000..b6a4bc9 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/nested/inventory.xml @@ -0,0 +1,377 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10021</id> + <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> + <resourceKey>${vhost2.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587648</ctime> + <mtime>1307353587648</mtime> + <itime>1307353587648</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10135</id> + <version>0</version> + <ctime>1307353587666</ctime> + <mtime>1307353587666</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10136</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587667</ctime> + <mtime>1307353587667</mtime> + <propertySimple> + <id>10685</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10684</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10687</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10688</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>4</stringValue> + </propertySimple> + <propertySimple> + <id>10686</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>${vhost4.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/simple/inventory-single-vhost.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/simple/inventory-single-vhost.xml new file mode 100644 index 0000000..00ac425 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/simple/inventory-single-vhost.xml @@ -0,0 +1,215 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> commit 2b8e69408d537ffa7d05c877c20bc5d5d416d2b1 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Jun 30 15:24:37 2011 +0200 adding tests for configuration files with includes. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeConfigurationWithIncludesFromRHQ1_3Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeConfigurationWithIncludesFromRHQ1_3Test.java new file mode 100644 index 0000000..95ea298 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeConfigurationWithIncludesFromRHQ1_3Test.java @@ -0,0 +1,33 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.upgrade.rhq1_3_x; + +/** + * + * + * @author Lukas Krejci + */ +public class UpgradeConfigurationWithIncludesFromRHQ1_3Test extends UpgradeSimpleConfigurationFromRHQ1_3Test { + + public UpgradeConfigurationWithIncludesFromRHQ1_3Test() { + super("/mocked-inventories/rhq-1.3.x/includes/inventory.xml", "/full-configurations/2.2.x/includes/httpd.conf", "/full-configurations/2.2.x/includes/1.vhost.conf", "/full-configurations/2.2.x/includes/2.vhost.conf"); + } + +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeSimpleConfigurationFromRHQ1_3Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeSimpleConfigurationFromRHQ1_3Test.java index 1fd44ba..752c845 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeSimpleConfigurationFromRHQ1_3Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeSimpleConfigurationFromRHQ1_3Test.java @@ -29,8 +29,6 @@ import org.testng.annotations.Test; import org.rhq.core.domain.resource.Resource; import org.rhq.plugins.apache.upgrade.UpgradeTestBase; -import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestConfiguration; -import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestSetup; import org.rhq.test.pc.PluginContainerSetup; /** @@ -41,6 +39,19 @@ import org.rhq.test.pc.PluginContainerSetup; @Test(groups = "apache-integration-tests") public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { + String[] configuredApacheConfigurationFiles; + String configuredInventoryFile; + + public UpgradeSimpleConfigurationFromRHQ1_3Test() { + configuredApacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + configuredInventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + } + + protected UpgradeSimpleConfigurationFromRHQ1_3Test(String defaultInventoryFile, String... defaultApacheConfigurationFiles) { + this.configuredApacheConfigurationFiles = defaultApacheConfigurationFiles; + this.configuredInventoryFile = defaultInventoryFile; + } + @Test @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) @Parameters({ "apache2.install.dir", "apache2.exe.path" }) @@ -52,8 +63,8 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { serverRoot = installPath; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; } }); } @@ -69,8 +80,8 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { serverRoot = installPath; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - apacheConfigurationFiles = new String[] { "/full-configurations/1.3.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; }}); } @@ -81,8 +92,8 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { testUpgrade(new TestConfiguration() { { configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; serverRoot = installPath; binPath = exePath; @@ -128,8 +139,8 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; serverRoot = installPath; binPath = exePath; @@ -151,8 +162,8 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; serverRoot = installPath; binPath = exePath; diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeConfigurationWithIncludesFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeConfigurationWithIncludesFromRHQ3_0_0Test.java new file mode 100644 index 0000000..7fbe709 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeConfigurationWithIncludesFromRHQ3_0_0Test.java @@ -0,0 +1,36 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.upgrade.rhq3_0_0; + +/** + * + * + * @author Lukas Krejci + */ +public class UpgradeConfigurationWithIncludesFromRHQ3_0_0Test extends UpgradeSimpleConfigurationFromRHQ3_0_0Test { + + public UpgradeConfigurationWithIncludesFromRHQ3_0_0Test() { + super("/mocked-inventories/rhq-3.0.0/includes/inventory-without-snmp.xml", + "/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp.xml", + "/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp-anyaddr.xml", + "/full-configurations/2.2.x/includes/httpd.conf", "/full-configurations/2.2.x/includes/1.vhost.conf", + "/full-configurations/2.2.x/includes/2.vhost.conf"); + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java index fb2e360..c4399d9 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java @@ -38,8 +38,6 @@ import org.rhq.plugins.apache.ApacheServerComponent; import org.rhq.plugins.apache.ApacheServerDiscoveryComponent; import org.rhq.plugins.apache.parser.ApacheDirectiveTree; import org.rhq.plugins.apache.upgrade.UpgradeTestBase; -import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestConfiguration; -import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestSetup; import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; import org.rhq.plugins.apache.util.RuntimeApacheConfiguration; import org.rhq.plugins.apache.util.VirtualHostLegacyResourceKeyUtil; @@ -52,6 +50,34 @@ import org.rhq.test.pc.PluginContainerSetup; */ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase { + private String[] configuredApacheConfigurationFiles; + private String configuredInventoryFileWithoutSNMP; + private String configuredInventoryFileWithSNMP; + private String configuredInventoryFileWithSNMPWithAnyAddress; + + public UpgradeSimpleConfigurationFromRHQ3_0_0Test() { + configuredInventoryFileWithoutSNMP = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + configuredInventoryFileWithSNMP = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + configuredInventoryFileWithSNMPWithAnyAddress = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp-anyaddr.xml"; + configuredApacheConfigurationFiles = new String[] {"/full-configurations/2.2.x/simple/httpd.conf"}; + } + + + /** + * @param configuredApacheConfigurationFiles + * @param configuredInventoryFileWithoutSNMP + * @param configuredInventoryFileWithSNMP + * @param configuredInventoryFileWithSNMPWithAnyAddress + */ + public UpgradeSimpleConfigurationFromRHQ3_0_0Test(String configuredInventoryFileWithoutSNMP, + String configuredInventoryFileWithSNMP, String configuredInventoryFileWithSNMPWithAnyAddress, + String... configuredApacheConfigurationFiles) { + this.configuredApacheConfigurationFiles = configuredApacheConfigurationFiles; + this.configuredInventoryFileWithoutSNMP = configuredInventoryFileWithoutSNMP; + this.configuredInventoryFileWithSNMP = configuredInventoryFileWithSNMP; + this.configuredInventoryFileWithSNMPWithAnyAddress = configuredInventoryFileWithSNMPWithAnyAddress; + } + /** * This tests the upgrade from RHQ 3.0.0 where the apache server was discovered without SNMP support. * The Main Server URL must have been set in this case, otherwise the component would fail to start @@ -63,8 +89,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithoutSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -83,8 +109,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase public void testWithUnresolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithoutSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; @@ -104,8 +130,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase public void testWithNonUniqueNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithoutSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; @@ -136,8 +162,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -166,8 +192,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase public void testWithUnresolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -202,8 +228,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase public void testWithNonUniqueNamesWithSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -240,8 +266,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithoutSNMP; serverRoot = installPath; binPath = exePath; @@ -279,8 +305,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp-anyaddr.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMPWithAnyAddress; serverRoot = installPath; binPath = exePath; @@ -306,8 +332,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithoutSNMP; serverRoot = installPath; binPath = exePath; @@ -332,8 +358,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMP; serverRoot = installPath; binPath = exePath; upgradeShouldSucceed = false; diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeConfigurationWithIncludesFromRHQ3_0_1Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeConfigurationWithIncludesFromRHQ3_0_1Test.java new file mode 100644 index 0000000..41e7252 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeConfigurationWithIncludesFromRHQ3_0_1Test.java @@ -0,0 +1,38 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.upgrade.rhq3_0_1; + +/** + * + * + * @author Lukas Krejci + */ +public class UpgradeConfigurationWithIncludesFromRHQ3_0_1Test extends UpgradeSimpleConfigurationFromRHQ3_0_1Test { + + + public UpgradeConfigurationWithIncludesFromRHQ3_0_1Test() { + super("/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp.xml", + "/mocked-inventories/rhq-3.0.1/includes/inventory-without-snmp.xml", + "/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp-anyaddr.xml", + "/mocked-inventories/rhq-3.0.1/includes/inventory-with-duplicate-main.xml", + "/full-configurations/2.2.x/includes/httpd.conf", "/full-configurations/2.2.x/includes/1.vhost.conf", + "/full-configurations/2.2.x/includes/2.vhost.conf"); + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java index cbd4826..fa88f8d 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java @@ -55,14 +55,47 @@ import org.rhq.test.pc.PluginContainerSetup; */ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase { + private String[] configuredApacheConfigurationFiles; + private String configuredInventoryFileWithSNMP; + private String configuredInventoryFileWithoutSNMP; + private String configuredInventoryFileWithSNMPWithAnyAddress; + private String configuredInventoryFileWithDuplicateMain; + + + public UpgradeSimpleConfigurationFromRHQ3_0_1Test() { + configuredApacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + configuredInventoryFileWithSNMP = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + configuredInventoryFileWithoutSNMP = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + configuredInventoryFileWithSNMPWithAnyAddress = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml"; + configuredInventoryFileWithDuplicateMain = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml"; + } + + /** + * @param configuredApacheConfigurationFiles + * @param configuredInventoryFileWithSNMP + * @param configuredInventoryFileWithoutSNMP + * @param configuredInventoryFileWithSNMPWithAnyAddress + * @param configuredInventoryFileWithDuplicateMain + */ + protected UpgradeSimpleConfigurationFromRHQ3_0_1Test(String configuredInventoryFileWithSNMP, + String configuredInventoryFileWithoutSNMP, String configuredInventoryFileWithSNMPWithAnyAddress, + String configuredInventoryFileWithDuplicateMain, String... configuredApacheConfigurationFiles) { + + this.configuredApacheConfigurationFiles = configuredApacheConfigurationFiles; + this.configuredInventoryFileWithSNMP = configuredInventoryFileWithSNMP; + this.configuredInventoryFileWithoutSNMP = configuredInventoryFileWithoutSNMP; + this.configuredInventoryFileWithSNMPWithAnyAddress = configuredInventoryFileWithSNMPWithAnyAddress; + this.configuredInventoryFileWithDuplicateMain = configuredInventoryFileWithDuplicateMain; + } + @Test @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) @Parameters({"apache2.install.dir", "apache2.exe.path"}) public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -92,8 +125,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithoutSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -124,8 +157,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase public void testWithUnresolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -161,8 +194,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase public void testWithUnresolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithoutSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -190,8 +223,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase public void testWithNonUniqueNamesWithSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -227,8 +260,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase public void testWithNonUniqueNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithoutSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -279,8 +312,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase public void testDuplicateMainVhostsMarkedAsFailedUpgrade(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithDuplicateMain; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -314,10 +347,10 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + apacheConfigurationFiles = configuredApacheConfigurationFiles; //yes, the inventory file can be the same for both the with and without snmp tests because //they both yield the same inventory in this case. - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml"; + inventoryFile = configuredInventoryFileWithSNMPWithAnyAddress; serverRoot = installPath; binPath = exePath; @@ -360,8 +393,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMPWithAnyAddress; serverRoot = installPath; binPath = exePath; @@ -391,8 +424,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithoutSNMP; serverRoot = installPath; binPath = exePath; upgradeShouldSucceed = false; @@ -429,8 +462,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMP; serverRoot = installPath; binPath = exePath; upgradeShouldSucceed = false; diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeConfigurationWithIncludesFromRHQ3_0_2Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeConfigurationWithIncludesFromRHQ3_0_2Test.java new file mode 100644 index 0000000..0795ecc --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeConfigurationWithIncludesFromRHQ3_0_2Test.java @@ -0,0 +1,33 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.upgrade.rhq3_0_2; + +/** + * + * + * @author Lukas Krejci + */ +public class UpgradeConfigurationWithIncludesFromRHQ3_0_2Test extends UpgradeSimpleConfigurationFromRHQ3_0_2Test { + + public UpgradeConfigurationWithIncludesFromRHQ3_0_2Test() { + super("/mocked-inventories/rhq-3.0.2/includes/inventory.xml", "/full-configurations/2.2.x/includes/httpd.conf", + "/full-configurations/2.2.x/includes/1.vhost.conf", "/full-configurations/2.2.x/includes/2.vhost.conf"); + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeSimpleConfigurationFromRHQ3_0_2Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeSimpleConfigurationFromRHQ3_0_2Test.java index 2e85a4b..2c3de84 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeSimpleConfigurationFromRHQ3_0_2Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeSimpleConfigurationFromRHQ3_0_2Test.java @@ -32,14 +32,33 @@ import org.rhq.test.pc.PluginContainerSetup; */ public class UpgradeSimpleConfigurationFromRHQ3_0_2Test extends UpgradeTestBase { + private String[] configuredApacheConfigurationFiles; + private String configuredInventoryFile; + + public UpgradeSimpleConfigurationFromRHQ3_0_2Test() { + configuredApacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + configuredInventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + } + + /** + * @param configuredApacheConfigurationFiles + * @param configuredInventoryFile + */ + protected UpgradeSimpleConfigurationFromRHQ3_0_2Test(String configuredInventoryFile, + String... configuredApacheConfigurationFiles) { + + this.configuredApacheConfigurationFiles = configuredApacheConfigurationFiles; + this.configuredInventoryFile = configuredInventoryFile; + } + @Test @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) @Parameters({ "apache2.install.dir", "apache2.exe.path" }) public void testWithResolvableNames(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -53,8 +72,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_2Test extends UpgradeTestBase public void testWithUnresolvableNames(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -79,8 +98,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_2Test extends UpgradeTestBase public void testWithNonUniqueNames(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -107,8 +126,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_2Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; serverRoot = installPath; binPath = exePath; @@ -137,8 +156,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_2Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; serverRoot = installPath; binPath = exePath; diff --git a/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/httpd.conf index ebc07ac..22f6dac 100644 --- a/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/httpd.conf +++ b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/httpd.conf @@ -37,4 +37,4 @@ SNMPVar var ${additional.directives} -Include *.vhost.conf +Include conf/*.vhost.conf diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory.xml new file mode 100644 index 0000000..f8d181d --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory.xml @@ -0,0 +1,539 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10021</id> + <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> + <resourceKey>${vhost2.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587648</ctime> + <mtime>1307353587648</mtime> + <itime>1307353587648</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10135</id> + <version>0</version> + <ctime>1307353587666</ctime> + <mtime>1307353587666</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10136</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587667</ctime> + <mtime>1307353587667</mtime> + <propertySimple> + <id>10685</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10684</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10687</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10688</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>4</stringValue> + </propertySimple> + <propertySimple> + <id>10686</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10023</id> + <uuid>c62c5d75-81dd-4b14-a768-2d8c1fca6c88</uuid> + <resourceKey>${vhost3.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <itime>1307353587737</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10139</id> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10140</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <propertySimple> + <id>10695</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10694</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10697</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10698</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>3</stringValue> + </propertySimple> + <propertySimple> + <id>10696</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10024</id> + <uuid>d1b59168-8666-4bc0-957e-171bf16eec73</uuid> + <resourceKey>${vhost1.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost1.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <itime>1307353587750</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10171</id> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10172</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <propertySimple> + <id>10700</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10699</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10702</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost1.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10703</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>5</stringValue> + </propertySimple> + <propertySimple> + <id>10701</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>${vhost4.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp-anyaddr.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp-anyaddr.xml new file mode 100644 index 0000000..fc34748 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp-anyaddr.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>20037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq4.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp.xml new file mode 100644 index 0000000..ff9d715 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp.xml @@ -0,0 +1,462 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-without-snmp.xml new file mode 100644 index 0000000..590b10f --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-without-snmp.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10041</id> + <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1309116183350</ctime> + <mtime>1309116225316</mtime> + <itime>1309116225316</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10046</id> + <uuid>908ea047-889e-4978-a61f-d96e8b1c6d17</uuid> + <resourceKey>${vhost4.rhq4.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + <itime>1309117635788</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10241</id> + <version>0</version> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10242</id> + <version>0</version> + <ctime>1309117635790</ctime> + <mtime>1309117635790</mtime> + <propertySimple> + <id>10858</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10857</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10860</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10859</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10047</id> + <uuid>5fccc52b-8003-42ed-aa69-0b146c783e91</uuid> + <resourceKey>${vhost3.rhq4.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + <itime>1309117635802</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10243</id> + <version>0</version> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10244</id> + <version>0</version> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + <propertySimple> + <id>10922</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10921</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10924</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10923</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10048</id> + <uuid>704a31f3-7f5f-46c1-9bda-70f2645c9604</uuid> + <resourceKey>${main.rhq4.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635810</ctime> + <mtime>1309117635810</mtime> + <itime>1309117635810</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10245</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10246</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + <propertySimple> + <id>10926</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10925</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10928</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10927</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10049</id> + <uuid>03638606-623b-4218-bd23-42e04db0e296</uuid> + <resourceKey>${vhost2.rhq4.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + <itime>1309117635818</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10247</id> + <version>0</version> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10248</id> + <version>0</version> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + <propertySimple> + <id>10930</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10929</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10932</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10931</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10050</id> + <uuid>ae880c2d-747d-492d-8586-a47ab5791b0e</uuid> + <resourceKey>${vhost1.rhq4.resource.key}</resourceKey> + <name>${vhost1.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + <itime>1309117635829</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10249</id> + <version>0</version> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10250</id> + <version>0</version> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + <propertySimple> + <id>10934</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10933</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10936</id> + <name>url</name> + <stringValue>http://${vhost1.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10935</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10201</id> + <version>0</version> + <ctime>1309116183368</ctime> + <mtime>1309116183368</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10211</id> + <version>0</version> + <ctime>1309117523737</ctime> + <mtime>1309117523737</mtime> + <propertySimple> + <id>10863</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10862</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10861</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10865</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10864</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10867</id> + <name>snmpAgentHost</name> + <stringValue>${unresolvable.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10866</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10869</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10868</id> + <name>url</name> + <stringValue>http://${servername}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10870</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10871</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10872</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10873</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10874</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10875</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10876</id> + <name>snmpAgentPort</name> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10877</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + <propertySimple> + <id>10878</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-duplicate-main.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-duplicate-main.xml new file mode 100644 index 0000000..78fc9dd --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-duplicate-main.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>100371</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac90</uuid> + <resourceKey>${localhost}:${port1}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp-anyaddr.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp-anyaddr.xml new file mode 100644 index 0000000..47d502d --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp-anyaddr.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>20037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>0.0.0.0:${port1}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://0.0.0.0:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp.xml new file mode 100644 index 0000000..ff9d715 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp.xml @@ -0,0 +1,462 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-without-snmp.xml new file mode 100644 index 0000000..44ea502 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-without-snmp.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10041</id> + <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1309116183350</ctime> + <mtime>1309116225316</mtime> + <itime>1309116225316</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10046</id> + <uuid>908ea047-889e-4978-a61f-d96e8b1c6d17</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + <itime>1309117635788</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10241</id> + <version>0</version> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10242</id> + <version>0</version> + <ctime>1309117635790</ctime> + <mtime>1309117635790</mtime> + <propertySimple> + <id>10858</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10857</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10860</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10859</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10047</id> + <uuid>5fccc52b-8003-42ed-aa69-0b146c783e91</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + <itime>1309117635802</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10243</id> + <version>0</version> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10244</id> + <version>0</version> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + <propertySimple> + <id>10922</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10921</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10924</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10923</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10048</id> + <uuid>704a31f3-7f5f-46c1-9bda-70f2645c9604</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635810</ctime> + <mtime>1309117635810</mtime> + <itime>1309117635810</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10245</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10246</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + <propertySimple> + <id>10926</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10925</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10928</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10927</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10049</id> + <uuid>03638606-623b-4218-bd23-42e04db0e296</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + <itime>1309117635818</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10247</id> + <version>0</version> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10248</id> + <version>0</version> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + <propertySimple> + <id>10930</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10929</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10932</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10931</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10050</id> + <uuid>ae880c2d-747d-492d-8586-a47ab5791b0e</uuid> + <resourceKey>${vhost1.rhq3.resource.key}</resourceKey> + <name>${vhost1.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + <itime>1309117635829</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10249</id> + <version>0</version> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10250</id> + <version>0</version> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + <propertySimple> + <id>10934</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10933</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10936</id> + <name>url</name> + <stringValue>http://${vhost1.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10935</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10201</id> + <version>0</version> + <ctime>1309116183368</ctime> + <mtime>1309116183368</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10211</id> + <version>0</version> + <ctime>1309117523737</ctime> + <mtime>1309117523737</mtime> + <propertySimple> + <id>10863</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10862</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10861</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10865</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10864</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10867</id> + <name>snmpAgentHost</name> + <stringValue>${unresolvable.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10866</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10869</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10868</id> + <name>url</name> + <stringValue>http://${servername}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10870</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10871</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10872</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10873</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10874</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10875</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10876</id> + <name>snmpAgentPort</name> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10877</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + <propertySimple> + <id>10878</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/includes/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/includes/inventory.xml new file mode 100644 index 0000000..f8d181d --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/includes/inventory.xml @@ -0,0 +1,539 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10021</id> + <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> + <resourceKey>${vhost2.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587648</ctime> + <mtime>1307353587648</mtime> + <itime>1307353587648</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10135</id> + <version>0</version> + <ctime>1307353587666</ctime> + <mtime>1307353587666</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10136</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587667</ctime> + <mtime>1307353587667</mtime> + <propertySimple> + <id>10685</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10684</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10687</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10688</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>4</stringValue> + </propertySimple> + <propertySimple> + <id>10686</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10023</id> + <uuid>c62c5d75-81dd-4b14-a768-2d8c1fca6c88</uuid> + <resourceKey>${vhost3.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <itime>1307353587737</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10139</id> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10140</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <propertySimple> + <id>10695</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10694</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10697</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10698</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>3</stringValue> + </propertySimple> + <propertySimple> + <id>10696</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10024</id> + <uuid>d1b59168-8666-4bc0-957e-171bf16eec73</uuid> + <resourceKey>${vhost1.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost1.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <itime>1307353587750</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10171</id> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10172</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <propertySimple> + <id>10700</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10699</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10702</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost1.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10703</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>5</stringValue> + </propertySimple> + <propertySimple> + <id>10701</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>${vhost4.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> commit 9841eb6d2e0561a66183415a9db24bf8219d1bd1 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Jun 30 10:58:26 2011 +0200 added upgrade tests for RHQ 3.0.2 diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeSimpleConfigurationFromRHQ3_0_2Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeSimpleConfigurationFromRHQ3_0_2Test.java new file mode 100644 index 0000000..2e85a4b --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeSimpleConfigurationFromRHQ3_0_2Test.java @@ -0,0 +1,157 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.upgrade.rhq3_0_2; + +import org.testng.annotations.Parameters; +import org.testng.annotations.Test; + +import org.rhq.plugins.apache.upgrade.UpgradeTestBase; +import org.rhq.test.pc.PluginContainerSetup; + +/** + * + * + * @author Lukas Krejci + */ +public class UpgradeSimpleConfigurationFromRHQ3_0_2Test extends UpgradeTestBase { + + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithResolvableNames(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + } + }); + } + + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithUnresolvableNames(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), + "ServerName ${unresolvable.host}:${listen1}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), + "ServerName ${unresolvable.host}:${listen2}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), + "ServerName ${unresolvable.host}:${listen3}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), + "ServerName ${unresolvable.host}:${listen4}"); + } + }); + } + + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithNonUniqueNames(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), + "ServerName ${unresolvable.host}"); + } + }); + } + + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddress(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + serverRoot = installPath; + binPath = exePath; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + }); + } + + /** + * This configuration will fail to upgrade the first vhost, because it doesn't uniquely match to new-style + * vhosts - it could be either a main vhost or vhost1. + */ + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddress(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + serverRoot = installPath; + binPath = exePath; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + }); + } +} diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/simple/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/simple/inventory.xml new file mode 100644 index 0000000..f8d181d --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/simple/inventory.xml @@ -0,0 +1,539 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10021</id> + <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> + <resourceKey>${vhost2.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587648</ctime> + <mtime>1307353587648</mtime> + <itime>1307353587648</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10135</id> + <version>0</version> + <ctime>1307353587666</ctime> + <mtime>1307353587666</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10136</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587667</ctime> + <mtime>1307353587667</mtime> + <propertySimple> + <id>10685</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10684</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10687</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10688</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>4</stringValue> + </propertySimple> + <propertySimple> + <id>10686</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10023</id> + <uuid>c62c5d75-81dd-4b14-a768-2d8c1fca6c88</uuid> + <resourceKey>${vhost3.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <itime>1307353587737</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10139</id> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10140</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <propertySimple> + <id>10695</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10694</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10697</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10698</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>3</stringValue> + </propertySimple> + <propertySimple> + <id>10696</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10024</id> + <uuid>d1b59168-8666-4bc0-957e-171bf16eec73</uuid> + <resourceKey>${vhost1.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost1.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <itime>1307353587750</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10171</id> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10172</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <propertySimple> + <id>10700</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10699</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10702</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost1.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10703</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>5</stringValue> + </propertySimple> + <propertySimple> + <id>10701</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>${vhost4.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> commit 6c2b6624c0d2e9a8ff64f6cc74264696580d5b2a Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Jun 30 10:58:05 2011 +0200 make the tests compile again. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java index 358df93..9d7e632 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java @@ -86,7 +86,7 @@ public class UpgradeTestBase extends PluginContainerTest { private static final Log LOG = LogFactory.getLog(UpgradeTestBase.class); - protected class TestSetup { + public class TestSetup { private String configurationName; private FakeServerInventory fakeInventory = new FakeServerInventory(); private String inventoryFile; @@ -387,7 +387,7 @@ public class UpgradeTestBase extends PluginContainerTest { } } - protected static class TestConfiguration { + public static class TestConfiguration { public String[] apacheConfigurationFiles; public String inventoryFile; public String configurationName; commit 10e1e2d205a9ad5f13c2e541f92e678eb059d819 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed Jun 29 17:11:43 2011 +0200 moved upgrade test classes to new packages so that we won't have a gazillion test classes in the root package. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java deleted file mode 100644 index 8d1fe22..0000000 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java +++ /dev/null @@ -1,165 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.plugins.apache; - -import java.util.Comparator; -import java.util.HashMap; -import java.util.Set; -import java.util.TreeSet; - -import org.testng.annotations.Parameters; -import org.testng.annotations.Test; - -import org.rhq.core.domain.resource.Resource; -import org.rhq.test.pc.PluginContainerSetup; - -/** - * - * - * @author Lukas Krejci - */ -@Test(groups = "apache-integration-tests") -public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { - - @Test - @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) - @Parameters({ "apache2.install.dir", "apache2.exe.path" }) - public void testWithResolvableServerNames_Apache2(final String installPath, final String exePath) - throws Throwable { - - testUpgrade(new TestConfiguration() { - { - serverRoot = installPath; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; - } - }); - } - - @Test(enabled = false) - //ApacheServerOperationsDelegate doesn't work with apache 1.3 - @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) - @Parameters({ "apache1.install.dir", "apache1.exe.path" }) - public void testWithResolvableServerNames_Apache1(final String installPath, final String exePath) - throws Throwable { - - testUpgrade(new TestConfiguration() {{ - serverRoot = installPath; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - apacheConfigurationFiles = new String[] { "/full-configurations/1.3.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; - }}); - } - - @Test - @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) - @Parameters({ "apache2.install.dir", "apache2.exe.path" }) - public void testWithNonUniqueServerNames_Apache2(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; - serverRoot = installPath; - binPath = exePath; - - - defaultOverrides = new HashMap<String, String>(); - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); - } - - @Override - public void beforePluginContainerStart(TestSetup setup) { - //in this scenario, the RHQ 1.3 would only discover 1 vhost (and the main vhost), because they would have the same resource key - //due to the same ServerName. I need to process the default inventory to reflect that otherwise I would get upgrade - //failures. - - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(findApachePluginResourceTypeByName("Apache Virtual Host")); - Set<Resource> uniques = new TreeSet<Resource>(new Comparator<Resource>() { - public int compare(Resource a, Resource b) { - return a.getResourceKey().compareTo(b.getResourceKey()); - } - }); - - for(Resource vhost : vhosts) { - if (uniques.contains(vhost)) { - //remove the vhost from the server's inventory - setup.getFakeInventory().removeResource(vhost); - } else { - uniques.add(vhost); - } - } - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithAnyAddress(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; - serverRoot = installPath; - binPath = exePath; - - defaultOverrides = new HashMap<String, String>(); - defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithWildcardAddress(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; - serverRoot = installPath; - binPath = exePath; - - defaultOverrides = new HashMap<String, String>(); - defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); - } - }); - } -} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java deleted file mode 100644 index d3e5c86..0000000 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java +++ /dev/null @@ -1,444 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.plugins.apache; - - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.testng.annotations.Parameters; -import org.testng.annotations.Test; - -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceError; -import org.rhq.core.domain.resource.ResourceErrorType; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.plugins.apache.parser.ApacheDirectiveTree; -import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; -import org.rhq.plugins.apache.util.RuntimeApacheConfiguration; -import org.rhq.plugins.apache.util.VirtualHostLegacyResourceKeyUtil; -import org.rhq.test.pc.PluginContainerSetup; - -/** - * - * - * @author Lukas Krejci - */ -public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase { - - /** - * This tests the upgrade from RHQ 3.0.0 where the apache server was discovered without SNMP support. - * The Main Server URL must have been set in this case, otherwise the component would fail to start - * and therefore the vhost discovery wouldn't even take place. - */ - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - - //just define the servername value without actually setting the ${servername.directive} so that - //we don't define a servername directive itself but do have a value for the actual server name. - //this is deduced by apache and the plugin but tests aren't that clever. - defaultOverrides.put("servername", "${localhost}"); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithUnresolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; - - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${listen3}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${listen4}"); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithNonUniqueNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; - - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); - } - }); - } - - /** - * This tests the upgrade from RHQ 3.0.0 where the Apache server was discovered with the following: - * - * <ol> - * <li> SNMP enabled - * <li> Main URL set or unset (it doesn't make a difference here) - * </ol> - * @param installDir - * @param exePath - * @throws Throwable - */ - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - upgradeShouldSucceed = false; - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - beforeTestSetupWithSNMP(this, testSetup); - } - - /** - * Do our own tests here, because the generic test method won't do much, since - * we told it that the upgrade won't succeed. - */ - @Override - public void beforeTests(TestSetup setup) throws Throwable { - testWithSNMP(this, setup); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithUnresolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - upgradeShouldSucceed = false; - - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${listen3}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${listen4}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - beforeTestSetupWithSNMP(this, testSetup); - } - - /** - * Do our own tests here, because the generic test method won't do much, since - * we told it that the upgrade won't succeed. - */ - @Override - public void beforeTests(TestSetup setup) throws Throwable { - testWithSNMP(this, setup); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithNonUniqueNamesWithSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - upgradeShouldSucceed = false; - - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - beforeTestSetupWithSNMP(this, testSetup); - } - - /** - * Do our own tests here, because the generic test method won't do much, since - * we told it that the upgrade won't succeed. - */ - @Override - public void beforeTests(TestSetup setup) throws Throwable { - testWithSNMP(this, setup); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithAnyAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; - serverRoot = installPath; - binPath = exePath; - - //just define the servername value without actually setting the ${servername.directive} so that - //we don't define a servername directive itself but do have a value for the actual server name. - //this is deduced by apache and the plugin but tests aren't that clever. - defaultOverrides.put("servername", "${localhost}"); - defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); - } - }); - } - - /** - * Unlike other SNMP tests this one actually succeeds to upgrade because of the messed up discovery that - * RHQ 3.0.0 would perform. In case of any-address (0.0.0.0), the main vhost would get the MainServer - * resource key even with SNMP, because RHQ 3 codebase wouldn't be able to match what it think should - * have been the SNMP record with the actual results from SNMP module. - * - * Because of this, RHQ 3 discovers all 5 vhosts and the upgrade code is therefore able to successfully - * upgrade all of them. - * - * @param installPath - * @param exePath - * @throws Throwable - */ - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithAnyAddressWithSNMP(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp-anyaddr.xml"; - serverRoot = installPath; - binPath = exePath; - - defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - beforeTestSetupWithSNMP(this, testSetup); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithWildcardAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; - serverRoot = installPath; - binPath = exePath; - - //just define the servername value without actually setting the ${servername.directive} so that - //we don't define a servername directive itself but do have a value for the actual server name. - //this is deduced by apache and the plugin but tests aren't that clever. - defaultOverrides.put("servername", "${localhost}"); - defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithWildcardAddressWithSNMP(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; - serverRoot = installPath; - binPath = exePath; - upgradeShouldSucceed = false; - - defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - beforeTestSetupWithSNMP(this, testSetup); - } - - /** - * Do our own tests here, because the generic test method won't do much, since - * we told it that the upgrade won't succeed. - */ - @Override - public void beforeTests(TestSetup setup) throws Throwable { - testWithSNMP(this, setup); - } - }); - } - - private void beforeTestSetupWithSNMP(TestConfiguration testConfig, TestSetup setup) throws Exception { - setup.withApacheSetup().init(); - ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); - ApacheDirectiveTree config = component.loadParser(); - config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); - - DeploymentConfig deployConfig = setup.getDeploymentConfig(); - - VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); - - Map<String, String> replacements = deployConfig.getTokenReplacements(); - - testConfig.defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey()); - - if (deployConfig.vhost1 != null) { - testConfig.defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec(replacements))); - } - - if (deployConfig.vhost2 != null) { - testConfig.defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec(replacements))); - } - - if (deployConfig.vhost3 != null) { - testConfig.defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec(replacements))); - } - - if (deployConfig.vhost4 != null) { - testConfig.defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec(replacements))); - } - - setup.withDefaultOverrides(testConfig.defaultOverrides); - } - - private void testWithSNMP(TestConfiguration testConfig, TestSetup setup) { - //ok, now we should see the resources upgraded in the fake server inventory. - ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); - ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); - - Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); - - assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); - - Resource server = servers.iterator().next(); - - String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfig.serverRoot, testConfig.serverRoot - + "/conf/httpd.conf"); - - assertEquals(server.getResourceKey(), expectedResourceKey, - "The server resource key doesn't seem to be upgraded."); - - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); - - assertEquals(vhosts.size(), 4, "Unexpected number of vhosts discovered found"); - - //let's check that the main vhost has a an upgrade error attached to it - ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); - ApacheDirectiveTree config = component.loadParser(); - config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); - VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); - - String mainVhostRK = keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey(); - - Resource mainVhost = null; - for(Resource r : vhosts) { - if (mainVhostRK.equals(r.getResourceKey())) { - mainVhost = r; - break; - } - } - - assertNotNull(mainVhost, "Couldn't find the main vhost with the expected resource key '" + mainVhostRK + "'."); - - List<ResourceError> errors = mainVhost.getResourceErrors(ResourceErrorType.UPGRADE); - assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); - assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); - - //check that all other vhosts were not upgraded but have no errors - for(Resource r : vhosts) { - if (r.equals(mainVhost)) { - continue; - } - - assertEquals(r.getResourceErrors(ResourceErrorType.UPGRADE).size(), 0, "Unexpected number of resource upgrade errors on non-main vhost " + r); - } - } -} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java deleted file mode 100644 index b43d3f3..0000000 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java +++ /dev/null @@ -1,549 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.plugins.apache; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; - -import java.io.StringReader; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.testng.annotations.Parameters; -import org.testng.annotations.Test; - -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceError; -import org.rhq.core.domain.resource.ResourceErrorType; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.util.stream.StreamUtil; -import org.rhq.plugins.apache.parser.ApacheDirectiveTree; -import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; -import org.rhq.plugins.apache.util.RuntimeApacheConfiguration; -import org.rhq.plugins.apache.util.VirtualHostLegacyResourceKeyUtil; -import org.rhq.test.TokenReplacingReader; -import org.rhq.test.pc.PluginContainerSetup; - -/** - * - * - * @author Lukas Krejci - */ -public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase { - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - upgradeShouldSucceed = false; - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - - /** - * Do our own tests here, because the generic test method won't do much, since - * we told it that the upgrade won't succeed. - */ - @Override - public void beforeTests(TestSetup setup) throws Throwable { - String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); - testExpectedFailures(this, setup, 4, failingRK); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - upgradeShouldSucceed = false; - - //just define the servername value without actually setting the ${servername.directive} so that - //we don't define a servername directive itself but do have a value for the actual server name. - //this is deduced by apache and the plugin but tests aren't that clever. - defaultOverrides.put("servername", "${localhost.ip}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - - @Override - public void beforeTests(TestSetup setup) throws Throwable { - String vhost1RK = interpret("${vhost1.rhq3.resource.key}", setup.getInventoryFileReplacements()); - testExpectedFailures(this, setup, 5, vhost1RK); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithUnresolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - upgradeShouldSucceed = false; - - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${listen3}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${listen4}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - - /** - * Do our own tests here, because the generic test method won't do much, since - * we told it that the upgrade won't succeed. - */ - @Override - public void beforeTests(TestSetup setup) throws Throwable { - String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); - testExpectedFailures(this, setup, 4, failingRK); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithUnresolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - //we use this in the serialized inventory to init the URL of the main server. The localhost.ip is actually what - //the RHQ 301 discovers even though unresolvable.host is specified in the ServerName directive. - defaultOverrides.put("servername", "${localhost.ip}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${port1}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${port2}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${port3}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${port4}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithNonUniqueNamesWithSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - upgradeShouldSucceed = false; - - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - - /** - * Do our own tests here, because the generic test method won't do much, since - * we told it that the upgrade won't succeed. - */ - @Override - public void beforeTests(TestSetup setup) throws Throwable { - String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); - testExpectedFailures(this, setup, 4, failingRK); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithNonUniqueNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - - //we use this in the serialized inventory to init the URL of the main server. The localhost.ip is actually what - //the RHQ 301 discovers even though unresolvable.host is specified in the ServerName directive. - defaultOverrides.put("servername", "${localhost.ip}"); - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), - "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), - "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), - "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), - "ServerName ${unresolvable.host}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - }); - } - - /** - * The duplicate Main vhosts "condition" was triggered by: - * <ol> - * <li>Disabling SNMP by putting in an invalid hostname - * <li>Changing the URL of the apache server to some "other" value - * <li>Running discovery - * </ol> - * From that point on, 2 Main vhosts live in the inventory and the inventory has the "rest" - * of the resource keys coming from the SNMP based discovery. - * - * It is not possible to recover from such condition automatically during - * the resource upgrade, so the only thing we need to check here is that - * the two main vhosts are marked as failed upgrade and that the rest of the vhosts - * are not upgraded and have no upgrade errors attached. - * - * @param installDir - * @param exePath - * @throws Throwable - */ - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testDuplicateMainVhostsMarkedAsFailedUpgrade(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - upgradeShouldSucceed = false; - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - - /** - * Do our own tests here, because the generic test method won't do much, since - * we told it that the upgrade won't succeed. - */ - @Override - public void beforeTests(TestSetup setup) throws Throwable { - String mainVHost1RK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); - String mainVhost2RK = interpret("${localhost}:${port1}", setup.getInventoryFileReplacements()); - - testExpectedFailures(this, setup, 5, mainVHost1RK, mainVhost2RK); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithAnyAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - //yes, the inventory file can be the same for both the with and without snmp tests because - //they both yield the same inventory in this case. - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml"; - serverRoot = installPath; - binPath = exePath; - - //just define the servername value without actually setting the ${servername.directive} so that - //we don't define a servername directive itself but do have a value for the actual server name. - //this is deduced by apache and the plugin but tests aren't that clever. - defaultOverrides.put("servername", "${localhost.ip}"); - defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - }); - } - - /** - * Unlike other SNMP tests this one actually succeeds to upgrade because of the messed up discovery that - * RHQ 3.0.0 would perform. In case of any-address (0.0.0.0), the main vhost would get the MainServer - * resource key even with SNMP, because RHQ 3 codebase wouldn't be able to match what it think should - * have been the SNMP record with the actual results from SNMP module. - * - * Because of this, RHQ 3 discovers all 5 vhosts and the upgrade code is therefore able to successfully - * upgrade all of them. - * - * @param installPath - * @param exePath - * @throws Throwable - */ - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithAnyAddressWithSNMP(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml"; - serverRoot = installPath; - binPath = exePath; - - defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - }); - } - - /** - * This configuration will fail to upgrade the first vhost, because it doesn't uniquely match to new-style - * vhosts - it could be either a main vhost or vhost1. - */ - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithWildcardAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; - serverRoot = installPath; - binPath = exePath; - upgradeShouldSucceed = false; - - //just define the servername value without actually setting the ${servername.directive} so that - //we don't define a servername directive itself but do have a value for the actual server name. - //this is deduced by apache and the plugin but tests aren't that clever. - defaultOverrides.put("servername", "${localhost.ip}"); - defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - - @Override - public void beforeTests(TestSetup setup) throws Throwable { - String failingRK = interpret("${vhost1.rhq3.resource.key}", setup.getInventoryFileReplacements()); - testExpectedFailures(this, setup, 5, failingRK); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithWildcardAddressWithSNMP(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; - serverRoot = installPath; - binPath = exePath; - upgradeShouldSucceed = false; - - defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - - /** - * Do our own tests here, because the generic test method won't do much, since - * we told it that the upgrade won't succeed. - */ - @Override - public void beforeTests(TestSetup setup) throws Throwable { - String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); - testExpectedFailures(this, setup, 4, failingRK); - } - }); - } - - private void defineRHQ3ResourceKeys(TestConfiguration testConfig, TestSetup setup) throws Exception { - setup.withApacheSetup().init(); - ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); - ApacheDirectiveTree config = component.loadParser(); - config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); - - DeploymentConfig deployConfig = setup.getDeploymentConfig(); - - VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); - - Map<String, String> replacements = deployConfig.getTokenReplacements(); - - testConfig.defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey()); - - if (deployConfig.vhost1 != null) { - testConfig.defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec(replacements))); - } - - if (deployConfig.vhost2 != null) { - testConfig.defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec(replacements))); - } - - if (deployConfig.vhost3 != null) { - testConfig.defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec(replacements))); - } - - if (deployConfig.vhost4 != null) { - testConfig.defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec(replacements))); - } - - setup.withDefaultOverrides(testConfig.defaultOverrides); - } - - private void testExpectedFailures(TestConfiguration testConfig, TestSetup setup, int numberOfVhosts, String... failingRKs) { - //ok, now we should see the resources upgraded in the fake server inventory. - ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); - ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); - - Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); - - assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); - - Resource server = servers.iterator().next(); - - String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfig.serverRoot, testConfig.serverRoot - + "/conf/httpd.conf"); - - assertEquals(server.getResourceKey(), expectedResourceKey, - "The server resource key doesn't seem to be upgraded."); - - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); - - assertEquals(vhosts.size(), numberOfVhosts, "Unexpected number of vhosts discovered found"); - - //let's check that the main vhost has a an upgrade error attached to it - ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); - ApacheDirectiveTree config = component.loadParser(); - config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); - VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); - - Set<Resource> failingResources = new HashSet<Resource>(); - - for(String rk : failingRKs) { - for(Resource r : vhosts) { - if (rk.equals(r.getResourceKey())) { - failingResources.add(r); - break; - } - } - } - - assertEquals(failingResources.size(), failingRKs.length, "Couldn't find all the resources that should have failed."); - - for(Resource failingResource : failingResources) { - List<ResourceError> errors = failingResource.getResourceErrors(ResourceErrorType.UPGRADE); - assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); - assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); - } - - //check that all other vhosts were not upgraded but have no errors - for(Resource r : vhosts) { - if (failingResources.contains(r)) { - continue; - } - - assertEquals(r.getResourceErrors(ResourceErrorType.UPGRADE).size(), 0, "Unexpected number of resource upgrade errors on non-main vhost " + r); - } - } - - private String interpret(String string, Map<String, String> variables) { - return StreamUtil.slurp(new TokenReplacingReader(new StringReader(string), variables)); - } -} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java deleted file mode 100644 index 831b2d8..0000000 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java +++ /dev/null @@ -1,596 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.plugins.apache; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - -import java.io.File; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.net.InetAddress; -import java.net.URI; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jmock.Expectations; -import org.testng.annotations.BeforeClass; - -import org.rhq.core.clientapi.agent.metadata.PluginMetadataParser; -import org.rhq.core.clientapi.descriptor.AgentPluginDescriptorUtil; -import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor; -import org.rhq.core.clientapi.server.discovery.InventoryReport; -import org.rhq.core.domain.discovery.AvailabilityReport; -import org.rhq.core.domain.resource.InventoryStatus; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceError; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.pc.ServerServices; -import org.rhq.core.pc.upgrade.FakeServerInventory; -import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; -import org.rhq.core.pluginapi.inventory.PluginContainerDeployment; -import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; -import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; -import org.rhq.core.system.SystemInfoFactory; -import org.rhq.plugins.apache.parser.ApacheConfigReader; -import org.rhq.plugins.apache.parser.ApacheDirectiveTree; -import org.rhq.plugins.apache.parser.ApacheParser; -import org.rhq.plugins.apache.parser.ApacheParserImpl; -import org.rhq.plugins.apache.util.ApacheDeploymentUtil; -import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; -import org.rhq.plugins.apache.util.ApacheExecutionUtil; -import org.rhq.plugins.apache.util.HttpdAddressUtility; -import org.rhq.plugins.apache.util.VHostSpec; -import org.rhq.test.ObjectCollectionSerializer; -import org.rhq.test.TokenReplacingReader; -import org.rhq.test.pc.PluginContainerTest; - - -/** - * Base class for the upgrade test classes. - * - * @author Lukas Krejci - */ -public class UpgradeTestBase extends PluginContainerTest { - - private static final Log LOG = LogFactory.getLog(UpgradeTestBase.class); - - protected class TestSetup { - private String configurationName; - private FakeServerInventory fakeInventory = new FakeServerInventory(); - private String inventoryFile; - private Resource platform; - private ApacheSetup apacheSetup = new ApacheSetup(); - private DeploymentConfig deploymentConfig; - private Map<String, String> defaultOverrides = new HashMap<String, String>(); - private Map<String, String> inventoryFileReplacements; - - public class ApacheSetup { - private String serverRoot; - private String exePath; - private Collection<String> configurationFiles; - private ApacheExecutionUtil execution; - private boolean deploy = true; - - private ApacheSetup() { - - } - - public ApacheSetup withServerRoot(String serverRoot) { - this.serverRoot = serverRoot; - //auto-define the server root property as if it was passed on the commandline - System.getProperties().put(configurationName + ".server.root", serverRoot); - deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName, defaultOverrides); - return this; - } - - public ApacheSetup withExePath(String exePath) { - this.exePath = exePath; - return this; - } - - public ApacheSetup withConfigurationFiles(String... classPathUris) { - return withConfigurationFiles(Arrays.asList(classPathUris)); - } - - public ApacheSetup withConfigurationFiles(Collection<String> classPathUris) { - this.configurationFiles = classPathUris; - return this; - } - - public ApacheSetup withDeploymentOnSetup() { - this.deploy = true; - return this; - } - - public ApacheSetup withNoDeploymentOnSetup() { - this.deploy = false; - return this; - } - - public ApacheExecutionUtil getExecutionUtil() { - return execution; - } - - public void init() throws Exception { - File serverRootDir = new File(serverRoot); - - assertTrue(serverRootDir.exists(), "The configured server root denotes a non-existant directory: '" - + serverRootDir + "'."); - - File confDir = new File(serverRootDir, "conf"); - - assertTrue(confDir.exists(), - "The configured server root denotes a directory that doesn't have a 'conf' subdirectory. This is unexpected."); - - String confFilePath = confDir.getAbsolutePath() + File.separatorChar + "httpd.conf"; - - String snmpHost = null; - int snmpPort = 0; - String pingUrl = null; - - if (configurationName != null) { - if (deploy) { - ApacheDeploymentUtil.deployConfiguration(confDir, configurationFiles, deploymentConfig); - } - - //ok, now try to find the ping URL. The best thing is to actually invoke - //the same code the apache server discovery does. - ApacheDirectiveTree tree = new ApacheDirectiveTree(); - ApacheParser parser = new ApacheParserImpl(tree, serverRootDir.getAbsolutePath()); - ApacheConfigReader.buildTree(confFilePath, parser); - - //XXX this hardcodes apache2 as the only option we have... - HttpdAddressUtility.Address addrToUse = HttpdAddressUtility.APACHE_2_x.getMainServerSampleAddress(tree, null, -1); - pingUrl = addrToUse.toString(); - - snmpHost = deploymentConfig.snmpHost; - snmpPort = deploymentConfig.snmpPort; - } - - execution = new ApacheExecutionUtil(findApachePluginResourceTypeByName("Apache HTTP Server"), - serverRoot, exePath, confFilePath, pingUrl, - snmpHost, snmpPort); - execution.init(); - } - - private void doSetup() throws Exception { - init(); - execution.invokeOperation("start"); - } - - public TestSetup setup() throws Exception { - return TestSetup.this.setup(); - } - } - - public TestSetup(String configurationName) { - this.configurationName = configurationName; - deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName, defaultOverrides); - } - - public TestSetup withInventoryFrom(String classPathUri) { - inventoryFile = classPathUri; - return this; - } - - public TestSetup withDefaultOverrides(Map<String, String> defaultOverrides) { - this.defaultOverrides = defaultOverrides == null ? new HashMap<String, String>() : defaultOverrides; - deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName, this.defaultOverrides); - return this; - } - - public TestSetup withPlatformResource(Resource platform) { - this.platform = platform; - return this; - } - - public ApacheSetup withApacheSetup() { - return apacheSetup; - } - - public TestSetup withDefaultExpectations() throws Exception { - context.checking(new Expectations() { - { - addDefaultExceptations(this); - } - }); - - return this; - } - - @SuppressWarnings("unchecked") - public void addDefaultExceptations(Expectations expectations) throws Exception { - ServerServices ss = getCurrentPluginContainerConfiguration().getServerServices(); - - expectations.allowing(ss.getDiscoveryServerService()).mergeInventoryReport( - expectations.with(Expectations.any(InventoryReport.class))); - expectations.will(fakeInventory.mergeInventoryReport(InventoryStatus.COMMITTED)); - - expectations.allowing(ss.getDiscoveryServerService()).upgradeResources( - expectations.with(Expectations.any(Set.class))); - expectations.will(fakeInventory.upgradeResources()); - - expectations.allowing(ss.getDiscoveryServerService()).getResources( - expectations.with(Expectations.any(Set.class)), expectations.with(Expectations.any(boolean.class))); - expectations.will(fakeInventory.getResources()); - - expectations.allowing(ss.getDiscoveryServerService()).setResourceError(expectations.with(Expectations.any(ResourceError.class))); - expectations.will(fakeInventory.setResourceError()); - - expectations.allowing(ss.getDiscoveryServerService()).mergeAvailabilityReport( - expectations.with(Expectations.any(AvailabilityReport.class))); - - expectations.allowing(ss.getDiscoveryServerService()).postProcessNewlyCommittedResources( - expectations.with(Expectations.any(Set.class))); - - expectations.allowing(ss.getDiscoveryServerService()).clearResourceConfigError( - expectations.with(Expectations.any(int.class))); - - expectations.ignoring(ss.getBundleServerService()); - expectations.ignoring(ss.getConfigurationServerService()); - expectations.ignoring(ss.getContentServerService()); - expectations.ignoring(ss.getCoreServerService()); - expectations.ignoring(ss.getEventServerService()); - expectations.ignoring(ss.getMeasurementServerService()); - expectations.ignoring(ss.getOperationServerService()); - expectations.ignoring(ss.getResourceFactoryServerService()); - } - - public FakeServerInventory getFakeInventory() { - return fakeInventory; - } - - public DeploymentConfig getDeploymentConfig() { - return deploymentConfig; - } - - public TestSetup setup() throws Exception { - apacheSetup.doSetup(); - - Map<String, String> replacements = deploymentConfig.getTokenReplacements(); - replacements.put("server.root", apacheSetup.serverRoot); - replacements.put("exe.path", apacheSetup.exePath); - - ApacheDeploymentUtil.addDefaultVariables(replacements, null); - - HttpdAddressUtility addressUtility = apacheSetup.getExecutionUtil().getServerComponent() - .getAddressUtility(); - ApacheDirectiveTree runtimeConfig = apacheSetup.getExecutionUtil().getRuntimeConfiguration(); - - replacements.put("snmp.identifier", - addressUtility.getHttpdInternalMainServerAddressRepresentation(runtimeConfig).toString(false, false)); - - replacements.put("main.rhq4.resource.key", ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); - - VHostSpec vhost1 = deploymentConfig.vhost1 == null ? null : deploymentConfig.vhost1.getVHostSpec(replacements); - VHostSpec vhost2 = deploymentConfig.vhost2 == null ? null : deploymentConfig.vhost2.getVHostSpec(replacements); - VHostSpec vhost3 = deploymentConfig.vhost3 == null ? null : deploymentConfig.vhost3.getVHostSpec(replacements); - VHostSpec vhost4 = deploymentConfig.vhost4 == null ? null : deploymentConfig.vhost4.getVHostSpec(replacements); - - if (vhost1 != null) { - replacements.put( - "vhost1.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost1.hosts.get(0), - vhost1.serverName).toString(false, false)); - - replacements.put( - "vhost1.rhq4.resource.key", - ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - vhost1.serverName, vhost1.hosts)); - } - - if (vhost2 != null) { - replacements.put( - "vhost2.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost2.hosts.get(0), - vhost2.serverName).toString(false, false)); - - replacements.put( - "vhost2.rhq4.resource.key", - ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - vhost2.serverName, vhost2.hosts)); - } - - if (vhost3 != null) { - replacements.put( - "vhost3.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost3.hosts.get(0), - vhost3.serverName).toString(false, false)); - - replacements.put( - "vhost3.rhq4.resource.key", - ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - vhost3.serverName, vhost3.hosts)); - } - - if (vhost4 != null) { - replacements.put( - "vhost4.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost4.hosts.get(0), - vhost4.serverName).toString(false, false)); - - replacements.put( - "vhost4.rhq4.resource.key", - ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - vhost4.serverName, vhost4.hosts)); - } - - //let the user override everything we just did - replacements.putAll(defaultOverrides); - - inventoryFileReplacements = replacements; - - InputStream dataStream = getClass().getResourceAsStream(inventoryFile); - - Reader rdr = new TokenReplacingReader(new InputStreamReader(dataStream), replacements); - - @SuppressWarnings("unchecked") - List<Resource> inventory = (List<Resource>) new ObjectCollectionSerializer().deserialize(rdr); - - //fix up the parent relationships, because they might not be reconstructed correctly by - //JAXB - we're missing XmlID and XmlIDRef annotations in our model - fixupParent(null, inventory); - - fakeInventory.prepopulateInventory(platform, inventory); - - return this; - } - - /** - * After the setup, this returns all the variables used to update the tokens in the inventory file. - * - * @return - */ - public Map<String, String> getInventoryFileReplacements() { - return inventoryFileReplacements; - } - - private void fixupParent(Resource parent, Collection<Resource> children) { - for (Resource child : children) { - child.setParentResource(parent); - if (child.getChildResources() != null) { - fixupParent(child, child.getChildResources()); - } - } - } - } - - protected static class TestConfiguration { - public String[] apacheConfigurationFiles; - public String inventoryFile; - public String configurationName; - public String serverRoot; - public String binPath; - public Map<String, String> defaultOverrides = new HashMap<String, String>(); - public boolean upgradeShouldSucceed = true; - - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - - } - - public void beforePluginContainerStart(TestSetup setup) throws Throwable { - - } - - public void beforeTests(TestSetup setup) throws Throwable { - - } - } - - protected static final String PLATFORM_PLUGIN = "file:target/itest/plugins/rhq-platform-plugin-for-apache-test.jar"; - protected static final String AUGEAS_PLUGIN = "file:target/itest/plugins/rhq-augeas-plugin-for-apache-test.jar"; - protected static final String APACHE_PLUGIN = "file:target/itest/plugins/rhq-apache-plugin-for-apache-test.jar"; - - protected static final String DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES = "simpleWithResolvableServerNames"; - protected static final String DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES = "simpleWithUnresolvableServerNames"; - protected static final String DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS = "simpleWithWildcardListens"; - - private List<ResourceType> resourceTypesInApachePlugin; - protected Resource platform; - - @BeforeClass - public void parseResourceTypesFromApachePlugin() throws Exception { - resourceTypesInApachePlugin = getResourceTypesInPlugin(APACHE_PLUGIN); - platform = discoverPlatform(); - } - - protected ResourceType findApachePluginResourceTypeByName(String resourceTypeName) { - for (ResourceType rt : resourceTypesInApachePlugin) { - if (resourceTypeName.equals(rt.getName())) { - return rt; - } - } - - return null; - } - - protected void testUpgrade(TestConfiguration testConfiguration) throws Throwable { - final TestSetup setup = new TestSetup(testConfiguration.configurationName); - boolean testFailed = false; - try { - - String[] configFiles = Arrays.copyOf(testConfiguration.apacheConfigurationFiles, testConfiguration.apacheConfigurationFiles.length + 2); - configFiles[testConfiguration.apacheConfigurationFiles.length] = "/snmpd.conf"; - configFiles[testConfiguration.apacheConfigurationFiles.length + 1] = "/mime.types"; - - setup.withInventoryFrom(testConfiguration.inventoryFile) - .withPlatformResource(platform).withDefaultExpectations().withDefaultOverrides(testConfiguration.defaultOverrides) - .withApacheSetup().withConfigurationFiles(configFiles) - .withServerRoot(testConfiguration.serverRoot).withExePath(testConfiguration.binPath); - - testConfiguration.beforeTestSetup(setup); - - setup.setup(); - - testConfiguration.beforePluginContainerStart(setup); - - startConfiguredPluginContainer(); - - testConfiguration.beforeTests(setup); - - if (!testConfiguration.upgradeShouldSucceed) { - return; - } - - //ok, now we should see the resources upgraded in the fake server inventory. - ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); - ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); - - Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); - - assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); - - Resource server = servers.iterator().next(); - - String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfiguration.serverRoot, testConfiguration.serverRoot - + "/conf/httpd.conf"); - - assertEquals(server.getResourceKey(), expectedResourceKey, - "The server resource key doesn't seem to be upgraded."); - - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); - - assertEquals(vhosts.size(), 5, "Unexpected number of vhosts discovered found"); - - List<String> expectedResourceKeys = new ArrayList<String>(5); - - DeploymentConfig dc = setup.getDeploymentConfig(); - Map<String, String> replacements = dc.getTokenReplacements(); - - VHostSpec vh1 = dc.vhost1.getVHostSpec(replacements); - VHostSpec vh2 = dc.vhost2.getVHostSpec(replacements); - VHostSpec vh3 = dc.vhost3.getVHostSpec(replacements); - VHostSpec vh4 = dc.vhost4.getVHostSpec(replacements); - - expectedResourceKeys.add(ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - vh1.serverName, vh1.hosts)); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - vh2.serverName, vh2.hosts)); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - vh3.serverName, vh3.hosts)); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - vh4.serverName, vh4.hosts)); - - for (Resource vhost : vhosts) { - assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), - "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'. Only expecting " + expectedResourceKeys); - } - } catch (Throwable t) { - testFailed = true; - LOG.error("Error during test upgrade execution.", t); - throw t; - } finally { - try { - setup.withApacheSetup().getExecutionUtil().invokeOperation("stop"); - } catch (Exception e) { - if (testFailed) { - LOG.error("Failed to stop apache.", e); - } else { - throw e; - } - } - } - } - - private static List<ResourceType> getResourceTypesInPlugin(String pluginUri) throws Exception { - PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(new URI(pluginUri).toURL()); - PluginMetadataParser parser = new PluginMetadataParser(descriptor, - Collections.<String, PluginMetadataParser> emptyMap()); - - return parser.getAllTypes(); - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - private static Resource discoverPlatform() throws Exception { - PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(new URI(PLATFORM_PLUGIN) - .toURL()); - PluginMetadataParser parser = new PluginMetadataParser(descriptor, - Collections.<String, PluginMetadataParser> emptyMap()); - - List<ResourceType> platformTypes = parser.getAllTypes(); - - for (ResourceType rt : platformTypes) { - Class discoveryClass = Class.forName(parser.getDiscoveryComponentClass(rt)); - - ResourceDiscoveryComponent discoveryComponent = (ResourceDiscoveryComponent) discoveryClass.newInstance(); - - ResourceDiscoveryContext context = new ResourceDiscoveryContext(rt, null, null, - SystemInfoFactory.createSystemInfo(), null, null, PluginContainerDeployment.AGENT); - - Set<DiscoveredResourceDetails> results = discoveryComponent.discoverResources(context); - - if (!results.isEmpty()) { - DiscoveredResourceDetails details = results.iterator().next(); - - Resource platform = new Resource(); - - platform.setDescription(details.getResourceDescription()); - platform.setResourceKey(details.getResourceKey()); - platform.setName(details.getResourceName()); - platform.setVersion(details.getResourceVersion()); - platform.setPluginConfiguration(details.getPluginConfiguration()); - platform.setResourceType(rt); - platform.setUuid(UUID.randomUUID().toString()); - platform.setId(1); - - return platform; - } - } - - return null; - } - - protected static String variableName(String prefix, String name) { - StringBuilder bld = new StringBuilder(); - if (prefix != null && !prefix.isEmpty()) { - bld.append(prefix).append("."); - } - - bld.append(name); - - return bld.toString(); - } - - protected static InetAddress determineLocalhost() { - try { - return InetAddress.getLocalHost(); - } catch (UnknownHostException e) { - try { - return InetAddress.getByName("127.0.0.1"); - } catch (UnknownHostException ee) { - //doesn't happen - return null; - } - } - } -} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java new file mode 100644 index 0000000..358df93 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java @@ -0,0 +1,599 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.upgrade; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.io.File; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.net.InetAddress; +import java.net.URI; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jmock.Expectations; +import org.testng.annotations.BeforeClass; + +import org.rhq.core.clientapi.agent.metadata.PluginMetadataParser; +import org.rhq.core.clientapi.descriptor.AgentPluginDescriptorUtil; +import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor; +import org.rhq.core.clientapi.server.discovery.InventoryReport; +import org.rhq.core.domain.discovery.AvailabilityReport; +import org.rhq.core.domain.resource.InventoryStatus; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceError; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pc.ServerServices; +import org.rhq.core.pc.upgrade.FakeServerInventory; +import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; +import org.rhq.core.pluginapi.inventory.PluginContainerDeployment; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.core.system.SystemInfoFactory; +import org.rhq.plugins.apache.ApacheServerDiscoveryComponent; +import org.rhq.plugins.apache.ApacheVirtualHostServiceComponent; +import org.rhq.plugins.apache.ApacheVirtualHostServiceDiscoveryComponent; +import org.rhq.plugins.apache.parser.ApacheConfigReader; +import org.rhq.plugins.apache.parser.ApacheDirectiveTree; +import org.rhq.plugins.apache.parser.ApacheParser; +import org.rhq.plugins.apache.parser.ApacheParserImpl; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; +import org.rhq.plugins.apache.util.ApacheExecutionUtil; +import org.rhq.plugins.apache.util.HttpdAddressUtility; +import org.rhq.plugins.apache.util.VHostSpec; +import org.rhq.test.ObjectCollectionSerializer; +import org.rhq.test.TokenReplacingReader; +import org.rhq.test.pc.PluginContainerTest; + + +/** + * Base class for the upgrade test classes. + * + * @author Lukas Krejci + */ +public class UpgradeTestBase extends PluginContainerTest { + + private static final Log LOG = LogFactory.getLog(UpgradeTestBase.class); + + protected class TestSetup { + private String configurationName; + private FakeServerInventory fakeInventory = new FakeServerInventory(); + private String inventoryFile; + private Resource platform; + private ApacheSetup apacheSetup = new ApacheSetup(); + private DeploymentConfig deploymentConfig; + private Map<String, String> defaultOverrides = new HashMap<String, String>(); + private Map<String, String> inventoryFileReplacements; + + public class ApacheSetup { + private String serverRoot; + private String exePath; + private Collection<String> configurationFiles; + private ApacheExecutionUtil execution; + private boolean deploy = true; + + private ApacheSetup() { + + } + + public ApacheSetup withServerRoot(String serverRoot) { + this.serverRoot = serverRoot; + //auto-define the server root property as if it was passed on the commandline + System.getProperties().put(configurationName + ".server.root", serverRoot); + deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName, defaultOverrides); + return this; + } + + public ApacheSetup withExePath(String exePath) { + this.exePath = exePath; + return this; + } + + public ApacheSetup withConfigurationFiles(String... classPathUris) { + return withConfigurationFiles(Arrays.asList(classPathUris)); + } + + public ApacheSetup withConfigurationFiles(Collection<String> classPathUris) { + this.configurationFiles = classPathUris; + return this; + } + + public ApacheSetup withDeploymentOnSetup() { + this.deploy = true; + return this; + } + + public ApacheSetup withNoDeploymentOnSetup() { + this.deploy = false; + return this; + } + + public ApacheExecutionUtil getExecutionUtil() { + return execution; + } + + public void init() throws Exception { + File serverRootDir = new File(serverRoot); + + assertTrue(serverRootDir.exists(), "The configured server root denotes a non-existant directory: '" + + serverRootDir + "'."); + + File confDir = new File(serverRootDir, "conf"); + + assertTrue(confDir.exists(), + "The configured server root denotes a directory that doesn't have a 'conf' subdirectory. This is unexpected."); + + String confFilePath = confDir.getAbsolutePath() + File.separatorChar + "httpd.conf"; + + String snmpHost = null; + int snmpPort = 0; + String pingUrl = null; + + if (configurationName != null) { + if (deploy) { + ApacheDeploymentUtil.deployConfiguration(confDir, configurationFiles, deploymentConfig); + } + + //ok, now try to find the ping URL. The best thing is to actually invoke + //the same code the apache server discovery does. + ApacheDirectiveTree tree = new ApacheDirectiveTree(); + ApacheParser parser = new ApacheParserImpl(tree, serverRootDir.getAbsolutePath()); + ApacheConfigReader.buildTree(confFilePath, parser); + + //XXX this hardcodes apache2 as the only option we have... + HttpdAddressUtility.Address addrToUse = HttpdAddressUtility.APACHE_2_x.getMainServerSampleAddress(tree, null, -1); + pingUrl = addrToUse.toString(); + + snmpHost = deploymentConfig.snmpHost; + snmpPort = deploymentConfig.snmpPort; + } + + execution = new ApacheExecutionUtil(findApachePluginResourceTypeByName("Apache HTTP Server"), + serverRoot, exePath, confFilePath, pingUrl, + snmpHost, snmpPort); + execution.init(); + } + + private void doSetup() throws Exception { + init(); + execution.invokeOperation("start"); + } + + public TestSetup setup() throws Exception { + return TestSetup.this.setup(); + } + } + + public TestSetup(String configurationName) { + this.configurationName = configurationName; + deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName, defaultOverrides); + } + + public TestSetup withInventoryFrom(String classPathUri) { + inventoryFile = classPathUri; + return this; + } + + public TestSetup withDefaultOverrides(Map<String, String> defaultOverrides) { + this.defaultOverrides = defaultOverrides == null ? new HashMap<String, String>() : defaultOverrides; + deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName, this.defaultOverrides); + return this; + } + + public TestSetup withPlatformResource(Resource platform) { + this.platform = platform; + return this; + } + + public ApacheSetup withApacheSetup() { + return apacheSetup; + } + + public TestSetup withDefaultExpectations() throws Exception { + context.checking(new Expectations() { + { + addDefaultExceptations(this); + } + }); + + return this; + } + + @SuppressWarnings("unchecked") + public void addDefaultExceptations(Expectations expectations) throws Exception { + ServerServices ss = getCurrentPluginContainerConfiguration().getServerServices(); + + expectations.allowing(ss.getDiscoveryServerService()).mergeInventoryReport( + expectations.with(Expectations.any(InventoryReport.class))); + expectations.will(fakeInventory.mergeInventoryReport(InventoryStatus.COMMITTED)); + + expectations.allowing(ss.getDiscoveryServerService()).upgradeResources( + expectations.with(Expectations.any(Set.class))); + expectations.will(fakeInventory.upgradeResources()); + + expectations.allowing(ss.getDiscoveryServerService()).getResources( + expectations.with(Expectations.any(Set.class)), expectations.with(Expectations.any(boolean.class))); + expectations.will(fakeInventory.getResources()); + + expectations.allowing(ss.getDiscoveryServerService()).setResourceError(expectations.with(Expectations.any(ResourceError.class))); + expectations.will(fakeInventory.setResourceError()); + + expectations.allowing(ss.getDiscoveryServerService()).mergeAvailabilityReport( + expectations.with(Expectations.any(AvailabilityReport.class))); + + expectations.allowing(ss.getDiscoveryServerService()).postProcessNewlyCommittedResources( + expectations.with(Expectations.any(Set.class))); + + expectations.allowing(ss.getDiscoveryServerService()).clearResourceConfigError( + expectations.with(Expectations.any(int.class))); + + expectations.ignoring(ss.getBundleServerService()); + expectations.ignoring(ss.getConfigurationServerService()); + expectations.ignoring(ss.getContentServerService()); + expectations.ignoring(ss.getCoreServerService()); + expectations.ignoring(ss.getEventServerService()); + expectations.ignoring(ss.getMeasurementServerService()); + expectations.ignoring(ss.getOperationServerService()); + expectations.ignoring(ss.getResourceFactoryServerService()); + } + + public FakeServerInventory getFakeInventory() { + return fakeInventory; + } + + public DeploymentConfig getDeploymentConfig() { + return deploymentConfig; + } + + public TestSetup setup() throws Exception { + apacheSetup.doSetup(); + + Map<String, String> replacements = deploymentConfig.getTokenReplacements(); + replacements.put("server.root", apacheSetup.serverRoot); + replacements.put("exe.path", apacheSetup.exePath); + + ApacheDeploymentUtil.addDefaultVariables(replacements, null); + + HttpdAddressUtility addressUtility = apacheSetup.getExecutionUtil().getServerComponent() + .getAddressUtility(); + ApacheDirectiveTree runtimeConfig = apacheSetup.getExecutionUtil().getRuntimeConfiguration(); + + replacements.put("snmp.identifier", + addressUtility.getHttpdInternalMainServerAddressRepresentation(runtimeConfig).toString(false, false)); + + replacements.put("main.rhq4.resource.key", ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); + + VHostSpec vhost1 = deploymentConfig.vhost1 == null ? null : deploymentConfig.vhost1.getVHostSpec(replacements); + VHostSpec vhost2 = deploymentConfig.vhost2 == null ? null : deploymentConfig.vhost2.getVHostSpec(replacements); + VHostSpec vhost3 = deploymentConfig.vhost3 == null ? null : deploymentConfig.vhost3.getVHostSpec(replacements); + VHostSpec vhost4 = deploymentConfig.vhost4 == null ? null : deploymentConfig.vhost4.getVHostSpec(replacements); + + if (vhost1 != null) { + replacements.put( + "vhost1.snmp.identifier", + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost1.hosts.get(0), + vhost1.serverName).toString(false, false)); + + replacements.put( + "vhost1.rhq4.resource.key", + ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + vhost1.serverName, vhost1.hosts)); + } + + if (vhost2 != null) { + replacements.put( + "vhost2.snmp.identifier", + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost2.hosts.get(0), + vhost2.serverName).toString(false, false)); + + replacements.put( + "vhost2.rhq4.resource.key", + ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + vhost2.serverName, vhost2.hosts)); + } + + if (vhost3 != null) { + replacements.put( + "vhost3.snmp.identifier", + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost3.hosts.get(0), + vhost3.serverName).toString(false, false)); + + replacements.put( + "vhost3.rhq4.resource.key", + ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + vhost3.serverName, vhost3.hosts)); + } + + if (vhost4 != null) { + replacements.put( + "vhost4.snmp.identifier", + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost4.hosts.get(0), + vhost4.serverName).toString(false, false)); + + replacements.put( + "vhost4.rhq4.resource.key", + ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + vhost4.serverName, vhost4.hosts)); + } + + //let the user override everything we just did + replacements.putAll(defaultOverrides); + + inventoryFileReplacements = replacements; + + InputStream dataStream = getClass().getResourceAsStream(inventoryFile); + + Reader rdr = new TokenReplacingReader(new InputStreamReader(dataStream), replacements); + + @SuppressWarnings("unchecked") + List<Resource> inventory = (List<Resource>) new ObjectCollectionSerializer().deserialize(rdr); + + //fix up the parent relationships, because they might not be reconstructed correctly by + //JAXB - we're missing XmlID and XmlIDRef annotations in our model + fixupParent(null, inventory); + + fakeInventory.prepopulateInventory(platform, inventory); + + return this; + } + + /** + * After the setup, this returns all the variables used to update the tokens in the inventory file. + * + * @return + */ + public Map<String, String> getInventoryFileReplacements() { + return inventoryFileReplacements; + } + + private void fixupParent(Resource parent, Collection<Resource> children) { + for (Resource child : children) { + child.setParentResource(parent); + if (child.getChildResources() != null) { + fixupParent(child, child.getChildResources()); + } + } + } + } + + protected static class TestConfiguration { + public String[] apacheConfigurationFiles; + public String inventoryFile; + public String configurationName; + public String serverRoot; + public String binPath; + public Map<String, String> defaultOverrides = new HashMap<String, String>(); + public boolean upgradeShouldSucceed = true; + + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + + } + + public void beforePluginContainerStart(TestSetup setup) throws Throwable { + + } + + public void beforeTests(TestSetup setup) throws Throwable { + + } + } + + protected static final String PLATFORM_PLUGIN = "file:target/itest/plugins/rhq-platform-plugin-for-apache-test.jar"; + protected static final String AUGEAS_PLUGIN = "file:target/itest/plugins/rhq-augeas-plugin-for-apache-test.jar"; + protected static final String APACHE_PLUGIN = "file:target/itest/plugins/rhq-apache-plugin-for-apache-test.jar"; + + protected static final String DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES = "simpleWithResolvableServerNames"; + protected static final String DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES = "simpleWithUnresolvableServerNames"; + protected static final String DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS = "simpleWithWildcardListens"; + + private List<ResourceType> resourceTypesInApachePlugin; + protected Resource platform; + + @BeforeClass + public void parseResourceTypesFromApachePlugin() throws Exception { + resourceTypesInApachePlugin = getResourceTypesInPlugin(APACHE_PLUGIN); + platform = discoverPlatform(); + } + + protected ResourceType findApachePluginResourceTypeByName(String resourceTypeName) { + for (ResourceType rt : resourceTypesInApachePlugin) { + if (resourceTypeName.equals(rt.getName())) { + return rt; + } + } + + return null; + } + + protected void testUpgrade(TestConfiguration testConfiguration) throws Throwable { + final TestSetup setup = new TestSetup(testConfiguration.configurationName); + boolean testFailed = false; + try { + + String[] configFiles = Arrays.copyOf(testConfiguration.apacheConfigurationFiles, testConfiguration.apacheConfigurationFiles.length + 2); + configFiles[testConfiguration.apacheConfigurationFiles.length] = "/snmpd.conf"; + configFiles[testConfiguration.apacheConfigurationFiles.length + 1] = "/mime.types"; + + setup.withInventoryFrom(testConfiguration.inventoryFile) + .withPlatformResource(platform).withDefaultExpectations().withDefaultOverrides(testConfiguration.defaultOverrides) + .withApacheSetup().withConfigurationFiles(configFiles) + .withServerRoot(testConfiguration.serverRoot).withExePath(testConfiguration.binPath); + + testConfiguration.beforeTestSetup(setup); + + setup.setup(); + + testConfiguration.beforePluginContainerStart(setup); + + startConfiguredPluginContainer(); + + testConfiguration.beforeTests(setup); + + if (!testConfiguration.upgradeShouldSucceed) { + return; + } + + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); + + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfiguration.serverRoot, testConfiguration.serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), 5, "Unexpected number of vhosts discovered found"); + + List<String> expectedResourceKeys = new ArrayList<String>(5); + + DeploymentConfig dc = setup.getDeploymentConfig(); + Map<String, String> replacements = dc.getTokenReplacements(); + + VHostSpec vh1 = dc.vhost1.getVHostSpec(replacements); + VHostSpec vh2 = dc.vhost2.getVHostSpec(replacements); + VHostSpec vh3 = dc.vhost3.getVHostSpec(replacements); + VHostSpec vh4 = dc.vhost4.getVHostSpec(replacements); + + expectedResourceKeys.add(ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + vh1.serverName, vh1.hosts)); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + vh2.serverName, vh2.hosts)); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + vh3.serverName, vh3.hosts)); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + vh4.serverName, vh4.hosts)); + + for (Resource vhost : vhosts) { + assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), + "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'. Only expecting " + expectedResourceKeys); + } + } catch (Throwable t) { + testFailed = true; + LOG.error("Error during test upgrade execution.", t); + throw t; + } finally { + try { + setup.withApacheSetup().getExecutionUtil().invokeOperation("stop"); + } catch (Exception e) { + if (testFailed) { + LOG.error("Failed to stop apache.", e); + } else { + throw e; + } + } + } + } + + private static List<ResourceType> getResourceTypesInPlugin(String pluginUri) throws Exception { + PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(new URI(pluginUri).toURL()); + PluginMetadataParser parser = new PluginMetadataParser(descriptor, + Collections.<String, PluginMetadataParser> emptyMap()); + + return parser.getAllTypes(); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + private static Resource discoverPlatform() throws Exception { + PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(new URI(PLATFORM_PLUGIN) + .toURL()); + PluginMetadataParser parser = new PluginMetadataParser(descriptor, + Collections.<String, PluginMetadataParser> emptyMap()); + + List<ResourceType> platformTypes = parser.getAllTypes(); + + for (ResourceType rt : platformTypes) { + Class discoveryClass = Class.forName(parser.getDiscoveryComponentClass(rt)); + + ResourceDiscoveryComponent discoveryComponent = (ResourceDiscoveryComponent) discoveryClass.newInstance(); + + ResourceDiscoveryContext context = new ResourceDiscoveryContext(rt, null, null, + SystemInfoFactory.createSystemInfo(), null, null, PluginContainerDeployment.AGENT); + + Set<DiscoveredResourceDetails> results = discoveryComponent.discoverResources(context); + + if (!results.isEmpty()) { + DiscoveredResourceDetails details = results.iterator().next(); + + Resource platform = new Resource(); + + platform.setDescription(details.getResourceDescription()); + platform.setResourceKey(details.getResourceKey()); + platform.setName(details.getResourceName()); + platform.setVersion(details.getResourceVersion()); + platform.setPluginConfiguration(details.getPluginConfiguration()); + platform.setResourceType(rt); + platform.setUuid(UUID.randomUUID().toString()); + platform.setId(1); + + return platform; + } + } + + return null; + } + + protected static String variableName(String prefix, String name) { + StringBuilder bld = new StringBuilder(); + if (prefix != null && !prefix.isEmpty()) { + bld.append(prefix).append("."); + } + + bld.append(name); + + return bld.toString(); + } + + protected static InetAddress determineLocalhost() { + try { + return InetAddress.getLocalHost(); + } catch (UnknownHostException e) { + try { + return InetAddress.getByName("127.0.0.1"); + } catch (UnknownHostException ee) { + //doesn't happen + return null; + } + } + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeSimpleConfigurationFromRHQ1_3Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeSimpleConfigurationFromRHQ1_3Test.java new file mode 100644 index 0000000..1fd44ba --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeSimpleConfigurationFromRHQ1_3Test.java @@ -0,0 +1,168 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.upgrade.rhq1_3_x; + +import java.util.Comparator; +import java.util.HashMap; +import java.util.Set; +import java.util.TreeSet; + +import org.testng.annotations.Parameters; +import org.testng.annotations.Test; + +import org.rhq.core.domain.resource.Resource; +import org.rhq.plugins.apache.upgrade.UpgradeTestBase; +import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestConfiguration; +import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestSetup; +import org.rhq.test.pc.PluginContainerSetup; + +/** + * + * + * @author Lukas Krejci + */ +@Test(groups = "apache-integration-tests") +public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { + + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithResolvableServerNames_Apache2(final String installPath, final String exePath) + throws Throwable { + + testUpgrade(new TestConfiguration() { + { + serverRoot = installPath; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + } + }); + } + + @Test(enabled = false) + //ApacheServerOperationsDelegate doesn't work with apache 1.3 + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache1.install.dir", "apache1.exe.path" }) + public void testWithResolvableServerNames_Apache1(final String installPath, final String exePath) + throws Throwable { + + testUpgrade(new TestConfiguration() {{ + serverRoot = installPath; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + apacheConfigurationFiles = new String[] { "/full-configurations/1.3.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + }}); + } + + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithNonUniqueServerNames_Apache2(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + serverRoot = installPath; + binPath = exePath; + + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); + } + + @Override + public void beforePluginContainerStart(TestSetup setup) { + //in this scenario, the RHQ 1.3 would only discover 1 vhost (and the main vhost), because they would have the same resource key + //due to the same ServerName. I need to process the default inventory to reflect that otherwise I would get upgrade + //failures. + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(findApachePluginResourceTypeByName("Apache Virtual Host")); + Set<Resource> uniques = new TreeSet<Resource>(new Comparator<Resource>() { + public int compare(Resource a, Resource b) { + return a.getResourceKey().compareTo(b.getResourceKey()); + } + }); + + for(Resource vhost : vhosts) { + if (uniques.contains(vhost)) { + //remove the vhost from the server's inventory + setup.getFakeInventory().removeResource(vhost); + } else { + uniques.add(vhost); + } + } + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddress(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + serverRoot = installPath; + binPath = exePath; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddress(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + serverRoot = installPath; + binPath = exePath; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + }); + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java new file mode 100644 index 0000000..fb2e360 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java @@ -0,0 +1,449 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.upgrade.rhq3_0_0; + + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.testng.annotations.Parameters; +import org.testng.annotations.Test; + +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceError; +import org.rhq.core.domain.resource.ResourceErrorType; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.plugins.apache.ApacheServerComponent; +import org.rhq.plugins.apache.ApacheServerDiscoveryComponent; +import org.rhq.plugins.apache.parser.ApacheDirectiveTree; +import org.rhq.plugins.apache.upgrade.UpgradeTestBase; +import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestConfiguration; +import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestSetup; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; +import org.rhq.plugins.apache.util.RuntimeApacheConfiguration; +import org.rhq.plugins.apache.util.VirtualHostLegacyResourceKeyUtil; +import org.rhq.test.pc.PluginContainerSetup; + +/** + * + * + * @author Lukas Krejci + */ +public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase { + + /** + * This tests the upgrade from RHQ 3.0.0 where the apache server was discovered without SNMP support. + * The Main Server URL must have been set in this case, otherwise the component would fail to start + * and therefore the vhost discovery wouldn't even take place. + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost}"); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithUnresolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${listen3}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${listen4}"); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithNonUniqueNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); + } + }); + } + + /** + * This tests the upgrade from RHQ 3.0.0 where the Apache server was discovered with the following: + * + * <ol> + * <li> SNMP enabled + * <li> Main URL set or unset (it doesn't make a difference here) + * </ol> + * @param installDir + * @param exePath + * @throws Throwable + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithUnresolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${listen3}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${listen4}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithNonUniqueNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + }); + } + + /** + * Unlike other SNMP tests this one actually succeeds to upgrade because of the messed up discovery that + * RHQ 3.0.0 would perform. In case of any-address (0.0.0.0), the main vhost would get the MainServer + * resource key even with SNMP, because RHQ 3 codebase wouldn't be able to match what it think should + * have been the SNMP record with the actual results from SNMP module. + * + * Because of this, RHQ 3 discovers all 5 vhosts and the upgrade code is therefore able to successfully + * upgrade all of them. + * + * @param installPath + * @param exePath + * @throws Throwable + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddressWithSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp-anyaddr.xml"; + serverRoot = installPath; + binPath = exePath; + + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddressWithSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + upgradeShouldSucceed = false; + + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + + private void beforeTestSetupWithSNMP(TestConfiguration testConfig, TestSetup setup) throws Exception { + setup.withApacheSetup().init(); + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + + DeploymentConfig deployConfig = setup.getDeploymentConfig(); + + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + Map<String, String> replacements = deployConfig.getTokenReplacements(); + + testConfig.defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey()); + + if (deployConfig.vhost1 != null) { + testConfig.defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec(replacements))); + } + + if (deployConfig.vhost2 != null) { + testConfig.defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec(replacements))); + } + + if (deployConfig.vhost3 != null) { + testConfig.defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec(replacements))); + } + + if (deployConfig.vhost4 != null) { + testConfig.defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec(replacements))); + } + + setup.withDefaultOverrides(testConfig.defaultOverrides); + } + + private void testWithSNMP(TestConfiguration testConfig, TestSetup setup) { + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); + + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfig.serverRoot, testConfig.serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), 4, "Unexpected number of vhosts discovered found"); + + //let's check that the main vhost has a an upgrade error attached to it + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + String mainVhostRK = keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey(); + + Resource mainVhost = null; + for(Resource r : vhosts) { + if (mainVhostRK.equals(r.getResourceKey())) { + mainVhost = r; + break; + } + } + + assertNotNull(mainVhost, "Couldn't find the main vhost with the expected resource key '" + mainVhostRK + "'."); + + List<ResourceError> errors = mainVhost.getResourceErrors(ResourceErrorType.UPGRADE); + assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); + assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + + //check that all other vhosts were not upgraded but have no errors + for(Resource r : vhosts) { + if (r.equals(mainVhost)) { + continue; + } + + assertEquals(r.getResourceErrors(ResourceErrorType.UPGRADE).size(), 0, "Unexpected number of resource upgrade errors on non-main vhost " + r); + } + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java new file mode 100644 index 0000000..cbd4826 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java @@ -0,0 +1,554 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.upgrade.rhq3_0_1; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +import java.io.StringReader; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.testng.annotations.Parameters; +import org.testng.annotations.Test; + +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceError; +import org.rhq.core.domain.resource.ResourceErrorType; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.util.stream.StreamUtil; +import org.rhq.plugins.apache.ApacheServerComponent; +import org.rhq.plugins.apache.ApacheServerDiscoveryComponent; +import org.rhq.plugins.apache.parser.ApacheDirectiveTree; +import org.rhq.plugins.apache.upgrade.UpgradeTestBase; +import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestConfiguration; +import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestSetup; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; +import org.rhq.plugins.apache.util.RuntimeApacheConfiguration; +import org.rhq.plugins.apache.util.VirtualHostLegacyResourceKeyUtil; +import org.rhq.test.TokenReplacingReader; +import org.rhq.test.pc.PluginContainerSetup; + +/** + * + * + * @author Lukas Krejci + */ +public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase { + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 4, failingRK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost.ip}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String vhost1RK = interpret("${vhost1.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 5, vhost1RK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithUnresolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${listen3}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${listen4}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 4, failingRK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithUnresolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + //we use this in the serialized inventory to init the URL of the main server. The localhost.ip is actually what + //the RHQ 301 discovers even though unresolvable.host is specified in the ServerName directive. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${port1}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${port2}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${port3}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${port4}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithNonUniqueNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 4, failingRK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithNonUniqueNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + + //we use this in the serialized inventory to init the URL of the main server. The localhost.ip is actually what + //the RHQ 301 discovers even though unresolvable.host is specified in the ServerName directive. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), + "ServerName ${unresolvable.host}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + }); + } + + /** + * The duplicate Main vhosts "condition" was triggered by: + * <ol> + * <li>Disabling SNMP by putting in an invalid hostname + * <li>Changing the URL of the apache server to some "other" value + * <li>Running discovery + * </ol> + * From that point on, 2 Main vhosts live in the inventory and the inventory has the "rest" + * of the resource keys coming from the SNMP based discovery. + * + * It is not possible to recover from such condition automatically during + * the resource upgrade, so the only thing we need to check here is that + * the two main vhosts are marked as failed upgrade and that the rest of the vhosts + * are not upgraded and have no upgrade errors attached. + * + * @param installDir + * @param exePath + * @throws Throwable + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testDuplicateMainVhostsMarkedAsFailedUpgrade(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String mainVHost1RK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + String mainVhost2RK = interpret("${localhost}:${port1}", setup.getInventoryFileReplacements()); + + testExpectedFailures(this, setup, 5, mainVHost1RK, mainVhost2RK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + //yes, the inventory file can be the same for both the with and without snmp tests because + //they both yield the same inventory in this case. + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml"; + serverRoot = installPath; + binPath = exePath; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + }); + } + + /** + * Unlike other SNMP tests this one actually succeeds to upgrade because of the messed up discovery that + * RHQ 3.0.0 would perform. In case of any-address (0.0.0.0), the main vhost would get the MainServer + * resource key even with SNMP, because RHQ 3 codebase wouldn't be able to match what it think should + * have been the SNMP record with the actual results from SNMP module. + * + * Because of this, RHQ 3 discovers all 5 vhosts and the upgrade code is therefore able to successfully + * upgrade all of them. + * + * @param installPath + * @param exePath + * @throws Throwable + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddressWithSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml"; + serverRoot = installPath; + binPath = exePath; + + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + }); + } + + /** + * This configuration will fail to upgrade the first vhost, because it doesn't uniquely match to new-style + * vhosts - it could be either a main vhost or vhost1. + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + upgradeShouldSucceed = false; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String failingRK = interpret("${vhost1.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 5, failingRK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddressWithSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + upgradeShouldSucceed = false; + + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 4, failingRK); + } + }); + } + + private void defineRHQ3ResourceKeys(TestConfiguration testConfig, TestSetup setup) throws Exception { + setup.withApacheSetup().init(); + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + + DeploymentConfig deployConfig = setup.getDeploymentConfig(); + + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + Map<String, String> replacements = deployConfig.getTokenReplacements(); + + testConfig.defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey()); + + if (deployConfig.vhost1 != null) { + testConfig.defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec(replacements))); + } + + if (deployConfig.vhost2 != null) { + testConfig.defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec(replacements))); + } + + if (deployConfig.vhost3 != null) { + testConfig.defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec(replacements))); + } + + if (deployConfig.vhost4 != null) { + testConfig.defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec(replacements))); + } + + setup.withDefaultOverrides(testConfig.defaultOverrides); + } + + private void testExpectedFailures(TestConfiguration testConfig, TestSetup setup, int numberOfVhosts, String... failingRKs) { + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); + + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfig.serverRoot, testConfig.serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), numberOfVhosts, "Unexpected number of vhosts discovered found"); + + //let's check that the main vhost has a an upgrade error attached to it + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + Set<Resource> failingResources = new HashSet<Resource>(); + + for(String rk : failingRKs) { + for(Resource r : vhosts) { + if (rk.equals(r.getResourceKey())) { + failingResources.add(r); + break; + } + } + } + + assertEquals(failingResources.size(), failingRKs.length, "Couldn't find all the resources that should have failed."); + + for(Resource failingResource : failingResources) { + List<ResourceError> errors = failingResource.getResourceErrors(ResourceErrorType.UPGRADE); + assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); + assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + } + + //check that all other vhosts were not upgraded but have no errors + for(Resource r : vhosts) { + if (failingResources.contains(r)) { + continue; + } + + assertEquals(r.getResourceErrors(ResourceErrorType.UPGRADE).size(), 0, "Unexpected number of resource upgrade errors on non-main vhost " + r); + } + } + + private String interpret(String string, Map<String, String> variables) { + return StreamUtil.slurp(new TokenReplacingReader(new StringReader(string), variables)); + } +} commit 3280b0bd86bf5fe68765cfa72c37cc7af8e4b853 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed Jun 29 17:08:00 2011 +0200 added tests for handling the any-address and wildcard address during upgrade to the simple config tests, finished up the tests for RHQ 3.0.1 for simple config. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java index 135c2aa..8d1fe22 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java @@ -115,5 +115,51 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { } } }); - } + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddress(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + serverRoot = installPath; + binPath = exePath; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddress(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + serverRoot = installPath; + binPath = exePath; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + }); + } } diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java index 8d0c03b..d3e5c86 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java @@ -23,7 +23,6 @@ package org.rhq.plugins.apache; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -64,6 +63,11 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost}"); } }); } @@ -80,7 +84,6 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; - defaultOverrides = new HashMap<String, String>(); defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); @@ -102,7 +105,6 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; - defaultOverrides = new HashMap<String, String>(); defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); @@ -134,9 +136,7 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - upgradeShouldSucceed = false; - - defaultOverrides = new HashMap<String, String>(); + upgradeShouldSucceed = false; } @Override @@ -168,7 +168,6 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; upgradeShouldSucceed = false; - defaultOverrides = new HashMap<String, String>(); defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); @@ -205,7 +204,6 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; upgradeShouldSucceed = false; - defaultOverrides = new HashMap<String, String>(); defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); @@ -229,6 +227,135 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase }); } + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + }); + } + + /** + * Unlike other SNMP tests this one actually succeeds to upgrade because of the messed up discovery that + * RHQ 3.0.0 would perform. In case of any-address (0.0.0.0), the main vhost would get the MainServer + * resource key even with SNMP, because RHQ 3 codebase wouldn't be able to match what it think should + * have been the SNMP record with the actual results from SNMP module. + * + * Because of this, RHQ 3 discovers all 5 vhosts and the upgrade code is therefore able to successfully + * upgrade all of them. + * + * @param installPath + * @param exePath + * @throws Throwable + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddressWithSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp-anyaddr.xml"; + serverRoot = installPath; + binPath = exePath; + + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddressWithSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + upgradeShouldSucceed = false; + + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + private void beforeTestSetupWithSNMP(TestConfiguration testConfig, TestSetup setup) throws Exception { setup.withApacheSetup().init(); ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java index 5938889..b43d3f3 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java @@ -23,7 +23,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import java.io.StringReader; -import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -62,13 +62,11 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; upgradeShouldSucceed = false; - - defaultOverrides = new HashMap<String, String>(); } @Override public void beforeTestSetup(TestSetup testSetup) throws Throwable { - beforeTestSetupWithSNMP(this, testSetup); + defineRHQ3ResourceKeys(this, testSetup); } /** @@ -77,7 +75,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase */ @Override public void beforeTests(TestSetup setup) throws Throwable { - testWithSNMP(this, setup); + String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 4, failingRK); } }); } @@ -85,6 +84,38 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase @Test @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost.ip}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String vhost1RK = interpret("${vhost1.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 5, vhost1RK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) public void testWithUnresolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { @@ -95,7 +126,6 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; upgradeShouldSucceed = false; - defaultOverrides = new HashMap<String, String>(); defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); @@ -105,7 +135,7 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase @Override public void beforeTestSetup(TestSetup testSetup) throws Throwable { - beforeTestSetupWithSNMP(this, testSetup); + defineRHQ3ResourceKeys(this, testSetup); } /** @@ -114,7 +144,37 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase */ @Override public void beforeTests(TestSetup setup) throws Throwable { - testWithSNMP(this, setup); + String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 4, failingRK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithUnresolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + //we use this in the serialized inventory to init the URL of the main server. The localhost.ip is actually what + //the RHQ 301 discovers even though unresolvable.host is specified in the ServerName directive. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${port1}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${port2}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${port3}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${port4}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); } }); } @@ -132,7 +192,6 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; upgradeShouldSucceed = false; - defaultOverrides = new HashMap<String, String>(); defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); @@ -142,7 +201,7 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase @Override public void beforeTestSetup(TestSetup testSetup) throws Throwable { - beforeTestSetupWithSNMP(this, testSetup); + defineRHQ3ResourceKeys(this, testSetup); } /** @@ -151,7 +210,41 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase */ @Override public void beforeTests(TestSetup setup) throws Throwable { - testWithSNMP(this, setup); + String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 4, failingRK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithNonUniqueNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + + //we use this in the serialized inventory to init the URL of the main server. The localhost.ip is actually what + //the RHQ 301 discovers even though unresolvable.host is specified in the ServerName directive. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), + "ServerName ${unresolvable.host}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); } }); } @@ -187,13 +280,11 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; upgradeShouldSucceed = false; - - defaultOverrides = new HashMap<String, String>(); } @Override public void beforeTestSetup(TestSetup testSetup) throws Throwable { - beforeTestSetupWithSNMP(this, testSetup); + defineRHQ3ResourceKeys(this, testSetup); } /** @@ -202,73 +293,168 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase */ @Override public void beforeTests(TestSetup setup) throws Throwable { - //ok, now we should see the resources upgraded in the fake server inventory. - ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); - ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); - - Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); - - assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); - - Resource server = servers.iterator().next(); - - String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(this.serverRoot, this.serverRoot - + "/conf/httpd.conf"); - - assertEquals(server.getResourceKey(), expectedResourceKey, - "The server resource key doesn't seem to be upgraded."); - - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); - - assertEquals(vhosts.size(), 5, "Unexpected number of vhosts discovered found"); - - //let's check that the main vhost has a an upgrade error attached to it - ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); - ApacheDirectiveTree config = component.loadParser(); - config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); - VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); - - String mainVhost1RK = keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey(); - String mainVhost2RK = interpret("${localhost.ip}:${listen1}", setup.getInventoryFileReplacements()); - Resource mainVhost1 = null; - Resource mainVhost2 = null; - for(Resource r : vhosts) { - if (mainVhost1RK.equals(r.getResourceKey())) { - mainVhost1 = r; - break; - } - } - for(Resource r : vhosts) { - if (mainVhost2RK.equals(r.getResourceKey())) { - mainVhost2 = r; - break; - } - } + String mainVHost1RK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + String mainVhost2RK = interpret("${localhost}:${port1}", setup.getInventoryFileReplacements()); - assertNotNull(mainVhost1, "Couldn't find the main vhost with the expected resource key '" + mainVhost1RK + "'."); - assertNotNull(mainVhost2, "Couldn't find the main vhost with the expected resource key '" + mainVhost2RK + "'."); + testExpectedFailures(this, setup, 5, mainVHost1RK, mainVhost2RK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + //yes, the inventory file can be the same for both the with and without snmp tests because + //they both yield the same inventory in this case. + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml"; + serverRoot = installPath; + binPath = exePath; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + }); + } + + /** + * Unlike other SNMP tests this one actually succeeds to upgrade because of the messed up discovery that + * RHQ 3.0.0 would perform. In case of any-address (0.0.0.0), the main vhost would get the MainServer + * resource key even with SNMP, because RHQ 3 codebase wouldn't be able to match what it think should + * have been the SNMP record with the actual results from SNMP module. + * + * Because of this, RHQ 3 discovers all 5 vhosts and the upgrade code is therefore able to successfully + * upgrade all of them. + * + * @param installPath + * @param exePath + * @throws Throwable + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddressWithSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - List<ResourceError> errors = mainVhost1.getResourceErrors(ResourceErrorType.UPGRADE); - assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); - assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml"; + serverRoot = installPath; + binPath = exePath; + + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } - errors = mainVhost2.getResourceErrors(ResourceErrorType.UPGRADE); - assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); - assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + }); + } + + /** + * This configuration will fail to upgrade the first vhost, because it doesn't uniquely match to new-style + * vhosts - it could be either a main vhost or vhost1. + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - //check that all other vhosts were not upgraded but have no errors - for(Resource r : vhosts) { - if (r.equals(mainVhost1) || r.equals(mainVhost2)) { - continue; - } - - assertEquals(r.getResourceErrors(ResourceErrorType.UPGRADE).size(), 0, "Unexpected number of resource upgrade errors on non-main vhost " + r); - } + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + upgradeShouldSucceed = false; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String failingRK = interpret("${vhost1.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 5, failingRK); } }); } - private void beforeTestSetupWithSNMP(TestConfiguration testConfig, TestSetup setup) throws Exception { + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddressWithSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + upgradeShouldSucceed = false; + + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 4, failingRK); + } + }); + } + + private void defineRHQ3ResourceKeys(TestConfiguration testConfig, TestSetup setup) throws Exception { setup.withApacheSetup().init(); ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); ApacheDirectiveTree config = component.loadParser(); @@ -301,7 +487,7 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase setup.withDefaultOverrides(testConfig.defaultOverrides); } - private void testWithSNMP(TestConfiguration testConfig, TestSetup setup) { + private void testExpectedFailures(TestConfiguration testConfig, TestSetup setup, int numberOfVhosts, String... failingRKs) { //ok, now we should see the resources upgraded in the fake server inventory. ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); @@ -320,7 +506,7 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); - assertEquals(vhosts.size(), 4, "Unexpected number of vhosts discovered found"); + assertEquals(vhosts.size(), numberOfVhosts, "Unexpected number of vhosts discovered found"); //let's check that the main vhost has a an upgrade error attached to it ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); @@ -328,25 +514,28 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); - String mainVhostRK = keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey(); + Set<Resource> failingResources = new HashSet<Resource>(); - Resource mainVhost = null; - for(Resource r : vhosts) { - if (mainVhostRK.equals(r.getResourceKey())) { - mainVhost = r; - break; + for(String rk : failingRKs) { + for(Resource r : vhosts) { + if (rk.equals(r.getResourceKey())) { + failingResources.add(r); + break; + } } } - assertNotNull(mainVhost, "Couldn't find the main vhost with the expected resource key '" + mainVhostRK + "'."); + assertEquals(failingResources.size(), failingRKs.length, "Couldn't find all the resources that should have failed."); - List<ResourceError> errors = mainVhost.getResourceErrors(ResourceErrorType.UPGRADE); - assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); - assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + for(Resource failingResource : failingResources) { + List<ResourceError> errors = failingResource.getResourceErrors(ResourceErrorType.UPGRADE); + assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); + assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + } //check that all other vhosts were not upgraded but have no errors for(Resource r : vhosts) { - if (r.equals(mainVhost)) { + if (failingResources.contains(r)) { continue; } diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java index 59c1348..831b2d8 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java @@ -60,10 +60,12 @@ import org.rhq.core.pluginapi.inventory.PluginContainerDeployment; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.core.system.SystemInfoFactory; +import org.rhq.plugins.apache.parser.ApacheConfigReader; import org.rhq.plugins.apache.parser.ApacheDirectiveTree; +import org.rhq.plugins.apache.parser.ApacheParser; +import org.rhq.plugins.apache.parser.ApacheParserImpl; import org.rhq.plugins.apache.util.ApacheDeploymentUtil; import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; -import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig.VHost; import org.rhq.plugins.apache.util.ApacheExecutionUtil; import org.rhq.plugins.apache.util.HttpdAddressUtility; import org.rhq.plugins.apache.util.VHostSpec; @@ -149,6 +151,8 @@ public class UpgradeTestBase extends PluginContainerTest { assertTrue(confDir.exists(), "The configured server root denotes a directory that doesn't have a 'conf' subdirectory. This is unexpected."); + String confFilePath = confDir.getAbsolutePath() + File.separatorChar + "httpd.conf"; + String snmpHost = null; int snmpPort = 0; String pingUrl = null; @@ -157,13 +161,15 @@ public class UpgradeTestBase extends PluginContainerTest { if (deploy) { ApacheDeploymentUtil.deployConfiguration(confDir, configurationFiles, deploymentConfig); } - - HttpdAddressUtility.Address addr = deploymentConfig.mainServer.address1; - HttpdAddressUtility.Address addrToUse = new HttpdAddressUtility.Address(null, null, - HttpdAddressUtility.Address.NO_PORT_SPECIFIED_VALUE); - addrToUse.scheme = addr.scheme == null ? "http" : addr.scheme; - addrToUse.host = addr.host == null ? "localhost" : addr.host; - addrToUse.port = addr.port; + + //ok, now try to find the ping URL. The best thing is to actually invoke + //the same code the apache server discovery does. + ApacheDirectiveTree tree = new ApacheDirectiveTree(); + ApacheParser parser = new ApacheParserImpl(tree, serverRootDir.getAbsolutePath()); + ApacheConfigReader.buildTree(confFilePath, parser); + + //XXX this hardcodes apache2 as the only option we have... + HttpdAddressUtility.Address addrToUse = HttpdAddressUtility.APACHE_2_x.getMainServerSampleAddress(tree, null, -1); pingUrl = addrToUse.toString(); snmpHost = deploymentConfig.snmpHost; @@ -171,7 +177,7 @@ public class UpgradeTestBase extends PluginContainerTest { } execution = new ApacheExecutionUtil(findApachePluginResourceTypeByName("Apache HTTP Server"), - serverRoot, exePath, confDir.getAbsolutePath() + File.separatorChar + "httpd.conf", pingUrl, + serverRoot, exePath, confFilePath, pingUrl, snmpHost, snmpPort); execution.init(); } @@ -384,7 +390,7 @@ public class UpgradeTestBase extends PluginContainerTest { public String configurationName; public String serverRoot; public String binPath; - public Map<String, String> defaultOverrides; + public Map<String, String> defaultOverrides = new HashMap<String, String>(); public boolean upgradeShouldSucceed = true; public void beforeTestSetup(TestSetup testSetup) throws Throwable { @@ -406,6 +412,7 @@ public class UpgradeTestBase extends PluginContainerTest { protected static final String DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES = "simpleWithResolvableServerNames"; protected static final String DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES = "simpleWithUnresolvableServerNames"; + protected static final String DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS = "simpleWithWildcardListens"; private List<ResourceType> resourceTypesInApachePlugin; protected Resource platform; @@ -573,4 +580,17 @@ public class UpgradeTestBase extends PluginContainerTest { return bld.toString(); } + + protected static InetAddress determineLocalhost() { + try { + return InetAddress.getLocalHost(); + } catch (UnknownHostException e) { + try { + return InetAddress.getByName("127.0.0.1"); + } catch (UnknownHostException ee) { + //doesn't happen + return null; + } + } + } } diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java index 232741f..b640b59 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java @@ -159,9 +159,7 @@ public class ApacheDeploymentUtil { : serverNameDirective); String serverName = getServerName(); - if (serverName != null) { - tokenReplacements.put(prefix + SERVERNAME, serverName); - } + tokenReplacements.put(prefix + SERVERNAME, serverName == null ? "" : serverName); String dirs = ""; if (!additionalDirectives.isEmpty()) { diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp-anyaddr.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp-anyaddr.xml new file mode 100644 index 0000000..fc34748 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp-anyaddr.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>20037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq4.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml index 3d41813..ff9d715 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml @@ -9,7 +9,7 @@ <id>10022</id> <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> <resourceKey>${server.root}</resourceKey> - <name>${localhost}:${listen1}</name> + <name>${localhost}:${port1}</name> <inventoryStatus>COMMITTED</inventoryStatus> <connected>false</connected> <version>2.2.17</version> @@ -179,7 +179,7 @@ <propertySimple> <id>10808</id> <name>url</name> - <stringValue>http://${localhost}:${listen1}/</stringValue> + <stringValue>http://${localhost}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10807</id> @@ -398,7 +398,7 @@ <propertySimple> <id>10795</id> <name>url</name> - <stringValue>http://${localhost}:${listen1}/</stringValue> + <stringValue>http://${localhost}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10709</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml index 76269db..590b10f 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml @@ -9,7 +9,7 @@ <id>10041</id> <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> <resourceKey>${server.root}</resourceKey> - <name>${localhost}:${listen1}</name> + <name>${localhost}:${port1}</name> <inventoryStatus>COMMITTED</inventoryStatus> <connected>true</connected> <version>2.2.17</version> @@ -255,7 +255,7 @@ <propertySimple> <id>10928</id> <name>url</name> - <stringValue>http://${localhost}:${listen1}/</stringValue> + <stringValue>http://${localhost}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10927</id> @@ -351,7 +351,7 @@ <id>10050</id> <uuid>ae880c2d-747d-492d-8586-a47ab5791b0e</uuid> <resourceKey>${vhost1.rhq4.resource.key}</resourceKey> - <name>${vhos1.snmp.identifier}</name> + <name>${vhost1.snmp.identifier}</name> <inventoryStatus>COMMITTED</inventoryStatus> <connected>false</connected> <version></version> @@ -474,7 +474,7 @@ <propertySimple> <id>10868</id> <name>url</name> - <stringValue>http://${servername}:${listen1}/</stringValue> + <stringValue>http://${servername}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10870</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml index 999914d..78fc9dd 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml @@ -9,7 +9,7 @@ <id>10022</id> <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> <resourceKey>${server.root}</resourceKey> - <name>${localhost}:${listen1}</name> + <name>${localhost}:${port1}</name> <inventoryStatus>COMMITTED</inventoryStatus> <connected>false</connected> <version>2.2.17</version> @@ -179,7 +179,7 @@ <propertySimple> <id>10808</id> <name>url</name> - <stringValue>http://${localhost}:${listen1}/</stringValue> + <stringValue>http://${localhost}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10807</id> @@ -198,7 +198,7 @@ <childResources> <id>100371</id> <uuid>b2928cc6-30ab-47fe-8095-e1292887ac90</uuid> - <resourceKey>${localhost.ip}:${listen1}</resourceKey> + <resourceKey>${localhost}:${port1}</resourceKey> <name>Main</name> <inventoryStatus>COMMITTED</inventoryStatus> <connected>false</connected> @@ -255,7 +255,7 @@ <propertySimple> <id>10808</id> <name>url</name> - <stringValue>http://${localhost.ip}:${listen1}/</stringValue> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10807</id> @@ -474,7 +474,7 @@ <propertySimple> <id>10795</id> <name>url</name> - <stringValue>http://${localhost}:${listen1}/</stringValue> + <stringValue>http://${localhost}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10709</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml new file mode 100644 index 0000000..47d502d --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>20037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>0.0.0.0:${port1}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://0.0.0.0:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml index 3d41813..ff9d715 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml @@ -9,7 +9,7 @@ <id>10022</id> <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> <resourceKey>${server.root}</resourceKey> - <name>${localhost}:${listen1}</name> + <name>${localhost}:${port1}</name> <inventoryStatus>COMMITTED</inventoryStatus> <connected>false</connected> <version>2.2.17</version> @@ -179,7 +179,7 @@ <propertySimple> <id>10808</id> <name>url</name> - <stringValue>http://${localhost}:${listen1}/</stringValue> + <stringValue>http://${localhost}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10807</id> @@ -398,7 +398,7 @@ <propertySimple> <id>10795</id> <name>url</name> - <stringValue>http://${localhost}:${listen1}/</stringValue> + <stringValue>http://${localhost}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10709</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml new file mode 100644 index 0000000..44ea502 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10041</id> + <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1309116183350</ctime> + <mtime>1309116225316</mtime> + <itime>1309116225316</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10046</id> + <uuid>908ea047-889e-4978-a61f-d96e8b1c6d17</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + <itime>1309117635788</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10241</id> + <version>0</version> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10242</id> + <version>0</version> + <ctime>1309117635790</ctime> + <mtime>1309117635790</mtime> + <propertySimple> + <id>10858</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10857</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10860</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10859</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10047</id> + <uuid>5fccc52b-8003-42ed-aa69-0b146c783e91</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + <itime>1309117635802</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10243</id> + <version>0</version> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10244</id> + <version>0</version> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + <propertySimple> + <id>10922</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10921</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10924</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10923</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10048</id> + <uuid>704a31f3-7f5f-46c1-9bda-70f2645c9604</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635810</ctime> + <mtime>1309117635810</mtime> + <itime>1309117635810</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10245</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10246</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + <propertySimple> + <id>10926</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10925</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10928</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10927</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10049</id> + <uuid>03638606-623b-4218-bd23-42e04db0e296</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + <itime>1309117635818</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10247</id> + <version>0</version> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10248</id> + <version>0</version> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + <propertySimple> + <id>10930</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10929</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10932</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10931</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10050</id> + <uuid>ae880c2d-747d-492d-8586-a47ab5791b0e</uuid> + <resourceKey>${vhost1.rhq3.resource.key}</resourceKey> + <name>${vhost1.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + <itime>1309117635829</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10249</id> + <version>0</version> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10250</id> + <version>0</version> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + <propertySimple> + <id>10934</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10933</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10936</id> + <name>url</name> + <stringValue>http://${vhost1.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10935</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10201</id> + <version>0</version> + <ctime>1309116183368</ctime> + <mtime>1309116183368</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10211</id> + <version>0</version> + <ctime>1309117523737</ctime> + <mtime>1309117523737</mtime> + <propertySimple> + <id>10863</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10862</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10861</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10865</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10864</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10867</id> + <name>snmpAgentHost</name> + <stringValue>${unresolvable.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10866</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10869</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10868</id> + <name>url</name> + <stringValue>http://${servername}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10870</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10871</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10872</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10873</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10874</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10875</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10876</id> + <name>snmpAgentPort</name> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10877</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + <propertySimple> + <id>10878</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> commit f019479e86c88a7702fc61a6955f5449501b3818 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Tue Jun 28 17:05:38 2011 +0200 Added a batch of tests for RHQ 3.0.1. More to come.. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java new file mode 100644 index 0000000..5938889 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java @@ -0,0 +1,360 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +import java.io.StringReader; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.testng.annotations.Parameters; +import org.testng.annotations.Test; + +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceError; +import org.rhq.core.domain.resource.ResourceErrorType; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.util.stream.StreamUtil; +import org.rhq.plugins.apache.parser.ApacheDirectiveTree; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; +import org.rhq.plugins.apache.util.RuntimeApacheConfiguration; +import org.rhq.plugins.apache.util.VirtualHostLegacyResourceKeyUtil; +import org.rhq.test.TokenReplacingReader; +import org.rhq.test.pc.PluginContainerSetup; + +/** + * + * + * @author Lukas Krejci + */ +public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase { + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + defaultOverrides = new HashMap<String, String>(); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithUnresolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${listen3}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${listen4}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithNonUniqueNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + + /** + * The duplicate Main vhosts "condition" was triggered by: + * <ol> + * <li>Disabling SNMP by putting in an invalid hostname + * <li>Changing the URL of the apache server to some "other" value + * <li>Running discovery + * </ol> + * From that point on, 2 Main vhosts live in the inventory and the inventory has the "rest" + * of the resource keys coming from the SNMP based discovery. + * + * It is not possible to recover from such condition automatically during + * the resource upgrade, so the only thing we need to check here is that + * the two main vhosts are marked as failed upgrade and that the rest of the vhosts + * are not upgraded and have no upgrade errors attached. + * + * @param installDir + * @param exePath + * @throws Throwable + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testDuplicateMainVhostsMarkedAsFailedUpgrade(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + defaultOverrides = new HashMap<String, String>(); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); + + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(this.serverRoot, this.serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), 5, "Unexpected number of vhosts discovered found"); + + //let's check that the main vhost has a an upgrade error attached to it + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + String mainVhost1RK = keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey(); + String mainVhost2RK = interpret("${localhost.ip}:${listen1}", setup.getInventoryFileReplacements()); + Resource mainVhost1 = null; + Resource mainVhost2 = null; + for(Resource r : vhosts) { + if (mainVhost1RK.equals(r.getResourceKey())) { + mainVhost1 = r; + break; + } + } + for(Resource r : vhosts) { + if (mainVhost2RK.equals(r.getResourceKey())) { + mainVhost2 = r; + break; + } + } + + assertNotNull(mainVhost1, "Couldn't find the main vhost with the expected resource key '" + mainVhost1RK + "'."); + assertNotNull(mainVhost2, "Couldn't find the main vhost with the expected resource key '" + mainVhost2RK + "'."); + + List<ResourceError> errors = mainVhost1.getResourceErrors(ResourceErrorType.UPGRADE); + assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); + assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + + errors = mainVhost2.getResourceErrors(ResourceErrorType.UPGRADE); + assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); + assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + + //check that all other vhosts were not upgraded but have no errors + for(Resource r : vhosts) { + if (r.equals(mainVhost1) || r.equals(mainVhost2)) { + continue; + } + + assertEquals(r.getResourceErrors(ResourceErrorType.UPGRADE).size(), 0, "Unexpected number of resource upgrade errors on non-main vhost " + r); + } + } + }); + } + + private void beforeTestSetupWithSNMP(TestConfiguration testConfig, TestSetup setup) throws Exception { + setup.withApacheSetup().init(); + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + + DeploymentConfig deployConfig = setup.getDeploymentConfig(); + + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + Map<String, String> replacements = deployConfig.getTokenReplacements(); + + testConfig.defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey()); + + if (deployConfig.vhost1 != null) { + testConfig.defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec(replacements))); + } + + if (deployConfig.vhost2 != null) { + testConfig.defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec(replacements))); + } + + if (deployConfig.vhost3 != null) { + testConfig.defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec(replacements))); + } + + if (deployConfig.vhost4 != null) { + testConfig.defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec(replacements))); + } + + setup.withDefaultOverrides(testConfig.defaultOverrides); + } + + private void testWithSNMP(TestConfiguration testConfig, TestSetup setup) { + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); + + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfig.serverRoot, testConfig.serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), 4, "Unexpected number of vhosts discovered found"); + + //let's check that the main vhost has a an upgrade error attached to it + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + String mainVhostRK = keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey(); + + Resource mainVhost = null; + for(Resource r : vhosts) { + if (mainVhostRK.equals(r.getResourceKey())) { + mainVhost = r; + break; + } + } + + assertNotNull(mainVhost, "Couldn't find the main vhost with the expected resource key '" + mainVhostRK + "'."); + + List<ResourceError> errors = mainVhost.getResourceErrors(ResourceErrorType.UPGRADE); + assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); + assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + + //check that all other vhosts were not upgraded but have no errors + for(Resource r : vhosts) { + if (r.equals(mainVhost)) { + continue; + } + + assertEquals(r.getResourceErrors(ResourceErrorType.UPGRADE).size(), 0, "Unexpected number of resource upgrade errors on non-main vhost " + r); + } + } + + private String interpret(String string, Map<String, String> variables) { + return StreamUtil.slurp(new TokenReplacingReader(new StringReader(string), variables)); + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java index 9726250..59c1348 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java @@ -89,7 +89,8 @@ public class UpgradeTestBase extends PluginContainerTest { private ApacheSetup apacheSetup = new ApacheSetup(); private DeploymentConfig deploymentConfig; private Map<String, String> defaultOverrides = new HashMap<String, String>(); - + private Map<String, String> inventoryFileReplacements; + public class ApacheSetup { private String serverRoot; private String exePath; @@ -272,7 +273,8 @@ public class UpgradeTestBase extends PluginContainerTest { Map<String, String> replacements = deploymentConfig.getTokenReplacements(); replacements.put("server.root", apacheSetup.serverRoot); replacements.put("exe.path", apacheSetup.exePath); - replacements.put("localhost", determineLocalhost()); + + ApacheDeploymentUtil.addDefaultVariables(replacements, null); HttpdAddressUtility addressUtility = apacheSetup.getExecutionUtil().getServerComponent() .getAddressUtility(); @@ -339,6 +341,8 @@ public class UpgradeTestBase extends PluginContainerTest { //let the user override everything we just did replacements.putAll(defaultOverrides); + inventoryFileReplacements = replacements; + InputStream dataStream = getClass().getResourceAsStream(inventoryFile); Reader rdr = new TokenReplacingReader(new InputStreamReader(dataStream), replacements); @@ -355,6 +359,15 @@ public class UpgradeTestBase extends PluginContainerTest { return this; } + /** + * After the setup, this returns all the variables used to update the tokens in the inventory file. + * + * @return + */ + public Map<String, String> getInventoryFileReplacements() { + return inventoryFileReplacements; + } + private void fixupParent(Resource parent, Collection<Resource> children) { for (Resource child : children) { child.setParentResource(parent); @@ -363,14 +376,6 @@ public class UpgradeTestBase extends PluginContainerTest { } } } - - private String determineLocalhost() { - try { - return InetAddress.getLocalHost().getCanonicalHostName(); - } catch (UnknownHostException e) { - return "127.0.0.1"; - } - } } protected static class TestConfiguration { diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml index eb2f7c7..76269db 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml @@ -474,7 +474,7 @@ <propertySimple> <id>10868</id> <name>url</name> - <stringValue>http://${localhost}:${listen1}/</stringValue> + <stringValue>http://${servername}:${listen1}/</stringValue> </propertySimple> <propertySimple> <id>10870</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml new file mode 100644 index 0000000..999914d --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${listen1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>100371</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac90</uuid> + <resourceKey>${localhost.ip}:${listen1}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml new file mode 100644 index 0000000..3d41813 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml @@ -0,0 +1,462 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${listen1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> commit e1e0c171b991c623ba2a4eeb69d88b97690989aa Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Tue Jun 28 15:53:21 2011 +0200 Adding slurp(Reader) to StreamUtil to complete the set of methods using readers/writers. diff --git a/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java b/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java index 19f56ac..be0446b 100644 --- a/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java +++ b/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java @@ -34,6 +34,7 @@ import java.io.ObjectOutputStream; import java.io.OutputStream; import java.io.Reader; import java.io.Serializable; +import java.io.StringWriter; import java.io.Writer; import org.apache.commons.logging.Log; @@ -75,6 +76,19 @@ public class StreamUtil { } /** + * Equivalent of {@link #slurp(InputStream)} but using a reader instead of input stream. + * + * @param reader + * @return + * @throws RuntimeException + */ + public static String slurp(Reader reader) throws RuntimeException { + StringWriter wrt = new StringWriter(); + copy(reader, wrt); + return wrt.toString(); + } + + /** * Copies data from the input stream to the output stream. Upon completion or on an exception, the streams will be * closed. * commit 0b208d23a6f5d49f39bc916afc8ee2e57430d6e1 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jun 27 16:34:15 2011 +0200 Finish up the tests for RHQ 3.0.0 diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java index 5d4bb1d..8d0c03b 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java @@ -135,92 +135,183 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; upgradeShouldSucceed = false; + + defaultOverrides = new HashMap<String, String>(); } @Override public void beforeTestSetup(TestSetup testSetup) throws Throwable { - testSetup.withApacheSetup().init(); - ApacheServerComponent component = testSetup.withApacheSetup().getExecutionUtil().getServerComponent(); - ApacheDirectiveTree config = component.loadParser(); - config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + beforeTestSetupWithSNMP(this, testSetup); + } - DeploymentConfig deployConfig = testSetup.getDeploymentConfig(); - - VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); - - Map<String, String> replacements = deployConfig.getTokenReplacements(); + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithUnresolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; defaultOverrides = new HashMap<String, String>(); - defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey()); - - if (deployConfig.vhost1 != null) { - defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec(replacements))); - } - - if (deployConfig.vhost2 != null) { - defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec(replacements))); - } - - if (deployConfig.vhost3 != null) { - defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec(replacements))); - } - - if (deployConfig.vhost4 != null) { - defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec(replacements))); - } + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${listen3}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${listen4}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithNonUniqueNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; - testSetup.withDefaultOverrides(defaultOverrides); + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); } /** - * Do our own tests here, because the test method won't do much, since + * Do our own tests here, because the generic test method won't do much, since * we told it that the upgrade won't succeed. */ @Override public void beforeTests(TestSetup setup) throws Throwable { - //ok, now we should see the resources upgraded in the fake server inventory. - ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); - ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); - - Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + testWithSNMP(this, setup); + } + }); + } + + private void beforeTestSetupWithSNMP(TestConfiguration testConfig, TestSetup setup) throws Exception { + setup.withApacheSetup().init(); + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); - assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + DeploymentConfig deployConfig = setup.getDeploymentConfig(); + + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + Map<String, String> replacements = deployConfig.getTokenReplacements(); - Resource server = servers.iterator().next(); + testConfig.defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey()); - String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(this.serverRoot, this.serverRoot - + "/conf/httpd.conf"); + if (deployConfig.vhost1 != null) { + testConfig.defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec(replacements))); + } - assertEquals(server.getResourceKey(), expectedResourceKey, - "The server resource key doesn't seem to be upgraded."); + if (deployConfig.vhost2 != null) { + testConfig.defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec(replacements))); + } - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + if (deployConfig.vhost3 != null) { + testConfig.defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec(replacements))); + } - assertEquals(vhosts.size(), 4, "Unexpected number of vhosts discovered found"); + if (deployConfig.vhost4 != null) { + testConfig.defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec(replacements))); + } + + setup.withDefaultOverrides(testConfig.defaultOverrides); + } + + private void testWithSNMP(TestConfiguration testConfig, TestSetup setup) { + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); - //let's check that the main vhost has a an upgrade error attached to it - ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); - ApacheDirectiveTree config = component.loadParser(); - config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); - VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); - String mainVhostRK = keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey(); - - Resource mainVhost = null; - for(Resource r : vhosts) { - if (mainVhostRK.equals(r.getResourceKey())) { - mainVhost = r; - break; - } - } - - assertNotNull(mainVhost, "Couldn't find the main vhost with the expected resource key '" + mainVhostRK + "'."); - - List<ResourceError> errors = mainVhost.getResourceErrors(ResourceErrorType.UPGRADE); - assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); - assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfig.serverRoot, testConfig.serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), 4, "Unexpected number of vhosts discovered found"); + + //let's check that the main vhost has a an upgrade error attached to it + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + String mainVhostRK = keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey(); + + Resource mainVhost = null; + for(Resource r : vhosts) { + if (mainVhostRK.equals(r.getResourceKey())) { + mainVhost = r; + break; } - }); + } + + assertNotNull(mainVhost, "Couldn't find the main vhost with the expected resource key '" + mainVhostRK + "'."); + + List<ResourceError> errors = mainVhost.getResourceErrors(ResourceErrorType.UPGRADE); + assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); + assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + + //check that all other vhosts were not upgraded but have no errors + for(Resource r : vhosts) { + if (r.equals(mainVhost)) { + continue; + } + + assertEquals(r.getResourceErrors(ResourceErrorType.UPGRADE).size(), 0, "Unexpected number of resource upgrade errors on non-main vhost " + r); + } } - } commit 4aff7c7212efe091e96ae9e3ae0eeb11e9a06212 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jun 27 15:15:14 2011 +0200 Make it possible for the TokenReplacingReader to resolve references to other tokens in token values and used that capability to be able to parametrize nearly every value during the tests. Added copy() methods to the StreamUtil that can consume reader and writer instead of the streams to aid me in using the TokenReplacingReader. diff --git a/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java b/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java index e970b83..19f56ac 100644 --- a/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java +++ b/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java @@ -23,6 +23,8 @@ package org.rhq.core.util.stream; import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -30,7 +32,9 @@ import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.OutputStream; +import java.io.Reader; import java.io.Serializable; +import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -86,6 +90,19 @@ public class StreamUtil { } /** + * Equivalent of {@link #copy(InputStream, OutputStream)} but using reader and writer instead + * of streams. + * + * @param rdr + * @param wrt + * @return + * @throws RuntimeException + */ + public static long copy(Reader rdr, Writer wrt) throws RuntimeException { + return copy(rdr, wrt, true); + } + + /** * Copies data from the input stream to the output stream. Upon completion or on an exception, the streams will be * closed but only if <code>closeStreams</code> is <code>true</code>. If <code>closeStreams</code> is <code> * false</code>, the streams are left open; the caller has the reponsibility to close them. @@ -136,6 +153,47 @@ public class StreamUtil { } /** + * Equivalent of {@link #copy(InputStream, OutputStream, boolean)} only using reader and writer + * instead of input stream and output stream. + * + * @param rdr + * @param wrt + * @param closeStreams + * @return + * @throws RuntimeException + */ + public static long copy(Reader rdr, Writer wrt, boolean closeStreams) throws RuntimeException { + try { + long numCharsCopied = 0; + char[] buffer = new char[32768]; + + int cnt; + while((cnt = rdr.read(buffer)) != -1) { + numCharsCopied += cnt; + wrt.write(buffer, 0, cnt); + } + + return numCharsCopied; + } catch (IOException e) { + throw new RuntimeException("Reader could not have been copied to the writer.", e); + } finally { + if (closeStreams) { + try { + rdr.close(); + } catch (IOException ioe) { + LOG.warn("Reader could not be closed.", ioe); + } + + try { + wrt.close(); + } catch (IOException ioe) { + LOG.warn("Writer could not be closed.", ioe); + } + } + } + } + + /** * Copies data from the input stream to the output stream. The caller has the reponsibility to close them. This * method allows you to copy a byte range from the input stream. The start byte is the index (where the first byte * of the stream is index #0) that starts to be copied. <code>length</code> indicates how many bytes to copy, a diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java index 311033d..5d4bb1d 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java @@ -25,6 +25,7 @@ import static org.testng.Assert.assertNotNull; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Set; import org.testng.annotations.Parameters; @@ -67,6 +68,50 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase }); } + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithUnresolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${listen3}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${listen4}"); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithNonUniqueNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); + } + }); + } + /** * This tests the upgrade from RHQ 3.0.0 where the Apache server was discovered with the following: * @@ -103,23 +148,25 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + Map<String, String> replacements = deployConfig.getTokenReplacements(); + defaultOverrides = new HashMap<String, String>(); defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey()); if (deployConfig.vhost1 != null) { - defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec())); + defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec(replacements))); } if (deployConfig.vhost2 != null) { - defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec())); + defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec(replacements))); } if (deployConfig.vhost3 != null) { - defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec())); + defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec(replacements))); } if (deployConfig.vhost4 != null) { - defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec())); + defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec(replacements))); } testSetup.withDefaultOverrides(defaultOverrides); diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java index 38f349e..9726250 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java @@ -63,8 +63,10 @@ import org.rhq.core.system.SystemInfoFactory; import org.rhq.plugins.apache.parser.ApacheDirectiveTree; import org.rhq.plugins.apache.util.ApacheDeploymentUtil; import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig.VHost; import org.rhq.plugins.apache.util.ApacheExecutionUtil; import org.rhq.plugins.apache.util.HttpdAddressUtility; +import org.rhq.plugins.apache.util.VHostSpec; import org.rhq.test.ObjectCollectionSerializer; import org.rhq.test.TokenReplacingReader; import org.rhq.test.pc.PluginContainerTest; @@ -281,61 +283,57 @@ public class UpgradeTestBase extends PluginContainerTest { replacements.put("main.rhq4.resource.key", ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); - String vhost1Address = deploymentConfig.vhost1 == null ? null : deploymentConfig.vhost1.address1.toString( - false, false); - String vhost2Address = deploymentConfig.vhost2 == null ? null : deploymentConfig.vhost2.address1.toString( - false, false); - String vhost3Address = deploymentConfig.vhost3 == null ? null : deploymentConfig.vhost3.address1.toString( - false, false); - String vhost4Address = deploymentConfig.vhost4 == null ? null : deploymentConfig.vhost4.address1.toString( - false, false); - - if (vhost1Address != null) { + VHostSpec vhost1 = deploymentConfig.vhost1 == null ? null : deploymentConfig.vhost1.getVHostSpec(replacements); + VHostSpec vhost2 = deploymentConfig.vhost2 == null ? null : deploymentConfig.vhost2.getVHostSpec(replacements); + VHostSpec vhost3 = deploymentConfig.vhost3 == null ? null : deploymentConfig.vhost3.getVHostSpec(replacements); + VHostSpec vhost4 = deploymentConfig.vhost4 == null ? null : deploymentConfig.vhost4.getVHostSpec(replacements); + + if (vhost1 != null) { replacements.put( "vhost1.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost1Address, - deploymentConfig.vhost1.getServerName()).toString(false, false)); + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost1.hosts.get(0), + vhost1.serverName).toString(false, false)); replacements.put( "vhost1.rhq4.resource.key", ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - deploymentConfig.vhost1.getServerName(), deploymentConfig.vhost1.getAddresses())); + vhost1.serverName, vhost1.hosts)); } - if (vhost2Address != null) { + if (vhost2 != null) { replacements.put( "vhost2.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost2Address, - deploymentConfig.vhost2.getServerName()).toString(false, false)); + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost2.hosts.get(0), + vhost2.serverName).toString(false, false)); replacements.put( "vhost2.rhq4.resource.key", ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - deploymentConfig.vhost2.getServerName(), deploymentConfig.vhost2.getAddresses())); + vhost2.serverName, vhost2.hosts)); } - if (vhost3Address != null) { + if (vhost3 != null) { replacements.put( "vhost3.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost3Address, - deploymentConfig.vhost3.getServerName()).toString(false, false)); + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost3.hosts.get(0), + vhost3.serverName).toString(false, false)); replacements.put( "vhost3.rhq4.resource.key", ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - deploymentConfig.vhost3.getServerName(), deploymentConfig.vhost3.getAddresses())); + vhost3.serverName, vhost3.hosts)); } - if (vhost4Address != null) { + if (vhost4 != null) { replacements.put( "vhost4.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost4Address, - deploymentConfig.vhost4.getServerName()).toString(false, false)); + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost4.hosts.get(0), + vhost4.serverName).toString(false, false)); replacements.put( "vhost4.rhq4.resource.key", ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - deploymentConfig.vhost4.getServerName(), deploymentConfig.vhost4.getAddresses())); + vhost4.serverName, vhost4.hosts)); } //let the user override everything we just did @@ -474,16 +472,22 @@ public class UpgradeTestBase extends PluginContainerTest { List<String> expectedResourceKeys = new ArrayList<String>(5); DeploymentConfig dc = setup.getDeploymentConfig(); - + Map<String, String> replacements = dc.getTokenReplacements(); + + VHostSpec vh1 = dc.vhost1.getVHostSpec(replacements); + VHostSpec vh2 = dc.vhost2.getVHostSpec(replacements); + VHostSpec vh3 = dc.vhost3.getVHostSpec(replacements); + VHostSpec vh4 = dc.vhost4.getVHostSpec(replacements); + expectedResourceKeys.add(ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost1.getServerName(), dc.vhost1.getAddresses())); + vh1.serverName, vh1.hosts)); expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost2.getServerName(), dc.vhost2.getAddresses())); + vh2.serverName, vh2.hosts)); expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost3.getServerName(), dc.vhost3.getAddresses())); + vh3.serverName, vh3.hosts)); expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost4.getServerName(), dc.vhost4.getAddresses())); + vh4.serverName, vh4.hosts)); for (Resource vhost : vhosts) { assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java index be73319..232741f 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java @@ -19,23 +19,29 @@ package org.rhq.plugins.apache.util; +import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.io.StringReader; +import java.io.StringWriter; import java.net.InetAddress; import java.net.URL; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.Iterator; import java.util.List; +import java.util.ListIterator; import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.unitils.thirdparty.org.apache.commons.io.FileUtils; +import org.rhq.core.util.stream.StreamUtil; import org.rhq.plugins.apache.util.HttpdAddressUtility.Address; import org.rhq.test.TokenReplacingProperties; import org.rhq.test.TokenReplacingReader; @@ -76,7 +82,7 @@ public class ApacheDeploymentUtil { public String serverNameDirective = null; public final List<String> additionalDirectives = new ArrayList<String>(); - public String getServerName() { + private String getServerName() { String serverName = null; if (serverNameDirective != null && serverNameDirective.startsWith("ServerName")) { int startIdx = serverNameDirective.indexOf(' '); @@ -93,14 +99,21 @@ public class ApacheDeploymentUtil { return serverName; } - public VHostSpec getVHostSpec() { + private String getServerName(Map<String, String> replacements) { + TokenReplacingReader rdr = new TokenReplacingReader(new StringReader(getServerName()), replacements); + StringWriter wrt = new StringWriter(); + StreamUtil.copy(rdr, wrt); + return wrt.toString(); + } + + public VHostSpec getVHostSpec(Map<String, String> replacements) { VHostSpec ret = new VHostSpec(); - ret.serverName = getServerName(); - ret.hosts = getAddresses(); + ret.serverName = getServerName(replacements); + ret.hosts = getAddresses(replacements); return ret; } - public List<String> getAddresses() { + private List<String> getAddresses() { ArrayList<String> ret = new ArrayList<String>(); if (address1 != null) { ret.add(address1.toString()); @@ -118,6 +131,21 @@ public class ApacheDeploymentUtil { return ret; } + public List<String> getAddresses(Map<String, String> replacements) { + List<String> addresses = getAddresses(); + ListIterator<String> it = addresses.listIterator(); + while(it.hasNext()) { + String addr = it.next(); + + TokenReplacingReader rdr = new TokenReplacingReader(new StringReader(addr), replacements); + StringWriter wrt = new StringWriter(); + StreamUtil.copy(rdr, wrt); + it.set(wrt.toString()); + } + + return addresses; + } + private void addToTokenReplacements(int ordinal, Map<String, String> tokenReplacements) { String prefix = null; @@ -184,7 +212,7 @@ public class ApacheDeploymentUtil { } public Map<String, String> getTokenReplacements() { - HashMap<String, String> ret = new HashMap<String, String>(); + Map<String, String> ret = new TokenReplacingProperties(new HashMap<String, String>()); ret.put(SERVER_ROOT, serverRoot == null ? "" : serverRoot); ret.put(DOCUMENT_ROOT, documentRoot == null ? "" : documentRoot); diff --git a/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingProperties.java b/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingProperties.java index 0b9e87d..5708ee3 100644 --- a/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingProperties.java +++ b/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingProperties.java @@ -22,10 +22,8 @@ package org.rhq.test; import java.io.IOException; import java.io.Reader; import java.io.StringReader; -import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Collection; -import java.util.Deque; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -65,7 +63,6 @@ public class TokenReplacingProperties extends HashMap<String, String> { private static final long serialVersionUID = 1L; private Map<String, String> wrapped; - private Deque<String> currentResolutionStack = new ArrayDeque<String>(); private Map<Object, String> resolved = new HashMap<Object, String>(); private class Entry implements Map.Entry<String, String> { @@ -146,22 +143,14 @@ public class TokenReplacingProperties extends HashMap<String, String> { return resolved.get(key); } - if (currentResolutionStack.contains(key)) { - throw new IllegalArgumentException("Property '" + key + "' indirectly references itself in its value."); - } - String rawValue = getRaw(key); if (rawValue == null) { return null; } - currentResolutionStack.push(key.toString()); - String ret = readAll(new TokenReplacingReader(new StringReader(rawValue.toString()), this)); - currentResolutionStack.pop(); - resolved.put(key, ret); return ret; diff --git a/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java b/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java index 35ba2d2..bc5aef6 100644 --- a/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java +++ b/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java @@ -22,7 +22,11 @@ package org.rhq.test; import java.io.IOException; import java.io.PushbackReader; import java.io.Reader; +import java.io.StringReader; import java.nio.CharBuffer; +import java.util.ArrayDeque; +import java.util.Deque; +import java.util.HashMap; import java.util.Map; /** @@ -39,12 +43,23 @@ public class TokenReplacingReader extends Reader { private String tokenValue = null; private int tokenValueIndex = 0; private boolean escaping = false; + private Deque<String> activeTokens; + private Map<String, String> resolvedTokens; public TokenReplacingReader(Reader source, Map<String, String> tokens) { this.pushbackReader = new PushbackReader(source, 2); this.tokens = tokens; + this.activeTokens = new ArrayDeque<String>(); + this.resolvedTokens = new HashMap<String, String>(); } + protected TokenReplacingReader(String source, Map<String, String> tokens, Deque<String> activeTokens, Map<String, String> resolvedTokens) { + pushbackReader = new PushbackReader(new StringReader(source)); + this.tokens = tokens; + this.activeTokens = activeTokens; + this.resolvedTokens = resolvedTokens; + } + public int read(CharBuffer target) throws IOException { throw new RuntimeException("Operation Not Supported"); } @@ -88,12 +103,16 @@ public class TokenReplacingReader extends Reader { data = this.pushbackReader.read(); } - this.tokenValue = tokens.get(this.tokenNameBuffer.toString()); - - if (this.tokenValue == null) { - this.tokenValue = "${" + this.tokenNameBuffer.toString() + "}"; + String tokenName = tokenNameBuffer.toString(); + + if (resolvedTokens.containsKey(tokenName)) { + tokenValue = resolvedTokens.get(tokenName); + } else { + tokenValue = resolveToken(tokenName); } + tokenValueIndex = 0; + if (!this.tokenValue.isEmpty()) { return this.tokenValue.charAt(this.tokenValueIndex++); } else { @@ -143,4 +162,40 @@ public class TokenReplacingReader extends Reader { public void reset() throws IOException { throw new IOException("reset() not supported on TokenReplacingReader."); } + + private String readAll(Reader r) throws IOException { + int c; + StringBuilder bld = new StringBuilder(); + while((c = r.read()) >= 0) { + bld.append((char)c); + } + + return bld.toString(); + } + + private String resolveToken(String tokenName) throws IOException { + if (activeTokens.contains(tokenName)) { + throw new IllegalArgumentException("Token '" + tokenName + "' (indirectly) contains reference to itself in its value."); + } + + activeTokens.push(tokenName); + + String tokenValue = tokens.get(tokenName); + + if (tokenValue != null) { + if (tokenValue.contains("${")) { + TokenReplacingReader childReader = new TokenReplacingReader(tokenValue, tokens, activeTokens, resolvedTokens); + + tokenValue = readAll(childReader); + } + } else { + tokenValue = "${" + tokenName + "}"; + } + + resolvedTokens.put(tokenName, tokenValue); + + activeTokens.pop(); + + return tokenValue; + } } commit ced0cf7f6b8f8d56d3eaf0c5150a8189f051d474 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jun 27 11:51:22 2011 +0200 added some docs on what each of the RHQ 3.0.0 test tests, small correction in the inventory file. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java index 38fc049..311033d 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java @@ -47,10 +47,11 @@ import org.rhq.test.pc.PluginContainerSetup; */ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase { - //TODO override the *.rhq3.resource.key variables in each test to define whether - //the resource key was discovered without SNMP, with SNMP, with Main Server URL set, - //or not - + /** + * This tests the upgrade from RHQ 3.0.0 where the apache server was discovered without SNMP support. + * The Main Server URL must have been set in this case, otherwise the component would fail to start + * and therefore the vhost discovery wouldn't even take place. + */ @Test @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) @Parameters({"apache2.install.dir", "apache2.exe.path"}) @@ -65,7 +66,18 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase } }); } - + + /** + * This tests the upgrade from RHQ 3.0.0 where the Apache server was discovered with the following: + * + * <ol> + * <li> SNMP enabled + * <li> Main URL set or unset (it doesn't make a difference here) + * </ol> + * @param installDir + * @param exePath + * @throws Throwable + */ @Test @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) @Parameters({"apache2.install.dir", "apache2.exe.path"}) diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml index 5961b3e..eb2f7c7 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml @@ -9,7 +9,7 @@ <id>10041</id> <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> <resourceKey>${server.root}</resourceKey> - <name>${localhost}:{listen1}</name> + <name>${localhost}:${listen1}</name> <inventoryStatus>COMMITTED</inventoryStatus> <connected>true</connected> <version>2.2.17</version> commit daf1e1a4fbf2b8781258969291207dffa9d470da Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Sun Jun 26 23:23:55 2011 +0200 actually figured out how RHQ 3.0.0 discovered vhosts without SNMP support and added tests for it. Some minor fixes in the RHQ 3.0.0 with SNMP test. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java index 386a871..38fc049 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java @@ -51,68 +51,29 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase //the resource key was discovered without SNMP, with SNMP, with Main Server URL set, //or not - //TODO the default inventory.xml uses discovery results without snmp active. with SNMP active, all 5 vhost - //would discovered in RHQ 3. This test should therefore use a different inventory file. - @Test(enabled = false) //this fails until the above todo is implemented + @Test @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory.xml"; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - testSetup.withApacheSetup().init(); - ApacheServerComponent component = testSetup.withApacheSetup().getExecutionUtil().getServerComponent(); - ApacheDirectiveTree config = component.loadParser(); - config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); - - DeploymentConfig deployConfig = testSetup.getDeploymentConfig(); - - VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); - - defaultOverrides = new HashMap<String, String>(); - defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey())); - - if (deployConfig.vhost1 != null) { - String rhq3Key = keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec()); - defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(rhq3Key)); - } - - if (deployConfig.vhost2 != null) { - String rhq3Key = keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec()); - defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(rhq3Key)); - } - - if (deployConfig.vhost3 != null) { - String rhq3Key = keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec()); - defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(rhq3Key)); - } - - if (deployConfig.vhost4 != null) { - String rhq3Key = keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec()); - defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(rhq3Key)); - } - - testSetup.withDefaultOverrides(defaultOverrides); - } }); } @Test @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory.xml"; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java index 96260a6..38f349e 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java @@ -279,6 +279,8 @@ public class UpgradeTestBase extends PluginContainerTest { replacements.put("snmp.identifier", addressUtility.getHttpdInternalMainServerAddressRepresentation(runtimeConfig).toString(false, false)); + replacements.put("main.rhq4.resource.key", ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); + String vhost1Address = deploymentConfig.vhost1 == null ? null : deploymentConfig.vhost1.address1.toString( false, false); String vhost2Address = deploymentConfig.vhost2 == null ? null : deploymentConfig.vhost2.address1.toString( @@ -293,6 +295,11 @@ public class UpgradeTestBase extends PluginContainerTest { "vhost1.snmp.identifier", addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost1Address, deploymentConfig.vhost1.getServerName()).toString(false, false)); + + replacements.put( + "vhost1.rhq4.resource.key", + ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + deploymentConfig.vhost1.getServerName(), deploymentConfig.vhost1.getAddresses())); } if (vhost2Address != null) { @@ -300,6 +307,11 @@ public class UpgradeTestBase extends PluginContainerTest { "vhost2.snmp.identifier", addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost2Address, deploymentConfig.vhost2.getServerName()).toString(false, false)); + + replacements.put( + "vhost2.rhq4.resource.key", + ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + deploymentConfig.vhost2.getServerName(), deploymentConfig.vhost2.getAddresses())); } if (vhost3Address != null) { @@ -307,6 +319,11 @@ public class UpgradeTestBase extends PluginContainerTest { "vhost3.snmp.identifier", addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost3Address, deploymentConfig.vhost3.getServerName()).toString(false, false)); + + replacements.put( + "vhost3.rhq4.resource.key", + ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + deploymentConfig.vhost3.getServerName(), deploymentConfig.vhost3.getAddresses())); } if (vhost4Address != null) { @@ -314,6 +331,11 @@ public class UpgradeTestBase extends PluginContainerTest { "vhost4.snmp.identifier", addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost4Address, deploymentConfig.vhost4.getServerName()).toString(false, false)); + + replacements.put( + "vhost4.rhq4.resource.key", + ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + deploymentConfig.vhost4.getServerName(), deploymentConfig.vhost4.getAddresses())); } //let the user override everything we just did diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml new file mode 100644 index 0000000..3d41813 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml @@ -0,0 +1,462 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${listen1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml new file mode 100644 index 0000000..5961b3e --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10041</id> + <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:{listen1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1309116183350</ctime> + <mtime>1309116225316</mtime> + <itime>1309116225316</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10046</id> + <uuid>908ea047-889e-4978-a61f-d96e8b1c6d17</uuid> + <resourceKey>${vhost4.rhq4.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + <itime>1309117635788</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10241</id> + <version>0</version> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10242</id> + <version>0</version> + <ctime>1309117635790</ctime> + <mtime>1309117635790</mtime> + <propertySimple> + <id>10858</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10857</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10860</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10859</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10047</id> + <uuid>5fccc52b-8003-42ed-aa69-0b146c783e91</uuid> + <resourceKey>${vhost3.rhq4.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + <itime>1309117635802</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10243</id> + <version>0</version> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10244</id> + <version>0</version> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + <propertySimple> + <id>10922</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10921</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10924</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10923</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10048</id> + <uuid>704a31f3-7f5f-46c1-9bda-70f2645c9604</uuid> + <resourceKey>${main.rhq4.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635810</ctime> + <mtime>1309117635810</mtime> + <itime>1309117635810</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10245</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10246</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + <propertySimple> + <id>10926</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10925</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10928</id> + <name>url</name> + <stringValue>http://${localhost}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10927</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10049</id> + <uuid>03638606-623b-4218-bd23-42e04db0e296</uuid> + <resourceKey>${vhost2.rhq4.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + <itime>1309117635818</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10247</id> + <version>0</version> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10248</id> + <version>0</version> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + <propertySimple> + <id>10930</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10929</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10932</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10931</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10050</id> + <uuid>ae880c2d-747d-492d-8586-a47ab5791b0e</uuid> + <resourceKey>${vhost1.rhq4.resource.key}</resourceKey> + <name>${vhos1.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + <itime>1309117635829</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10249</id> + <version>0</version> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10250</id> + <version>0</version> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + <propertySimple> + <id>10934</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10933</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10936</id> + <name>url</name> + <stringValue>http://${vhost1.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10935</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10201</id> + <version>0</version> + <ctime>1309116183368</ctime> + <mtime>1309116183368</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10211</id> + <version>0</version> + <ctime>1309117523737</ctime> + <mtime>1309117523737</mtime> + <propertySimple> + <id>10863</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10862</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10861</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10865</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10864</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10867</id> + <name>snmpAgentHost</name> + <stringValue>${unresolvable.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10866</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10869</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10868</id> + <name>url</name> + <stringValue>http://${localhost}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10870</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10871</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10872</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10873</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10874</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10875</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10876</id> + <name>snmpAgentPort</name> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10877</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + <propertySimple> + <id>10878</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory.xml deleted file mode 100644 index be89240..0000000 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory.xml +++ /dev/null @@ -1,462 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<inventory-dump> -<classes-used> -<class>org.rhq.core.domain.resource.Resource</class> -</classes-used> -<objects> - -<resource> - <id>10022</id> - <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> - <resourceKey>${server.root}</resourceKey> - <name>${localhost}:${listen1}</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version>2.2.17</version> - <description>Apache Web Server</description> - <ctime>1308835177519</ctime> - <mtime>1308835282077</mtime> - <itime>1308835282077</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVER</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <description>an Apache HTTP Server instance</description> - <id>10044</id> - <name>Apache HTTP Server</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10101</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <resourceConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10102</id> - <propertyDefinitions/> - </resourceConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>true</supportsManualAdd> - </resourceType> - <childResources> - <id>10036</id> - <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> - <resourceKey>localhost.localdomain:11676</resourceKey> - <name>localhost.localdomain:11676</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description></description> - <ctime>1308835287457</ctime> - <mtime>1308835287457</mtime> - <itime>1308835287457</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>BOTH</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10046</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10112</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <resourceConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10113</id> - <propertyDefinitions/> - </resourceConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10186</id> - <version>0</version> - <ctime>1308835287457</ctime> - <mtime>1308835287457</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10187</id> - <version>0</version> - <ctime>1308835287458</ctime> - <mtime>1308835287458</mtime> - <propertySimple> - <id>10802</id> - <name>responseTimeUrlExcludes</name> - </propertySimple> - <propertySimple> - <id>10801</id> - <name>responseTimeLogFile</name> - <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10804</id> - <name>url</name> - <stringValue>http://localhost.localdomain:11676/</stringValue> - </propertySimple> - <propertySimple> - <id>10803</id> - <name>responseTimeUrlTransforms</name> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - </childResources> - <childResources> - <id>10037</id> - <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> - <resourceKey>${main.rhq3.resource.key}</resourceKey> - <name>Main</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description></description> - <ctime>1308835287473</ctime> - <mtime>1308835287473</mtime> - <itime>1308835287473</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>BOTH</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10046</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10112</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <resourceConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10113</id> - <propertyDefinitions/> - </resourceConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10188</id> - <version>0</version> - <ctime>1308835287473</ctime> - <mtime>1308835287473</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10189</id> - <version>0</version> - <ctime>1308835287474</ctime> - <mtime>1308835287474</mtime> - <propertySimple> - <id>10806</id> - <name>responseTimeUrlExcludes</name> - </propertySimple> - <propertySimple> - <id>10805</id> - <name>responseTimeLogFile</name> - <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10808</id> - <name>url</name> - <stringValue>http://${snmp.identifier}/</stringValue> - </propertySimple> - <propertySimple> - <id>10807</id> - <name>responseTimeUrlTransforms</name> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - </childResources> - <childResources> - <id>10038</id> - <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> - <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> - <name>${vhost4.snmp.identifier}</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description></description> - <ctime>1308835287482</ctime> - <mtime>1308835287482</mtime> - <itime>1308835287481</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>BOTH</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10046</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10112</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <resourceConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10113</id> - <propertyDefinitions/> - </resourceConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10190</id> - <version>0</version> - <ctime>1308835287482</ctime> - <mtime>1308835287482</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10191</id> - <version>0</version> - <ctime>1308835287482</ctime> - <mtime>1308835287482</mtime> - <propertySimple> - <id>10810</id> - <name>responseTimeUrlExcludes</name> - </propertySimple> - <propertySimple> - <id>10809</id> - <name>responseTimeLogFile</name> - <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10812</id> - <name>url</name> - <stringValue>http://${vhost4.snmp.identifier}/</stringValue> - </propertySimple> - <propertySimple> - <id>10811</id> - <name>responseTimeUrlTransforms</name> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - </childResources> - <childResources> - <id>10039</id> - <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> - <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> - <name>${vhost3.snmp.identifier}</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description></description> - <ctime>1308835287493</ctime> - <mtime>1308835287493</mtime> - <itime>1308835287492</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>BOTH</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10046</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10112</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <resourceConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10113</id> - <propertyDefinitions/> - </resourceConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10192</id> - <version>0</version> - <ctime>1308835287493</ctime> - <mtime>1308835287493</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10193</id> - <version>0</version> - <ctime>1308835287494</ctime> - <mtime>1308835287494</mtime> - <propertySimple> - <id>10814</id> - <name>responseTimeUrlExcludes</name> - </propertySimple> - <propertySimple> - <id>10813</id> - <name>responseTimeLogFile</name> - <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10816</id> - <name>url</name> - <stringValue>http://${vhost3.snmp.identifier}/</stringValue> - </propertySimple> - <propertySimple> - <id>10815</id> - <name>responseTimeUrlTransforms</name> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - </childResources> - <resourceConfiguration> - <id>10174</id> - <version>0</version> - <ctime>1308835177520</ctime> - <mtime>1308835177520</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10175</id> - <version>0</version> - <ctime>1308835177520</ctime> - <mtime>1308835177520</mtime> - <propertySimple> - <id>10790</id> - <name>errorLogIncludesPattern</name> - </propertySimple> - <propertySimple> - <id>10783</id> - <name>errorLogMinimumSeverity</name> - <stringValue>error</stringValue> - </propertySimple> - <propertySimple> - <id>10708</id> - <name>augeasEnabled</name> - <stringValue>no</stringValue> - </propertySimple> - <propertySimple> - <id>10789</id> - <name>errorLogFilePath</name> - </propertySimple> - <propertySimple> - <id>10786</id> - <name>snmpAgentCommunity</name> - <stringValue>public</stringValue> - </propertySimple> - <propertySimple> - <id>10784</id> - <name>snmpAgentHost</name> - <stringValue>${snmp.host}</stringValue> - </propertySimple> - <propertySimple> - <id>10782</id> - <name>errorLogEventsEnabled</name> - <stringValue>false</stringValue> - </propertySimple> - <propertySimple> - <id>10793</id> - <name>controlScriptPath</name> - </propertySimple> - <propertySimple> - <id>10795</id> - <name>url</name> - <stringValue>http://${localhost}:${listen1}/</stringValue> - </propertySimple> - <propertySimple> - <id>10709</id> - <name>augeasModuleName</name> - <stringValue>Httpd</stringValue> - </propertySimple> - <propertySimple> - <id>10794</id> - <name>configFile</name> - <stringValue>${server.root}/conf/httpd.conf</stringValue> - </propertySimple> - <propertySimple> - <id>10710</id> - <name>configurationFilesInclusionPatterns</name> - <stringValue>${server.root}/conf/httpd.conf</stringValue> - </propertySimple> - <propertySimple> - <id>10788</id> - <name>vhostFilesMask</name> - <stringValue>${server.root}/conf/*</stringValue> - </propertySimple> - <propertySimple> - <id>10787</id> - <name>restartAfterConfigurationUpdate</name> - <stringValue>true</stringValue> - </propertySimple> - <propertySimple> - <id>10792</id> - <name>executablePath</name> - <stringValue>${exe.path}</stringValue> - </propertySimple> - <propertySimple> - <id>10785</id> - <name>snmpAgentPort</name> - <stringValue>${snmp.port}</stringValue> - </propertySimple> - <propertySimple> - <id>10781</id> - <name>vhostCreationPolicy</name> - <stringValue>vhost-per-file</stringValue> - </propertySimple> - <propertySimple> - <id>10791</id> - <name>serverRoot</name> - <stringValue>${server.root}</stringValue> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - <productVersion> - <id>10004</id> - </productVersion> -</resource> -</objects> -</inventory-dump> commit 968b9a1aba058c407e14af1b17063f33677addd9 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri Jun 24 17:59:32 2011 +0200 Basic set of tests for upgrade from RHQ 3.0.0 codebase using the simple apache configuration. diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VHostSpec.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VHostSpec.java index 0e269ee..62940c2 100644 --- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VHostSpec.java +++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VHostSpec.java @@ -42,6 +42,10 @@ public class VHostSpec { return ret; } + public VHostSpec() { + + } + public VHostSpec(ApacheDirective vhostDirective) { hosts = new ArrayList<String>(vhostDirective.getValues()); diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VirtualHostLegacyResourceKeyUtil.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VirtualHostLegacyResourceKeyUtil.java index c1f98aa..3f6a15c 100644 --- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VirtualHostLegacyResourceKeyUtil.java +++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VirtualHostLegacyResourceKeyUtil.java @@ -71,6 +71,37 @@ public class VirtualHostLegacyResourceKeyUtil { * @return possible resource keys of the main server. */ public Set<String> getLegacyMainServerResourceKeys() { + Set<String> ret = new HashSet<String>(); + + String key = getRHQ3NonSNMPLegacyMainServerResourceKey(); + + ret.add(key); + + String snmpKey = getRHQ3SNMPLikeResourceKey(key); + + if (snmpKey != null) { + ret.add(snmpKey); + } + + ret.add(addressUtility.getHttpdInternalMainServerAddressRepresentation(runtimeConfig).toString(false, false)); + + return ret; + } + + /** + * A resource key for the main vhost that would be returned by the RHQ 3 codebase + * if SNMP wasn't enabled during discovery. + * + * Note that this can return 2 different values depending on whether the URL property + * in the parent apache server's plugin configuration is set or not. + * + * Because the resource key is dependent on a value manually entered by the user (albeit + * autodetected during discovery), no attempt is made to guess what values that property + * could have had. Only the current value is used. + * + * @return + */ + public String getRHQ3NonSNMPLegacyMainServerResourceKey() { String mainServerUrl = serverComponent.getServerUrl(); String key = null; @@ -92,32 +123,45 @@ public class VirtualHostLegacyResourceKeyUtil { key = ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY; } + return key; + } + + /** + * Returns a list of possible resource keys that the RHQ 3 code could generate for the specified + * vhost. + * + * As with {@link #getLegacyMainServerResourceKeys()} the resulting set will contain all the various + * resource keys that could have been found by past versions of the plugin. + * + * @param vhost + * @return the possible vhosts + */ + public Set<String> getLegacyVirtualHostResourceKeys(VHostSpec vhost) { + String key = getRHQ3NonSNMPLegacyVirtualHostResourceKey(vhost); + Set<String> ret = new HashSet<String>(); ret.add(key); - String snmpKey = getSNMPResourceKey(key); - + String snmpKey = getRHQ3SNMPLikeResourceKey(key); if (snmpKey != null) { ret.add(snmpKey); } - ret.add(addressUtility.getHttpdInternalMainServerAddressRepresentation(runtimeConfig).toString(false, false)); + String snmpKeyFromRhq1 = addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost.hosts.get(0), vhost.serverName).toString(false, false); + ret.add(snmpKeyFromRhq1); return ret; } /** - * Returns a list of possible resource keys that the RHQ 3 code could generate for the specified - * vhost. - * - * As with {@link #getLegacyMainServerResourceKeys()} the resulting set will contain all the various - * resource keys that could have been found by past versions of the plugin. + * A resource key for given vhost that would be returned by RHQ 3 if SNMP wasn't enabled during + * discovery. * * @param vhost - * @return the possible vhosts + * @return */ - public Set<String> getLegacyVirtualHostResourceKeys(VHostSpec vhost) { + public String getRHQ3NonSNMPLegacyVirtualHostResourceKey(VHostSpec vhost) { String host = vhost.hosts.get(0); HttpdAddressUtility.Address hostAddr = HttpdAddressUtility.Address.parse(host); if (vhost.serverName != null) { @@ -132,24 +176,18 @@ public class VirtualHostLegacyResourceKeyUtil { } catch (UnknownHostException e) { } - String key = hostAddr.host + ":" + hostAddr.port; - - Set<String> ret = new HashSet<String>(); - - ret.add(key); - - String snmpKey = getSNMPResourceKey(key); - if (snmpKey != null) { - ret.add(snmpKey); - } - - String snmpKeyFromRhq1 = addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost.hosts.get(0), vhost.serverName).toString(false, false); - ret.add(snmpKeyFromRhq1); - - return ret; + return hostAddr.host + ":" + hostAddr.port; } - private String getSNMPResourceKey(String nonSnmpResourceKey) { + /** + * Returns an "SNMP" resource key that would have been resolved out of the non-snmp resource key + * by the RHQ 3 code-base. Note that the returned key actually isn't what SNMP module would + * actually return. + * + * @param nonSnmpResourceKey + * @return + */ + public String getRHQ3SNMPLikeResourceKey(String nonSnmpResourceKey) { int idx = getMatchingWwwServiceIndex(nonSnmpResourceKey); if (idx < 0) { diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java index 13a9c4a..135c2aa 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java @@ -19,25 +19,15 @@ package org.rhq.plugins.apache; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - -import java.util.ArrayList; import java.util.Comparator; import java.util.HashMap; -import java.util.List; -import java.util.Map; import java.util.Set; import java.util.TreeSet; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.testng.annotations.Parameters; import org.testng.annotations.Test; import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; import org.rhq.test.pc.PluginContainerSetup; /** @@ -47,44 +37,7 @@ import org.rhq.test.pc.PluginContainerSetup; */ @Test(groups = "apache-integration-tests") public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { - private static final Log LOG = LogFactory.getLog(UpgradeSimpleConfigurationFromRHQ1_3Test.class); - - private enum Apache { - V_1_3_x { - public String getConfigDirName() { - return "1.3.x"; - } - }, - - V_2_2_x { - public String getConfigDirName() { - return "2.2.x"; - } - }; - public abstract String getConfigDirName(); - } - - private static class TestConfiguration { - public Apache version; - public String configurationName; - public String serverRoot; - public String binPath; - public Map<String, String> defaultOverrides; - - public void beforeTestSetup(TestSetup testSetup) { - - } - - public void beforePluginContainerStart(TestSetup setup) { - - } - - public void beforeTests() { - - } - } - @Test @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) @Parameters({ "apache2.install.dir", "apache2.exe.path" }) @@ -96,7 +49,8 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { serverRoot = installPath; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - version = Apache.V_2_2_x; + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; } }); } @@ -112,7 +66,8 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { serverRoot = installPath; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - version = Apache.V_1_3_x; + apacheConfigurationFiles = new String[] { "/full-configurations/1.3.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; }}); } @@ -123,9 +78,11 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { testUpgrade(new TestConfiguration() { { configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; serverRoot = installPath; binPath = exePath; - version = Apache.V_2_2_x; + defaultOverrides = new HashMap<String, String>(); defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); @@ -158,78 +115,5 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { } } }); - } - - private void testUpgrade(TestConfiguration testConfiguration) throws Throwable { - final TestSetup setup = new TestSetup(testConfiguration.configurationName); - boolean testFailed = false; - try { - testConfiguration.beforeTestSetup(setup); - - String configPath = "/full-configurations/" + testConfiguration.version.getConfigDirName() + "/simple/httpd.conf"; - - setup.withInventoryFrom("/mocked-inventories/rhq-1.3.x/simple/inventory.xml") - .withPlatformResource(platform).withDefaultExpectations().withDefaultOverrides(testConfiguration.defaultOverrides) - .withApacheSetup().withConfigurationFiles(configPath, "/snmpd.conf", "/mime.types") - .withServerRoot(testConfiguration.serverRoot).withExePath(testConfiguration.binPath).setup(); - - testConfiguration.beforePluginContainerStart(setup); - - startConfiguredPluginContainer(); - - testConfiguration.beforeTests(); - - //ok, now we should see the resources upgraded in the fake server inventory. - ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); - ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); - - Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); - - assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); - - Resource server = servers.iterator().next(); - - String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfiguration.serverRoot, testConfiguration.serverRoot - + "/conf/httpd.conf"); - - assertEquals(server.getResourceKey(), expectedResourceKey, - "The server resource key doesn't seem to be upgraded."); - - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); - - assertEquals(vhosts.size(), 5, "Unexpected number of vhosts discovered found"); - - List<String> expectedResourceKeys = new ArrayList<String>(5); - - DeploymentConfig dc = setup.getDeploymentConfig(); - - expectedResourceKeys.add(ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost1.getServerName(), dc.vhost1.getAddresses())); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost2.getServerName(), dc.vhost2.getAddresses())); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost3.getServerName(), dc.vhost3.getAddresses())); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost4.getServerName(), dc.vhost4.getAddresses())); - - for (Resource vhost : vhosts) { - assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), - "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'. Only expecting " + expectedResourceKeys); - } - } catch (Throwable t) { - testFailed = true; - throw t; - } finally { - try { - setup.withApacheSetup().getExecutionUtil().invokeOperation("stop"); - } catch (Exception e) { - if (testFailed) { - LOG.error("Failed to stop apache.", e); - } else { - throw e; - } - } - } - } + } } diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java new file mode 100644 index 0000000..386a871 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java @@ -0,0 +1,206 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache; + + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +import java.util.HashMap; +import java.util.List; +import java.util.Set; + +import org.testng.annotations.Parameters; +import org.testng.annotations.Test; + +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceError; +import org.rhq.core.domain.resource.ResourceErrorType; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.plugins.apache.parser.ApacheDirectiveTree; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; +import org.rhq.plugins.apache.util.RuntimeApacheConfiguration; +import org.rhq.plugins.apache.util.VirtualHostLegacyResourceKeyUtil; +import org.rhq.test.pc.PluginContainerSetup; + +/** + * + * + * @author Lukas Krejci + */ +public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase { + + //TODO override the *.rhq3.resource.key variables in each test to define whether + //the resource key was discovered without SNMP, with SNMP, with Main Server URL set, + //or not + + //TODO the default inventory.xml uses discovery results without snmp active. with SNMP active, all 5 vhost + //would discovered in RHQ 3. This test should therefore use a different inventory file. + @Test(enabled = false) //this fails until the above todo is implemented + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + testSetup.withApacheSetup().init(); + ApacheServerComponent component = testSetup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + + DeploymentConfig deployConfig = testSetup.getDeploymentConfig(); + + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey())); + + if (deployConfig.vhost1 != null) { + String rhq3Key = keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec()); + defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(rhq3Key)); + } + + if (deployConfig.vhost2 != null) { + String rhq3Key = keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec()); + defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(rhq3Key)); + } + + if (deployConfig.vhost3 != null) { + String rhq3Key = keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec()); + defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(rhq3Key)); + } + + if (deployConfig.vhost4 != null) { + String rhq3Key = keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec()); + defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(rhq3Key)); + } + + testSetup.withDefaultOverrides(defaultOverrides); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + testSetup.withApacheSetup().init(); + ApacheServerComponent component = testSetup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + + DeploymentConfig deployConfig = testSetup.getDeploymentConfig(); + + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey()); + + if (deployConfig.vhost1 != null) { + defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec())); + } + + if (deployConfig.vhost2 != null) { + defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec())); + } + + if (deployConfig.vhost3 != null) { + defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec())); + } + + if (deployConfig.vhost4 != null) { + defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec())); + } + + testSetup.withDefaultOverrides(defaultOverrides); + } + + /** + * Do our own tests here, because the test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); + + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(this.serverRoot, this.serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), 4, "Unexpected number of vhosts discovered found"); + + //let's check that the main vhost has a an upgrade error attached to it + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + String mainVhostRK = keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey(); + + Resource mainVhost = null; + for(Resource r : vhosts) { + if (mainVhostRK.equals(r.getResourceKey())) { + mainVhost = r; + break; + } + } + + assertNotNull(mainVhost, "Couldn't find the main vhost with the expected resource key '" + mainVhostRK + "'."); + + List<ResourceError> errors = mainVhost.getResourceErrors(ResourceErrorType.UPGRADE); + assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); + assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + } + }); + } + +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java index 16bd06b..96260a6 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java @@ -19,6 +19,7 @@ package org.rhq.plugins.apache; +import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import java.io.File; @@ -28,6 +29,7 @@ import java.io.Reader; import java.net.InetAddress; import java.net.URI; import java.net.UnknownHostException; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -37,6 +39,8 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.jmock.Expectations; import org.testng.annotations.BeforeClass; @@ -73,6 +77,8 @@ import org.rhq.test.pc.PluginContainerTest; */ public class UpgradeTestBase extends PluginContainerTest { + private static final Log LOG = LogFactory.getLog(UpgradeTestBase.class); + protected class TestSetup { private String configurationName; private FakeServerInventory fakeInventory = new FakeServerInventory(); @@ -310,6 +316,9 @@ public class UpgradeTestBase extends PluginContainerTest { deploymentConfig.vhost4.getServerName()).toString(false, false)); } + //let the user override everything we just did + replacements.putAll(defaultOverrides); + InputStream dataStream = getClass().getResourceAsStream(inventoryFile); Reader rdr = new TokenReplacingReader(new InputStreamReader(dataStream), replacements); @@ -344,6 +353,28 @@ public class UpgradeTestBase extends PluginContainerTest { } } + protected static class TestConfiguration { + public String[] apacheConfigurationFiles; + public String inventoryFile; + public String configurationName; + public String serverRoot; + public String binPath; + public Map<String, String> defaultOverrides; + public boolean upgradeShouldSucceed = true; + + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + + } + + public void beforePluginContainerStart(TestSetup setup) throws Throwable { + + } + + public void beforeTests(TestSetup setup) throws Throwable { + + } + } + protected static final String PLATFORM_PLUGIN = "file:target/itest/plugins/rhq-platform-plugin-for-apache-test.jar"; protected static final String AUGEAS_PLUGIN = "file:target/itest/plugins/rhq-augeas-plugin-for-apache-test.jar"; protected static final String APACHE_PLUGIN = "file:target/itest/plugins/rhq-apache-plugin-for-apache-test.jar"; @@ -370,6 +401,89 @@ public class UpgradeTestBase extends PluginContainerTest { return null; } + protected void testUpgrade(TestConfiguration testConfiguration) throws Throwable { + final TestSetup setup = new TestSetup(testConfiguration.configurationName); + boolean testFailed = false; + try { + + String[] configFiles = Arrays.copyOf(testConfiguration.apacheConfigurationFiles, testConfiguration.apacheConfigurationFiles.length + 2); + configFiles[testConfiguration.apacheConfigurationFiles.length] = "/snmpd.conf"; + configFiles[testConfiguration.apacheConfigurationFiles.length + 1] = "/mime.types"; + + setup.withInventoryFrom(testConfiguration.inventoryFile) + .withPlatformResource(platform).withDefaultExpectations().withDefaultOverrides(testConfiguration.defaultOverrides) + .withApacheSetup().withConfigurationFiles(configFiles) + .withServerRoot(testConfiguration.serverRoot).withExePath(testConfiguration.binPath); + + testConfiguration.beforeTestSetup(setup); + + setup.setup(); + + testConfiguration.beforePluginContainerStart(setup); + + startConfiguredPluginContainer(); + + testConfiguration.beforeTests(setup); + + if (!testConfiguration.upgradeShouldSucceed) { + return; + } + + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); + + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfiguration.serverRoot, testConfiguration.serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), 5, "Unexpected number of vhosts discovered found"); + + List<String> expectedResourceKeys = new ArrayList<String>(5); + + DeploymentConfig dc = setup.getDeploymentConfig(); + + expectedResourceKeys.add(ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost1.getServerName(), dc.vhost1.getAddresses())); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost2.getServerName(), dc.vhost2.getAddresses())); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost3.getServerName(), dc.vhost3.getAddresses())); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost4.getServerName(), dc.vhost4.getAddresses())); + + for (Resource vhost : vhosts) { + assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), + "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'. Only expecting " + expectedResourceKeys); + } + } catch (Throwable t) { + testFailed = true; + LOG.error("Error during test upgrade execution.", t); + throw t; + } finally { + try { + setup.withApacheSetup().getExecutionUtil().invokeOperation("stop"); + } catch (Exception e) { + if (testFailed) { + LOG.error("Failed to stop apache.", e); + } else { + throw e; + } + } + } + } + private static List<ResourceType> getResourceTypesInPlugin(String pluginUri) throws Exception { PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(new URI(pluginUri).toURL()); PluginMetadataParser parser = new PluginMetadataParser(descriptor, diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java index 97abce3..be73319 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java @@ -93,6 +93,13 @@ public class ApacheDeploymentUtil { return serverName; } + public VHostSpec getVHostSpec() { + VHostSpec ret = new VHostSpec(); + ret.serverName = getServerName(); + ret.hosts = getAddresses(); + return ret; + } + public List<String> getAddresses() { ArrayList<String> ret = new ArrayList<String>(); if (address1 != null) { diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory.xml index 1aa8b38..f8d181d 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory.xml @@ -486,7 +486,7 @@ <id>10370</id> <name>snmpAgentHost</name> <override>false</override> - <stringValue>127.0.0.1</stringValue> + <stringValue>${snmp.host}</stringValue> </propertySimple> <propertySimple> <id>10713</id> @@ -514,7 +514,7 @@ <id>10712</id> <name>snmpAgentPort</name> <override>false</override> - <stringValue>1610</stringValue> + <stringValue>${snmp.port}</stringValue> </propertySimple> <propertySimple> <id>10715</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory.xml new file mode 100644 index 0000000..be89240 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory.xml @@ -0,0 +1,462 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${listen1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>localhost.localdomain:11676</resourceKey> + <name>localhost.localdomain:11676</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://localhost.localdomain:11676/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> commit f234bd208c3b0e5344fe8e235237c58063985326 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Jun 23 13:23:43 2011 +0200 make the tests actually compile diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java index af809a5..13a9c4a 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java @@ -91,7 +91,7 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { public void testWithResolvableServerNames_Apache2(final String installPath, final String exePath) throws Throwable { - testUpgradeFromRHQ1_3(new TestConfiguration() { + testUpgrade(new TestConfiguration() { { serverRoot = installPath; binPath = exePath; @@ -108,7 +108,7 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { public void testWithResolvableServerNames_Apache1(final String installPath, final String exePath) throws Throwable { - testUpgradeFromRHQ1_3(new TestConfiguration() {{ + testUpgrade(new TestConfiguration() {{ serverRoot = installPath; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -120,7 +120,7 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) @Parameters({ "apache2.install.dir", "apache2.exe.path" }) public void testWithNonUniqueServerNames_Apache2(final String installPath, final String exePath) throws Throwable { - testUpgradeFromRHQ1_3(new TestConfiguration() { + testUpgrade(new TestConfiguration() { { configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; serverRoot = installPath; commit 44049422b33901613c769fd1fab60c211427089a Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Jun 23 13:22:58 2011 +0200 fix removing of the resources in the fake server inventory. diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java index 4d5dc7d..17beb1e 100644 --- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java +++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java @@ -277,6 +277,9 @@ public class FakeServerInventory { if (parent != null) { parent.getChildResources().remove(r); } + for(Resource child : r.getChildResources()) { + removeResource(child); + } } private Resource fakePersist(Resource agentSideResource, InventoryStatus requiredInventoryStatus, commit f15678e57cb7001b4120c38b3ca0b5cf9d62e745 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Jun 23 13:22:40 2011 +0200 Throw more appropriate (or documented) exceptions. diff --git a/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java b/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java index 22a3167..35ba2d2 100644 --- a/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java +++ b/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java @@ -125,7 +125,7 @@ public class TokenReplacingReader extends Reader { } public long skip(long n) throws IOException { - throw new RuntimeException("Operation Not Supported"); + throw new UnsupportedOperationException("skip() not supported on TokenReplacingReader."); } public boolean ready() throws IOException { @@ -137,10 +137,10 @@ public class TokenReplacingReader extends Reader { } public void mark(int readAheadLimit) throws IOException { - throw new RuntimeException("Operation Not Supported"); + throw new IOException("mark() not supported on TokenReplacingReader."); } public void reset() throws IOException { - throw new RuntimeException("Operation Not Supported"); + throw new IOException("reset() not supported on TokenReplacingReader."); } } commit b93c6ce9baf853bbdc69d7cfc85032cd63fcbccd Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Jun 23 13:22:09 2011 +0200 Renamed the UpgradeSimpleConfigurationWithResolvableServerNamesTest to UpgradeSimpleConfigurationFromRHQ1_3Test to better describe what is actually being tested and to support better fragmentation of the tests we are going to have into standalone test classes. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java new file mode 100644 index 0000000..af809a5 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java @@ -0,0 +1,235 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.testng.annotations.Parameters; +import org.testng.annotations.Test; + +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; +import org.rhq.test.pc.PluginContainerSetup; + +/** + * + * + * @author Lukas Krejci + */ +@Test(groups = "apache-integration-tests") +public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { + private static final Log LOG = LogFactory.getLog(UpgradeSimpleConfigurationFromRHQ1_3Test.class); + + private enum Apache { + V_1_3_x { + public String getConfigDirName() { + return "1.3.x"; + } + }, + + V_2_2_x { + public String getConfigDirName() { + return "2.2.x"; + } + }; + + public abstract String getConfigDirName(); + } + + private static class TestConfiguration { + public Apache version; + public String configurationName; + public String serverRoot; + public String binPath; + public Map<String, String> defaultOverrides; + + public void beforeTestSetup(TestSetup testSetup) { + + } + + public void beforePluginContainerStart(TestSetup setup) { + + } + + public void beforeTests() { + + } + } + + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithResolvableServerNames_Apache2(final String installPath, final String exePath) + throws Throwable { + + testUpgradeFromRHQ1_3(new TestConfiguration() { + { + serverRoot = installPath; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + version = Apache.V_2_2_x; + } + }); + } + + @Test(enabled = false) + //ApacheServerOperationsDelegate doesn't work with apache 1.3 + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache1.install.dir", "apache1.exe.path" }) + public void testWithResolvableServerNames_Apache1(final String installPath, final String exePath) + throws Throwable { + + testUpgradeFromRHQ1_3(new TestConfiguration() {{ + serverRoot = installPath; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + version = Apache.V_1_3_x; + }}); + } + + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithNonUniqueServerNames_Apache2(final String installPath, final String exePath) throws Throwable { + testUpgradeFromRHQ1_3(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; + serverRoot = installPath; + binPath = exePath; + version = Apache.V_2_2_x; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); + } + + @Override + public void beforePluginContainerStart(TestSetup setup) { + //in this scenario, the RHQ 1.3 would only discover 1 vhost (and the main vhost), because they would have the same resource key + //due to the same ServerName. I need to process the default inventory to reflect that otherwise I would get upgrade + //failures. + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(findApachePluginResourceTypeByName("Apache Virtual Host")); + Set<Resource> uniques = new TreeSet<Resource>(new Comparator<Resource>() { + public int compare(Resource a, Resource b) { + return a.getResourceKey().compareTo(b.getResourceKey()); + } + }); + + for(Resource vhost : vhosts) { + if (uniques.contains(vhost)) { + //remove the vhost from the server's inventory + setup.getFakeInventory().removeResource(vhost); + } else { + uniques.add(vhost); + } + } + } + }); + } + + private void testUpgrade(TestConfiguration testConfiguration) throws Throwable { + final TestSetup setup = new TestSetup(testConfiguration.configurationName); + boolean testFailed = false; + try { + testConfiguration.beforeTestSetup(setup); + + String configPath = "/full-configurations/" + testConfiguration.version.getConfigDirName() + "/simple/httpd.conf"; + + setup.withInventoryFrom("/mocked-inventories/rhq-1.3.x/simple/inventory.xml") + .withPlatformResource(platform).withDefaultExpectations().withDefaultOverrides(testConfiguration.defaultOverrides) + .withApacheSetup().withConfigurationFiles(configPath, "/snmpd.conf", "/mime.types") + .withServerRoot(testConfiguration.serverRoot).withExePath(testConfiguration.binPath).setup(); + + testConfiguration.beforePluginContainerStart(setup); + + startConfiguredPluginContainer(); + + testConfiguration.beforeTests(); + + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); + + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfiguration.serverRoot, testConfiguration.serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), 5, "Unexpected number of vhosts discovered found"); + + List<String> expectedResourceKeys = new ArrayList<String>(5); + + DeploymentConfig dc = setup.getDeploymentConfig(); + + expectedResourceKeys.add(ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost1.getServerName(), dc.vhost1.getAddresses())); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost2.getServerName(), dc.vhost2.getAddresses())); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost3.getServerName(), dc.vhost3.getAddresses())); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost4.getServerName(), dc.vhost4.getAddresses())); + + for (Resource vhost : vhosts) { + assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), + "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'. Only expecting " + expectedResourceKeys); + } + } catch (Throwable t) { + testFailed = true; + throw t; + } finally { + try { + setup.withApacheSetup().getExecutionUtil().invokeOperation("stop"); + } catch (Exception e) { + if (testFailed) { + LOG.error("Failed to stop apache.", e); + } else { + throw e; + } + } + } + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java deleted file mode 100644 index f887b83..0000000 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java +++ /dev/null @@ -1,235 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.plugins.apache; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.testng.annotations.Parameters; -import org.testng.annotations.Test; - -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; -import org.rhq.test.pc.PluginContainerSetup; - -/** - * - * - * @author Lukas Krejci - */ -@Test(groups = "apache-integration-tests") -public class UpgradeSimpleConfigurationWithResolvableServerNamesTest extends UpgradeTestBase { - private static final Log LOG = LogFactory.getLog(UpgradeSimpleConfigurationWithResolvableServerNamesTest.class); - - private enum Apache { - V_1_3_x { - public String getConfigDirName() { - return "1.3.x"; - } - }, - - V_2_2_x { - public String getConfigDirName() { - return "2.2.x"; - } - }; - - public abstract String getConfigDirName(); - } - - private static class TestConfiguration { - public Apache version; - public String configurationName; - public String serverRoot; - public String binPath; - public Map<String, String> defaultOverrides; - - public void beforeTestSetup(TestSetup testSetup) { - - } - - public void beforePluginContainerStart(TestSetup setup) { - - } - - public void beforeTests() { - - } - } - - @Test - @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) - @Parameters({ "apache2.install.dir", "apache2.exe.path" }) - public void testWithResolvableServerNames_Apache2_upgradeFromRHQ1_3(final String installPath, final String exePath) - throws Throwable { - - testUpgradeFromRHQ1_3(new TestConfiguration() { - { - serverRoot = installPath; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - version = Apache.V_2_2_x; - } - }); - } - - @Test(enabled = false) - //ApacheServerOperationsDelegate doesn't work with apache 1.3 - @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) - @Parameters({ "apache1.install.dir", "apache1.exe.path" }) - public void testWithResolvableServerNames_Apache1_upgradeFromRHQ1_3(final String installPath, final String exePath) - throws Throwable { - - testUpgradeFromRHQ1_3(new TestConfiguration() {{ - serverRoot = installPath; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - version = Apache.V_1_3_x; - }}); - } - - @Test - @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) - @Parameters({ "apache2.install.dir", "apache2.exe.path" }) - public void testWithUnresolvableServerNames_Apache2_upgradeFromRHQ1_3(final String installPath, final String exePath) throws Throwable { - testUpgradeFromRHQ1_3(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; - serverRoot = installPath; - binPath = exePath; - version = Apache.V_2_2_x; - - defaultOverrides = new HashMap<String, String>(); - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); - } - - @Override - public void beforePluginContainerStart(TestSetup setup) { - //in this scenario, the RHQ 1.3 would only discover 1 vhost (and the main vhost), because they would have the same resource key - //due to the same ServerName. I need to process the default inventory to reflect that otherwise I would get upgrade - //failures. - - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(findApachePluginResourceTypeByName("Apache Virtual Host")); - Set<Resource> uniques = new TreeSet<Resource>(new Comparator<Resource>() { - public int compare(Resource a, Resource b) { - return a.getResourceKey().compareTo(b.getResourceKey()); - } - }); - - for(Resource vhost : vhosts) { - if (uniques.contains(vhost)) { - //remove the vhost from the server's inventory - setup.getFakeInventory().removeResource(vhost); - } else { - uniques.add(vhost); - } - } - } - }); - } - - private void testUpgradeFromRHQ1_3(TestConfiguration testConfiguration) throws Throwable { - final TestSetup setup = new TestSetup(testConfiguration.configurationName); - boolean testFailed = false; - try { - testConfiguration.beforeTestSetup(setup); - - String configPath = "/full-configurations/" + testConfiguration.version.getConfigDirName() + "/simple/httpd.conf"; - - setup.withInventoryFrom("/mocked-inventories/rhq-1.3.x/simple/inventory.xml") - .withPlatformResource(platform).withDefaultExpectations().withDefaultOverrides(testConfiguration.defaultOverrides) - .withApacheSetup().withConfigurationFiles(configPath, "/snmpd.conf", "/mime.types") - .withServerRoot(testConfiguration.serverRoot).withExePath(testConfiguration.binPath).setup(); - - testConfiguration.beforePluginContainerStart(setup); - - startConfiguredPluginContainer(); - - testConfiguration.beforeTests(); - - //ok, now we should see the resources upgraded in the fake server inventory. - ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); - ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); - - Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); - - assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); - - Resource server = servers.iterator().next(); - - String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfiguration.serverRoot, testConfiguration.serverRoot - + "/conf/httpd.conf"); - - assertEquals(server.getResourceKey(), expectedResourceKey, - "The server resource key doesn't seem to be upgraded."); - - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); - - assertEquals(vhosts.size(), 5, "Unexpected number of vhosts discovered found"); - - List<String> expectedResourceKeys = new ArrayList<String>(5); - - DeploymentConfig dc = setup.getDeploymentConfig(); - - expectedResourceKeys.add(ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost1.getServerName(), dc.vhost1.getAddresses())); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost2.getServerName(), dc.vhost2.getAddresses())); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost3.getServerName(), dc.vhost3.getAddresses())); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost4.getServerName(), dc.vhost4.getAddresses())); - - for (Resource vhost : vhosts) { - assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), - "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'. Only expecting " + expectedResourceKeys); - } - } catch (Throwable t) { - testFailed = true; - throw t; - } finally { - try { - setup.withApacheSetup().getExecutionUtil().invokeOperation("stop"); - } catch (Exception e) { - if (testFailed) { - LOG.error("Failed to stop apache.", e); - } else { - throw e; - } - } - } - } -} commit 5a02ee97caf19a7f9945976f4fb22934574f7a36 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed Jun 22 18:17:07 2011 +0200 better message in TestNG reports diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java index 2ba6108..f887b83 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java @@ -215,7 +215,7 @@ public class UpgradeSimpleConfigurationWithResolvableServerNamesTest extends Upg for (Resource vhost : vhosts) { assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), - "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'."); + "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'. Only expecting " + expectedResourceKeys); } } catch (Throwable t) { testFailed = true; commit ac3bee9ff340818cda04d0613c1cb44b8893a643 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed Jun 22 18:14:07 2011 +0200 Adding a test for upgrading apache that has 4 vhosts using the same servername (that uses an unresolvable hostname) from RHQ 1.3.x to the latest code. A bunch of fixes all around the place to make stuff more overridable from code rather than only from the system properties. diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java index 5f8a922..4d5dc7d 100644 --- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java +++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java @@ -271,6 +271,14 @@ public class FakeServerInventory { return result; } + public void removeResource(Resource r) { + resourceStore.remove(r.getUuid()); + Resource parent = r.getParentResource(); + if (parent != null) { + parent.getChildResources().remove(r); + } + } + private Resource fakePersist(Resource agentSideResource, InventoryStatus requiredInventoryStatus, Set<String> inProgressUUIds) { Resource persisted = resourceStore.get(agentSideResource.getUuid()); @@ -307,11 +315,18 @@ public class FakeServerInventory { persisted.setParentResource(parent); } - Set<Resource> childResources = persisted.getChildResources(); + //persist the children + Set<Resource> childResources = new LinkedHashSet<Resource>(); for (Resource child : agentSideResource.getChildResources()) { childResources.add(fakePersist(child, requiredInventoryStatus, inProgressUUIds)); } - + //now update the list with whatever the persisted resource contained in the past + //i.e. we prefer the current results from the agent but keep the children we used to + //have in the past. This is the same behavior as the actual RHQ server has. + childResources.addAll(persisted.getChildResources()); + + persisted.setChildResources(childResources); + inProgressUUIds.remove(agentSideResource.getUuid()); return persisted; diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java index b196654..2ba6108 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java @@ -23,8 +23,12 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Set; +import java.util.TreeSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -44,54 +48,137 @@ import org.rhq.test.pc.PluginContainerSetup; @Test(groups = "apache-integration-tests") public class UpgradeSimpleConfigurationWithResolvableServerNamesTest extends UpgradeTestBase { private static final Log LOG = LogFactory.getLog(UpgradeSimpleConfigurationWithResolvableServerNamesTest.class); - + private enum Apache { - V_1_3_x{ + V_1_3_x { public String getConfigDirName() { return "1.3.x"; } }, - + V_2_2_x { public String getConfigDirName() { return "2.2.x"; } }; - + public abstract String getConfigDirName(); } + + private static class TestConfiguration { + public Apache version; + public String configurationName; + public String serverRoot; + public String binPath; + public Map<String, String> defaultOverrides; + + public void beforeTestSetup(TestSetup testSetup) { + + } + + public void beforePluginContainerStart(TestSetup setup) { + + } + + public void beforeTests() { + + } + } + @Test @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) @Parameters({ "apache2.install.dir", "apache2.exe.path" }) - public void testSimpleConfigurationWithResolvableServerNames_Apache2_upgradeFromRHQ1_3( - String apacheInstallationDirectory, String exePath) throws Throwable { - - testUpgradeFromRHQ1_3(Apache.V_2_2_x, DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES, apacheInstallationDirectory, exePath); + public void testWithResolvableServerNames_Apache2_upgradeFromRHQ1_3(final String installPath, final String exePath) + throws Throwable { + + testUpgradeFromRHQ1_3(new TestConfiguration() { + { + serverRoot = installPath; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + version = Apache.V_2_2_x; + } + }); } - @Test(enabled = false) //ApacheServerOperationsDelegate doesn't work with apache 1.3 + @Test(enabled = false) + //ApacheServerOperationsDelegate doesn't work with apache 1.3 @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) @Parameters({ "apache1.install.dir", "apache1.exe.path" }) - public void testSimpleConfigurationWithResolvableServerNames_Apache1_upgradeFromRHQ1_3( - String apacheInstallationDirectory, String exePath) throws Throwable { + public void testWithResolvableServerNames_Apache1_upgradeFromRHQ1_3(final String installPath, final String exePath) + throws Throwable { + + testUpgradeFromRHQ1_3(new TestConfiguration() {{ + serverRoot = installPath; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + version = Apache.V_1_3_x; + }}); + } - testUpgradeFromRHQ1_3(Apache.V_1_3_x, DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES, apacheInstallationDirectory, exePath); + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithUnresolvableServerNames_Apache2_upgradeFromRHQ1_3(final String installPath, final String exePath) throws Throwable { + testUpgradeFromRHQ1_3(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; + serverRoot = installPath; + binPath = exePath; + version = Apache.V_2_2_x; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); + } + + @Override + public void beforePluginContainerStart(TestSetup setup) { + //in this scenario, the RHQ 1.3 would only discover 1 vhost (and the main vhost), because they would have the same resource key + //due to the same ServerName. I need to process the default inventory to reflect that otherwise I would get upgrade + //failures. + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(findApachePluginResourceTypeByName("Apache Virtual Host")); + Set<Resource> uniques = new TreeSet<Resource>(new Comparator<Resource>() { + public int compare(Resource a, Resource b) { + return a.getResourceKey().compareTo(b.getResourceKey()); + } + }); + + for(Resource vhost : vhosts) { + if (uniques.contains(vhost)) { + //remove the vhost from the server's inventory + setup.getFakeInventory().removeResource(vhost); + } else { + uniques.add(vhost); + } + } + } + }); } - private void testUpgradeFromRHQ1_3(Apache version, String configurationName, String serverRoot, String binPath) throws Throwable { - final TestSetup setup = new TestSetup(configurationName); + private void testUpgradeFromRHQ1_3(TestConfiguration testConfiguration) throws Throwable { + final TestSetup setup = new TestSetup(testConfiguration.configurationName); boolean testFailed = false; try { + testConfiguration.beforeTestSetup(setup); - String configPath = "/full-configurations/" + version.getConfigDirName() + "/simple/httpd.conf"; - - setup.withInventoryFrom("/mocked-inventories/rhq-1.3.x/includes/inventory.xml") - .withPlatformResource(platform).withDefaultExpectations().withApacheSetup() - .withConfigurationFiles(configPath, "/snmpd.conf", "/mime.types") - .withServerRoot(serverRoot).withExePath(binPath).setup(); + String configPath = "/full-configurations/" + testConfiguration.version.getConfigDirName() + "/simple/httpd.conf"; + + setup.withInventoryFrom("/mocked-inventories/rhq-1.3.x/simple/inventory.xml") + .withPlatformResource(platform).withDefaultExpectations().withDefaultOverrides(testConfiguration.defaultOverrides) + .withApacheSetup().withConfigurationFiles(configPath, "/snmpd.conf", "/mime.types") + .withServerRoot(testConfiguration.serverRoot).withExePath(testConfiguration.binPath).setup(); + testConfiguration.beforePluginContainerStart(setup); + startConfiguredPluginContainer(); + testConfiguration.beforeTests(); + //ok, now we should see the resources upgraded in the fake server inventory. ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); @@ -102,7 +189,7 @@ public class UpgradeSimpleConfigurationWithResolvableServerNamesTest extends Upg Resource server = servers.iterator().next(); - String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(serverRoot, serverRoot + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfiguration.serverRoot, testConfiguration.serverRoot + "/conf/httpd.conf"); assertEquals(server.getResourceKey(), expectedResourceKey, @@ -110,7 +197,7 @@ public class UpgradeSimpleConfigurationWithResolvableServerNamesTest extends Upg Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); - assertEquals(vhosts.size(), 5, "There should be 5 vhosts discovered but found " + vhosts.size()); + assertEquals(vhosts.size(), 5, "Unexpected number of vhosts discovered found"); List<String> expectedResourceKeys = new ArrayList<String>(5); diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java index e44dc99..16bd06b 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java @@ -31,15 +31,14 @@ import java.net.UnknownHostException; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; import java.util.UUID; import org.jmock.Expectations; -import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; -import org.testng.annotations.Parameters; import org.rhq.core.clientapi.agent.metadata.PluginMetadataParser; import org.rhq.core.clientapi.descriptor.AgentPluginDescriptorUtil; @@ -81,7 +80,8 @@ public class UpgradeTestBase extends PluginContainerTest { private Resource platform; private ApacheSetup apacheSetup = new ApacheSetup(); private DeploymentConfig deploymentConfig; - + private Map<String, String> defaultOverrides = new HashMap<String, String>(); + public class ApacheSetup { private String serverRoot; private String exePath; @@ -97,7 +97,7 @@ public class UpgradeTestBase extends PluginContainerTest { this.serverRoot = serverRoot; //auto-define the server root property as if it was passed on the commandline System.getProperties().put(configurationName + ".server.root", serverRoot); - deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName); + deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName, defaultOverrides); return this; } @@ -179,14 +179,20 @@ public class UpgradeTestBase extends PluginContainerTest { public TestSetup(String configurationName) { this.configurationName = configurationName; - deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName); + deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName, defaultOverrides); } public TestSetup withInventoryFrom(String classPathUri) { inventoryFile = classPathUri; return this; } - + + public TestSetup withDefaultOverrides(Map<String, String> defaultOverrides) { + this.defaultOverrides = defaultOverrides == null ? new HashMap<String, String>() : defaultOverrides; + deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName, this.defaultOverrides); + return this; + } + public TestSetup withPlatformResource(Resource platform) { this.platform = platform; return this; @@ -255,7 +261,7 @@ public class UpgradeTestBase extends PluginContainerTest { public TestSetup setup() throws Exception { apacheSetup.doSetup(); - Map<String, String> replacements = deploymentConfig.getTokenReplacements(); + Map<String, String> replacements = deploymentConfig.getTokenReplacements(); replacements.put("server.root", apacheSetup.serverRoot); replacements.put("exe.path", apacheSetup.exePath); replacements.put("localhost", determineLocalhost()); @@ -412,4 +418,14 @@ public class UpgradeTestBase extends PluginContainerTest { return null; } + protected static String variableName(String prefix, String name) { + StringBuilder bld = new StringBuilder(); + if (prefix != null && !prefix.isEmpty()) { + bld.append(prefix).append("."); + } + + bld.append(name); + + return bld.toString(); + } } diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java index 59e5d7e..97abce3 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java @@ -203,30 +203,36 @@ public class ApacheDeploymentUtil { checkOrAddDefault(variables, "port3", "11677"); checkOrAddDefault(variables, "port4", "11678"); - checkOrAddDefault(variables, prefix + ".listen1", "${port1}"); - checkOrAddDefault(variables, prefix + ".listen2", "${port2}"); - checkOrAddDefault(variables, prefix + ".listen3", "${port3}"); - checkOrAddDefault(variables, prefix + ".listen4", "${port4}"); - - checkOrAddDefault(variables, prefix + ".vhost1.servername", "${localhost}:${port1}"); - checkOrAddDefault(variables, prefix + ".vhost1.urls", "${" + prefix + ".vhost1.servername}"); - checkOrAddDefault(variables, prefix + ".vhost1.servername.directive", "ServerName ${" + prefix - + ".vhost1.servername}"); - - checkOrAddDefault(variables, prefix + ".vhost2.servername", "${localhost}:${port2}"); - checkOrAddDefault(variables, prefix + ".vhost2.urls", "${" + prefix + ".vhost2.servername}"); - checkOrAddDefault(variables, prefix + ".vhost2.servername.directive", "ServerName ${" + prefix - + ".vhost2.servername}"); - - checkOrAddDefault(variables, prefix + ".vhost3.servername", "${localhost}:${port3}"); - checkOrAddDefault(variables, prefix + ".vhost3.urls", "${" + prefix + ".vhost3.servername}"); - checkOrAddDefault(variables, prefix + ".vhost3.servername.directive", "ServerName ${" + prefix - + ".vhost3.servername}"); - - checkOrAddDefault(variables, prefix + ".vhost4.servername", "${localhost}:${port4}"); - checkOrAddDefault(variables, prefix + ".vhost4.urls", "${" + prefix + ".vhost4.servername}"); - checkOrAddDefault(variables, prefix + ".vhost4.servername.directive", "ServerName ${" + prefix - + ".vhost4.servername}"); + if (prefix != null && !prefix.trim().isEmpty()) { + prefix += "."; + } else { + prefix = ""; + } + + checkOrAddDefault(variables, prefix + "listen1", "${port1}"); + checkOrAddDefault(variables, prefix + "listen2", "${port2}"); + checkOrAddDefault(variables, prefix + "listen3", "${port3}"); + checkOrAddDefault(variables, prefix + "listen4", "${port4}"); + + checkOrAddDefault(variables, prefix + "vhost1.servername", "${localhost}:${port1}"); + checkOrAddDefault(variables, prefix + "vhost1.urls", "${" + prefix + "vhost1.servername}"); + checkOrAddDefault(variables, prefix + "vhost1.servername.directive", "ServerName ${" + prefix + + "vhost1.servername}"); + + checkOrAddDefault(variables, prefix + "vhost2.servername", "${localhost}:${port2}"); + checkOrAddDefault(variables, prefix + "vhost2.urls", "${" + prefix + "vhost2.servername}"); + checkOrAddDefault(variables, prefix + "vhost2.servername.directive", "ServerName ${" + prefix + + "vhost2.servername}"); + + checkOrAddDefault(variables, prefix + "vhost3.servername", "${localhost}:${port3}"); + checkOrAddDefault(variables, prefix + "vhost3.urls", "${" + prefix + "vhost3.servername}"); + checkOrAddDefault(variables, prefix + "vhost3.servername.directive", "ServerName ${" + prefix + + "vhost3.servername}"); + + checkOrAddDefault(variables, prefix + "vhost4.servername", "${localhost}:${port4}"); + checkOrAddDefault(variables, prefix + "vhost4.urls", "${" + prefix + "vhost4.servername}"); + checkOrAddDefault(variables, prefix + "vhost4.servername.directive", "ServerName ${" + prefix + + "vhost4.servername}"); } private static void checkOrAddDefault(Map<String, String> map, String key, String value) { @@ -234,12 +240,13 @@ public class ApacheDeploymentUtil { map.put(key, value); } } - - public static DeploymentConfig getDeploymentConfigurationFromSystemProperties(String variablesPrefix) { + + public static DeploymentConfig getDeploymentConfigurationFromSystemProperties(String variablesPrefix, Map<String, String> defaultOverrides) { DeploymentConfig ret = new DeploymentConfig(); - Map<String, String> properties = new TokenReplacingProperties(System.getProperties()); + TokenReplacingProperties properties = new TokenReplacingProperties(defaultOverrides); addDefaultVariables(properties, variablesPrefix); + properties.putAll(System.getProperties()); variablesPrefix += "."; diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory.xml deleted file mode 100644 index c3a82eb..0000000 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory.xml +++ /dev/null @@ -1,539 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<inventory-dump> -<classes-used> -<class>org.rhq.core.domain.resource.Resource</class> -</classes-used> -<objects> - -<resource> - <id>10004</id> - <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> - <resourceKey>${server.root}</resourceKey> - <name>${localhost} Apache 2.2.17 (${server.root}/)</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>true</connected> - <version>2.2.17</version> - <description>Apache Web Server</description> - <ctime>1307353451273</ctime> - <mtime>1307353509168</mtime> - <itime>1307353509168</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVER</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <description>an Apache HTTP Server instance</description> - <id>10013</id> - <name>Apache HTTP Server</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <id>10012</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>true</supportsManualAdd> - </resourceType> - <childResources> - <id>10022</id> - <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> - <resourceKey>${localhost}:0</resourceKey> - <name>Virtual Host ${localhost}:0</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587727</ctime> - <mtime>1307353587727</mtime> - <itime>1307353587721</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <id>10013</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10137</id> - <version>0</version> - <ctime>1307353587728</ctime> - <mtime>1307353587728</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10138</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587728</ctime> - <mtime>1307353587728</mtime> - <propertySimple> - <id>10690</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10689</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10692</id> - <name>url</name> - <override>false</override> - <stringValue>http://${localhost}:0/</stringValue> - </propertySimple> - <propertySimple> - <id>10693</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>1</stringValue> - </propertySimple> - <propertySimple> - <id>10691</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>DOWN</availabilityType> - </currentAvailability> - </childResources> - <childResources> - <id>10021</id> - <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> - <resourceKey>${vhost2.snmp.identifier}</resourceKey> - <name>Virtual Host ${vhost2.snmp.identifier}</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587648</ctime> - <mtime>1307353587648</mtime> - <itime>1307353587648</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <id>10013</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10135</id> - <version>0</version> - <ctime>1307353587666</ctime> - <mtime>1307353587666</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10136</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587667</ctime> - <mtime>1307353587667</mtime> - <propertySimple> - <id>10685</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10684</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>${server.root}/logs/127.0.0.111676_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10687</id> - <name>url</name> - <override>false</override> - <stringValue>http://${vhost2.snmp.identifier}/</stringValue> - </propertySimple> - <propertySimple> - <id>10688</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>4</stringValue> - </propertySimple> - <propertySimple> - <id>10686</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - </childResources> - <childResources> - <id>10023</id> - <uuid>c62c5d75-81dd-4b14-a768-2d8c1fca6c88</uuid> - <resourceKey>${vhost3.snmp.identifier}</resourceKey> - <name>Virtual Host ${vhost3.snmp.identifier}</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587738</ctime> - <mtime>1307353587738</mtime> - <itime>1307353587737</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <id>10013</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10139</id> - <version>0</version> - <ctime>1307353587738</ctime> - <mtime>1307353587738</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10140</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587738</ctime> - <mtime>1307353587738</mtime> - <propertySimple> - <id>10695</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10694</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>${server.root}/logs/127.0.0.111677_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10697</id> - <name>url</name> - <override>false</override> - <stringValue>http://${vhost3.snmp.identifier}/</stringValue> - </propertySimple> - <propertySimple> - <id>10698</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>3</stringValue> - </propertySimple> - <propertySimple> - <id>10696</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - </childResources> - <childResources> - <id>10024</id> - <uuid>d1b59168-8666-4bc0-957e-171bf16eec73</uuid> - <resourceKey>${vhost1.snmp.identifier}</resourceKey> - <name>Virtual Host ${vhost1.snmp.identifier}</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587751</ctime> - <mtime>1307353587751</mtime> - <itime>1307353587750</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <id>10013</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10171</id> - <version>0</version> - <ctime>1307353587751</ctime> - <mtime>1307353587751</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10172</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587751</ctime> - <mtime>1307353587751</mtime> - <propertySimple> - <id>10700</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10699</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10702</id> - <name>url</name> - <override>false</override> - <stringValue>http://${vhost1.snmp.identifier}/</stringValue> - </propertySimple> - <propertySimple> - <id>10703</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>5</stringValue> - </propertySimple> - <propertySimple> - <id>10701</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - </childResources> - <childResources> - <id>10025</id> - <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> - <resourceKey>${vhost4.snmp.identifier}</resourceKey> - <name>Virtual Host ${vhost4.snmp.identifier}</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587761</ctime> - <mtime>1307353587761</mtime> - <itime>1307353587760</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <id>10013</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10173</id> - <version>0</version> - <ctime>1307353587761</ctime> - <mtime>1307353587761</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10174</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587761</ctime> - <mtime>1307353587761</mtime> - <propertySimple> - <id>10705</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10704</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10707</id> - <name>url</name> - <override>false</override> - <stringValue>http://${vhost4.snmp.identifier}/</stringValue> - </propertySimple> - <propertySimple> - <id>10708</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>2</stringValue> - </propertySimple> - <propertySimple> - <id>10706</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - </childResources> - <resourceConfiguration> - <id>10142</id> - <version>0</version> - <ctime>1307353451273</ctime> - <mtime>1307353451273</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10073</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353737118</ctime> - <mtime>1307353737118</mtime> - <propertySimple> - <id>10365</id> - <name>errorLogMinimumSeverity</name> - <override>false</override> - <stringValue>error</stringValue> - </propertySimple> - <propertySimple> - <id>10366</id> - <name>errorLogIncludesPattern</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10367</id> - <name>snmpAgentCommunity</name> - <override>false</override> - <stringValue>public</stringValue> - </propertySimple> - <propertySimple> - <id>10368</id> - <name>errorLogFilePath</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10369</id> - <name>errorLogEventsEnabled</name> - <override>false</override> - <stringValue>false</stringValue> - </propertySimple> - <propertySimple> - <id>10370</id> - <name>snmpAgentHost</name> - <override>false</override> - <stringValue>127.0.0.1</stringValue> - </propertySimple> - <propertySimple> - <id>10713</id> - <name>controlScriptPath</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10714</id> - <name>url</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10364</id> - <name>configFile</name> - <override>false</override> - <stringValue>conf/httpd.conf</stringValue> - </propertySimple> - <propertySimple> - <id>10711</id> - <name>executablePath</name> - <override>false</override> - <stringValue>${exe.path}</stringValue> - </propertySimple> - <propertySimple> - <id>10712</id> - <name>snmpAgentPort</name> - <override>false</override> - <stringValue>1610</stringValue> - </propertySimple> - <propertySimple> - <id>10715</id> - <name>serverRoot</name> - <override>false</override> - <stringValue>${server.root}</stringValue> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - <productVersion> - <id>10003</id> - </productVersion> -</resource> -</objects> -</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory.xml new file mode 100644 index 0000000..1aa8b38 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory.xml @@ -0,0 +1,539 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10021</id> + <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> + <resourceKey>${vhost2.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587648</ctime> + <mtime>1307353587648</mtime> + <itime>1307353587648</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10135</id> + <version>0</version> + <ctime>1307353587666</ctime> + <mtime>1307353587666</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10136</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587667</ctime> + <mtime>1307353587667</mtime> + <propertySimple> + <id>10685</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10684</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10687</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10688</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>4</stringValue> + </propertySimple> + <propertySimple> + <id>10686</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10023</id> + <uuid>c62c5d75-81dd-4b14-a768-2d8c1fca6c88</uuid> + <resourceKey>${vhost3.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <itime>1307353587737</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10139</id> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10140</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <propertySimple> + <id>10695</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10694</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10697</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10698</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>3</stringValue> + </propertySimple> + <propertySimple> + <id>10696</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10024</id> + <uuid>d1b59168-8666-4bc0-957e-171bf16eec73</uuid> + <resourceKey>${vhost1.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost1.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <itime>1307353587750</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10171</id> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10172</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <propertySimple> + <id>10700</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10699</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10702</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost1.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10703</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>5</stringValue> + </propertySimple> + <propertySimple> + <id>10701</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>${vhost4.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>127.0.0.1</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingProperties.java b/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingProperties.java index 9e359cb..0b9e87d 100644 --- a/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingProperties.java +++ b/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingProperties.java @@ -136,8 +136,7 @@ public class TokenReplacingProperties extends HashMap<String, String> { @SuppressWarnings("unchecked") public TokenReplacingProperties(Properties properties) { @SuppressWarnings("rawtypes") - Map map = (Map<Object, Object>) properties; - + Map map = properties; this.wrapped = (Map<String, String>) map; } @@ -186,6 +185,12 @@ public class TokenReplacingProperties extends HashMap<String, String> { wrapped.putAll(m); } + public void putAll(Properties properties) { + for(String propName : properties.stringPropertyNames()) { + put(propName, properties.getProperty(propName)); + } + } + @Override public void clear() { wrapped.clear(); commit baa0518946919469e26fb92f32510428e49aece8 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Tue Jun 21 14:46:47 2011 +0200 An attempt to test the support for Apache 1.3, TokenReplacingMap renamed to TokenReplacingProperties and moved to test-utils - it's a generic reusable class. diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index ebfc749..65d1bb2 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -246,20 +246,25 @@ <apache1.install.dir>PASS THIS IN FROM THE COMMAND LINE</apache1.install.dir> <apache1.exe.path>bin/httpd</apache1.exe.path> - <port1></port1> - <port2></port2> - <port3></port3> - <port4></port4> - <localhost></localhost> - <unresolvable.host></unresolvable.host> - +  +  +   - - <simpleWithResolvableServerNames.server.root>${apache2.install.dir}</simpleWithResolvableServerNames.server.root> + --> </systemPropertyVariables> </configuration> diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java new file mode 100644 index 0000000..b196654 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java @@ -0,0 +1,148 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.testng.annotations.Parameters; +import org.testng.annotations.Test; + +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; +import org.rhq.test.pc.PluginContainerSetup; + +/** + * + * + * @author Lukas Krejci + */ +@Test(groups = "apache-integration-tests") +public class UpgradeSimpleConfigurationWithResolvableServerNamesTest extends UpgradeTestBase { + private static final Log LOG = LogFactory.getLog(UpgradeSimpleConfigurationWithResolvableServerNamesTest.class); + + private enum Apache { + V_1_3_x{ + public String getConfigDirName() { + return "1.3.x"; + } + }, + + V_2_2_x { + public String getConfigDirName() { + return "2.2.x"; + } + }; + + public abstract String getConfigDirName(); + } + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testSimpleConfigurationWithResolvableServerNames_Apache2_upgradeFromRHQ1_3( + String apacheInstallationDirectory, String exePath) throws Throwable { + + testUpgradeFromRHQ1_3(Apache.V_2_2_x, DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES, apacheInstallationDirectory, exePath); + } + + @Test(enabled = false) //ApacheServerOperationsDelegate doesn't work with apache 1.3 + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache1.install.dir", "apache1.exe.path" }) + public void testSimpleConfigurationWithResolvableServerNames_Apache1_upgradeFromRHQ1_3( + String apacheInstallationDirectory, String exePath) throws Throwable { + + testUpgradeFromRHQ1_3(Apache.V_1_3_x, DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES, apacheInstallationDirectory, exePath); + } + + private void testUpgradeFromRHQ1_3(Apache version, String configurationName, String serverRoot, String binPath) throws Throwable { + final TestSetup setup = new TestSetup(configurationName); + boolean testFailed = false; + try { + + String configPath = "/full-configurations/" + version.getConfigDirName() + "/simple/httpd.conf"; + + setup.withInventoryFrom("/mocked-inventories/rhq-1.3.x/includes/inventory.xml") + .withPlatformResource(platform).withDefaultExpectations().withApacheSetup() + .withConfigurationFiles(configPath, "/snmpd.conf", "/mime.types") + .withServerRoot(serverRoot).withExePath(binPath).setup(); + + startConfiguredPluginContainer(); + + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); + + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(serverRoot, serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), 5, "There should be 5 vhosts discovered but found " + vhosts.size()); + + List<String> expectedResourceKeys = new ArrayList<String>(5); + + DeploymentConfig dc = setup.getDeploymentConfig(); + + expectedResourceKeys.add(ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost1.getServerName(), dc.vhost1.getAddresses())); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost2.getServerName(), dc.vhost2.getAddresses())); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost3.getServerName(), dc.vhost3.getAddresses())); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost4.getServerName(), dc.vhost4.getAddresses())); + + for (Resource vhost : vhosts) { + assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), + "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'."); + } + } catch (Throwable t) { + testFailed = true; + throw t; + } finally { + try { + setup.withApacheSetup().getExecutionUtil().invokeOperation("stop"); + } catch (Exception e) { + if (testFailed) { + LOG.error("Failed to stop apache.", e); + } else { + throw e; + } + } + } + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java deleted file mode 100644 index 056fead..0000000 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.plugins.apache; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -import org.testng.annotations.Parameters; -import org.testng.annotations.Test; - -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; -import org.rhq.test.pc.PluginContainerSetup; - -/** - * - * - * @author Lukas Krejci - */ -@Test(groups = "apache-integration-tests") -public class UpgradeTest extends UpgradeTestBase { - - @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) - @Parameters({ "apache2.install.dir", "apache2.exe.path" }) - public void testSimpleConfigurationWithResolvableServerNames_Apache2_upgradeFromRHQ1_3( - String apacheInstallationDirectory, String exePath) throws Exception { - - final TestSetup setup = new TestSetup(DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES) - .withInventoryFrom("/mocked-inventories/rhq-1.3.x/includes/inventory.xml").withPlatformResource(platform) - .withDefaultExpectations().withApacheSetup() - .withConfigurationFiles("/full-configurations/simple/httpd.conf", "/snmpd.conf", "/mime.types") - .withServerRoot(apacheInstallationDirectory).withExePath(exePath).setup(); - - startConfiguredPluginContainer(); - - //ok, now we should see the resources upgraded in the fake server inventory. - ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); - ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); - - Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); - - assertTrue(servers.size() == 1, "There should be exactly one apache server discovered."); - - Resource server = servers.iterator().next(); - - String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(apacheInstallationDirectory, - apacheInstallationDirectory + "/conf/httpd.conf"); - - assertEquals(server.getResourceKey(), expectedResourceKey, - "The server resource key doesn't seem to be upgraded."); - - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); - - assertTrue(vhosts.size() == 5, "There should be 5 vhosts discovered but found " + vhosts.size()); - - List<String> expectedResourceKeys = new ArrayList<String>(5); - - DeploymentConfig dc = setup.getDeploymentConfig(); - - expectedResourceKeys.add(ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey(dc.vhost1.getServerName(), dc.vhost1.getAddresses())); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey(dc.vhost2.getServerName(), dc.vhost2.getAddresses())); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey(dc.vhost3.getServerName(), dc.vhost3.getAddresses())); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey(dc.vhost4.getServerName(), dc.vhost4.getAddresses())); - - for(Resource vhost : vhosts) { - assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'."); - } - } -} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java index 2c6f4f2..e44dc99 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java @@ -88,13 +88,16 @@ public class UpgradeTestBase extends PluginContainerTest { private Collection<String> configurationFiles; private ApacheExecutionUtil execution; private boolean deploy = true; - + private ApacheSetup() { } public ApacheSetup withServerRoot(String serverRoot) { this.serverRoot = serverRoot; + //auto-define the server root property as if it was passed on the commandline + System.getProperties().put(configurationName + ".server.root", serverRoot); + deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName); return this; } @@ -166,7 +169,7 @@ public class UpgradeTestBase extends PluginContainerTest { private void doSetup() throws Exception { init(); - execution.invokeOperation("restart", "start"); + execution.invokeOperation("start"); } public TestSetup setup() throws Exception { @@ -252,7 +255,7 @@ public class UpgradeTestBase extends PluginContainerTest { public TestSetup setup() throws Exception { apacheSetup.doSetup(); - Map<String, String> replacements = deploymentConfig.getTokenReplacements(); + Map<String, String> replacements = deploymentConfig.getTokenReplacements(); replacements.put("server.root", apacheSetup.serverRoot); replacements.put("exe.path", apacheSetup.exePath); replacements.put("localhost", determineLocalhost()); @@ -351,18 +354,6 @@ public class UpgradeTestBase extends PluginContainerTest { platform = discoverPlatform(); } - @AfterClass - @Parameters({ "apache2.install.dir", "apache2.exe.path" }) - public void shutdownApache(String apacheInstallationDirectory, String exePath) throws Exception { - - //it really doesn't matter which configuration i use here - TestSetup.ApacheSetup apacheSetup = new TestSetup(DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES) - .withApacheSetup().withServerRoot(apacheInstallationDirectory).withExePath(exePath) - .withNoDeploymentOnSetup(); - apacheSetup.init(); - apacheSetup.getExecutionUtil().invokeOperation("stop"); - } - protected ResourceType findApachePluginResourceTypeByName(String resourceTypeName) { for (ResourceType rt : resourceTypesInApachePlugin) { if (resourceTypeName.equals(rt.getName())) { diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java index 3db6181..59e5d7e 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java @@ -19,30 +19,25 @@ package org.rhq.plugins.apache.util; -import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; -import java.io.Reader; -import java.io.StringReader; import java.net.InetAddress; import java.net.URL; import java.net.UnknownHostException; -import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Collection; -import java.util.Deque; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.unitils.thirdparty.org.apache.commons.io.FileUtils; import org.rhq.plugins.apache.util.HttpdAddressUtility.Address; +import org.rhq.test.TokenReplacingProperties; import org.rhq.test.TokenReplacingReader; /** @@ -53,7 +48,7 @@ import org.rhq.test.TokenReplacingReader; public class ApacheDeploymentUtil { private static final Log LOG = LogFactory.getLog(ApacheDeploymentUtil.class); - + private static final String VHOST = "vhost"; private static final String SERVER_ROOT = "server.root"; private static final String ADDITIONAL_DIRECTIVES = "additional.directives"; @@ -67,11 +62,11 @@ public class ApacheDeploymentUtil { private static final String SNMP_HOST = "snmp.host"; private static final String DOCUMENT_ROOT = "document.root"; private static final String URLS = "urls"; - + private ApacheDeploymentUtil() { - + } - + public static class DeploymentConfig { public static class VHost { public Address address1 = new Address(null, null, Address.NO_PORT_SPECIFIED_VALUE); @@ -80,7 +75,7 @@ public class ApacheDeploymentUtil { public Address address4 = null; public String serverNameDirective = null; public final List<String> additionalDirectives = new ArrayList<String>(); - + public String getServerName() { String serverName = null; if (serverNameDirective != null && serverNameDirective.startsWith("ServerName")) { @@ -89,15 +84,15 @@ public class ApacheDeploymentUtil { while (serverNameDirective.charAt(startIdx) == ' ') { ++startIdx; } - + serverName = serverNameDirective.substring(startIdx); serverName = serverName.trim(); } } - + return serverName; } - + public List<String> getAddresses() { ArrayList<String> ret = new ArrayList<String>(); if (address1 != null) { @@ -112,36 +107,37 @@ public class ApacheDeploymentUtil { if (address4 != null) { ret.add(address4.toString()); } - + return ret; } - + private void addToTokenReplacements(int ordinal, Map<String, String> tokenReplacements) { String prefix = null; - + if (ordinal == 0) { - prefix = ""; + prefix = ""; } else { - prefix = VHOST + ordinal + "."; + prefix = VHOST + ordinal + "."; } - - tokenReplacements.put(prefix + SERVERNAME_DIRECTIVE, serverNameDirective == null ? "" : serverNameDirective); - + + tokenReplacements.put(prefix + SERVERNAME_DIRECTIVE, serverNameDirective == null ? "" + : serverNameDirective); + String serverName = getServerName(); if (serverName != null) { tokenReplacements.put(prefix + SERVERNAME, serverName); } - + String dirs = ""; if (!additionalDirectives.isEmpty()) { String newline = System.getProperty("line.separator"); - for(String dir : additionalDirectives) { + for (String dir : additionalDirectives) { dirs += dir + newline; - } + } } tokenReplacements.put(prefix + ADDITIONAL_DIRECTIVES, dirs); - + if (ordinal != 0) { String urls = address1.toString(false, false); if (address2 != null) { @@ -153,7 +149,7 @@ public class ApacheDeploymentUtil { if (address4 != null) { urls += " " + address4.toString(false, false); } - + tokenReplacements.put(prefix + URLS, urls); } else { tokenReplacements.put(LISTEN1, address1 == null ? "" : address1.toString(false, false)); @@ -163,7 +159,7 @@ public class ApacheDeploymentUtil { } } } - + public String serverRoot = null; public String documentRoot = "hdocs"; public String snmpHost = "localhost"; @@ -173,16 +169,16 @@ public class ApacheDeploymentUtil { public final VHost vhost2 = new VHost(); public final VHost vhost3 = new VHost(); public final VHost vhost4 = new VHost(); - + { mainServer.address2 = new Address(null, null, Address.NO_PORT_SPECIFIED_VALUE); mainServer.address3 = new Address(null, null, Address.NO_PORT_SPECIFIED_VALUE); mainServer.address4 = new Address(null, null, Address.NO_PORT_SPECIFIED_VALUE); } - + public Map<String, String> getTokenReplacements() { HashMap<String, String> ret = new HashMap<String, String>(); - + ret.put(SERVER_ROOT, serverRoot == null ? "" : serverRoot); ret.put(DOCUMENT_ROOT, documentRoot == null ? "" : documentRoot); ret.put(SNMP_HOST, snmpHost == null ? "" : snmpHost); @@ -191,60 +187,65 @@ public class ApacheDeploymentUtil { vhost1.addToTokenReplacements(1, ret); vhost2.addToTokenReplacements(2, ret); vhost3.addToTokenReplacements(3, ret); - vhost4.addToTokenReplacements(4, ret); - + vhost4.addToTokenReplacements(4, ret); + return ret; } } - + public static void addDefaultVariables(Map<String, String> variables, String prefix) { - String localhost = determineLocalhost(); - checkOrAddDefault(variables, "localhost", localhost); + InetAddress localhost = determineLocalhost(); + checkOrAddDefault(variables, "localhost", localhost.getHostName()); + checkOrAddDefault(variables, "localhost.ip", localhost.getHostAddress()); checkOrAddDefault(variables, "unresolvable.host", "unreachable.host.com"); checkOrAddDefault(variables, "port1", "11675"); checkOrAddDefault(variables, "port2", "11676"); checkOrAddDefault(variables, "port3", "11677"); checkOrAddDefault(variables, "port4", "11678"); - + checkOrAddDefault(variables, prefix + ".listen1", "${port1}"); checkOrAddDefault(variables, prefix + ".listen2", "${port2}"); checkOrAddDefault(variables, prefix + ".listen3", "${port3}"); checkOrAddDefault(variables, prefix + ".listen4", "${port4}"); - + checkOrAddDefault(variables, prefix + ".vhost1.servername", "${localhost}:${port1}"); checkOrAddDefault(variables, prefix + ".vhost1.urls", "${" + prefix + ".vhost1.servername}"); - checkOrAddDefault(variables, prefix + ".vhost1.servername.directive", "ServerName ${" + prefix + ".vhost1.servername}"); - + checkOrAddDefault(variables, prefix + ".vhost1.servername.directive", "ServerName ${" + prefix + + ".vhost1.servername}"); + checkOrAddDefault(variables, prefix + ".vhost2.servername", "${localhost}:${port2}"); checkOrAddDefault(variables, prefix + ".vhost2.urls", "${" + prefix + ".vhost2.servername}"); - checkOrAddDefault(variables, prefix + ".vhost2.servername.directive", "ServerName ${" + prefix + ".vhost2.servername}"); - + checkOrAddDefault(variables, prefix + ".vhost2.servername.directive", "ServerName ${" + prefix + + ".vhost2.servername}"); + checkOrAddDefault(variables, prefix + ".vhost3.servername", "${localhost}:${port3}"); checkOrAddDefault(variables, prefix + ".vhost3.urls", "${" + prefix + ".vhost3.servername}"); - checkOrAddDefault(variables, prefix + ".vhost3.servername.directive", "ServerName ${" + prefix + ".vhost3.servername}"); - + checkOrAddDefault(variables, prefix + ".vhost3.servername.directive", "ServerName ${" + prefix + + ".vhost3.servername}"); + checkOrAddDefault(variables, prefix + ".vhost4.servername", "${localhost}:${port4}"); checkOrAddDefault(variables, prefix + ".vhost4.urls", "${" + prefix + ".vhost4.servername}"); - checkOrAddDefault(variables, prefix + ".vhost4.servername.directive", "ServerName ${" + prefix + ".vhost4.servername}"); + checkOrAddDefault(variables, prefix + ".vhost4.servername.directive", "ServerName ${" + prefix + + ".vhost4.servername}"); } - + private static void checkOrAddDefault(Map<String, String> map, String key, String value) { if (!map.containsKey(key)) { map.put(key, value); } } - + public static DeploymentConfig getDeploymentConfigurationFromSystemProperties(String variablesPrefix) { DeploymentConfig ret = new DeploymentConfig(); - - Map<String, String> properties = new TokenReplacingMap(System.getProperties()); + + Map<String, String> properties = new TokenReplacingProperties(System.getProperties()); addDefaultVariables(properties, variablesPrefix); - + variablesPrefix += "."; - + ret.serverRoot = properties.get(variablesPrefix + SERVER_ROOT); ret.documentRoot = properties.get(variablesPrefix + DOCUMENT_ROOT); - ret.documentRoot = ret.documentRoot == null ? "htdocs" : ret.documentRoot; + ret.documentRoot = ret.documentRoot == null ? "htdocs" : ret.documentRoot; ret.snmpHost = properties.get(variablesPrefix + SNMP_HOST); ret.snmpHost = ret.snmpHost == null ? "localhost" : ret.snmpHost; String snmpPort = properties.get(variablesPrefix + SNMP_PORT); @@ -255,10 +256,10 @@ public class ApacheDeploymentUtil { ret.mainServer.address3 = HttpdAddressUtility.parseListen(properties.get(variablesPrefix + LISTEN3)); ret.mainServer.address4 = HttpdAddressUtility.parseListen(properties.get(variablesPrefix + LISTEN4)); ret.mainServer.serverNameDirective = properties.get(variablesPrefix + SERVERNAME_DIRECTIVE); - + String additionalDirectives = properties.get(variablesPrefix + ADDITIONAL_DIRECTIVES); fillAdditionalDirectives(additionalDirectives, ret.mainServer.additionalDirectives); - + readVHostConfigFromProperties(ret.vhost1, variablesPrefix + VHOST + 1, properties); readVHostConfigFromProperties(ret.vhost2, variablesPrefix + VHOST + 2, properties); readVHostConfigFromProperties(ret.vhost3, variablesPrefix + VHOST + 3, properties); @@ -266,68 +267,71 @@ public class ApacheDeploymentUtil { return ret; } - - public static void deployConfiguration(File targetConfDirectory, Collection<String> configFilesOnClasspath, DeploymentConfig config) throws IOException { + + public static void deployConfiguration(File targetConfDirectory, Collection<String> configFilesOnClasspath, + DeploymentConfig config) throws IOException { List<File> targetFiles = new ArrayList<File>(); - for(String fileOnClassPath : configFilesOnClasspath) { + for (String fileOnClassPath : configFilesOnClasspath) { String fileName = new File(fileOnClassPath).getName(); - + File targetFile = new File(targetConfDirectory, fileName); - + URL fileUrl = ApacheDeploymentUtil.class.getResource(fileOnClassPath); - + FileUtils.copyURLToFile(fileUrl, targetFile); - + targetFiles.add(targetFile); } - + replaceTokensInConfigFiles(targetFiles, config); } - + private static void replaceTokensInConfigFiles(List<File> configFiles, DeploymentConfig config) { char[] buffer = new char[8192]; - + Map<String, String> replacements = config.getTokenReplacements(); - - for(File file : configFiles) { + + for (File file : configFiles) { TokenReplacingReader rdr = null; FileWriter wrt = null; - + try { - rdr = new TokenReplacingReader(new FileReader(file), replacements); - - File tmp = File.createTempFile("apache-deployment-util", null); - - wrt = new FileWriter(tmp); - - int cnt = -1; - - while ((cnt = rdr.read(buffer)) != -1) { - wrt.write(buffer, 0, cnt); - } - - wrt.close(); - - tmp.renameTo(file); + rdr = new TokenReplacingReader(new FileReader(file), replacements); + + File tmp = File.createTempFile("apache-deployment-util", null); + + wrt = new FileWriter(tmp); + + int cnt = -1; + + while ((cnt = rdr.read(buffer)) != -1) { + wrt.write(buffer, 0, cnt); + } + + wrt.close(); + + tmp.renameTo(file); } catch (IOException e) { LOG.error("Error while replacing the tokens in file '" + file + "'.", e); } } } - private static void readVHostConfigFromProperties(DeploymentConfig.VHost vhost, String prefix, Map<String, String> properties) { + private static void readVHostConfigFromProperties(DeploymentConfig.VHost vhost, String prefix, + Map<String, String> properties) { prefix += "."; - + String addrsString = properties.get(prefix + URLS); - + if (addrsString == null) { - throw new IllegalStateException("The system property '" + prefix + "urls' doesn't exist. It is needed to define the vhost."); + throw new IllegalStateException("The system property '" + prefix + + "urls' doesn't exist. It is needed to define the vhost."); } - + String[] addrs = addrsString.split("[ \t]+"); - + //the fallthroughs below are intentional - switch(addrs.length) { + switch (addrs.length) { case 4: vhost.address4 = Address.parse(addrs[3], null); case 3: @@ -338,138 +342,34 @@ public class ApacheDeploymentUtil { vhost.address1 = Address.parse(addrs[0], null); break; default: - throw new IllegalStateException("The system property '" + prefix + "urls' specified " + addrs.length + " addresses. Only 1-4 addresses are supported."); + throw new IllegalStateException("The system property '" + prefix + "urls' specified " + addrs.length + + " addresses. Only 1-4 addresses are supported."); } - + vhost.serverNameDirective = properties.get(prefix + SERVERNAME_DIRECTIVE); - + String additionalDirectives = properties.get(prefix + ADDITIONAL_DIRECTIVES); fillAdditionalDirectives(additionalDirectives, vhost.additionalDirectives); } - + private static void fillAdditionalDirectives(String additionalDirectivesString, List<String> additionalDirectives) { if (additionalDirectivesString != null) { - for(String dir : additionalDirectivesString.split("\\n")) { + for (String dir : additionalDirectivesString.split("\\n")) { additionalDirectives.add(dir); } } } - - private static String determineLocalhost() { + + private static InetAddress determineLocalhost() { try { - return InetAddress.getLocalHost().getCanonicalHostName(); + return InetAddress.getLocalHost(); } catch (UnknownHostException e) { - return "127.0.0.1"; - } - } - - private static class TokenReplacingMap extends HashMap<String, String> { - private static final long serialVersionUID = 1L; - - @SuppressWarnings("rawtypes") - private Map wrapped; - private Deque<String> currentResolutionStack = new ArrayDeque<String>(); - private Map<Object, String> resolved = new HashMap<Object, String>(); - - public TokenReplacingMap(Map<?, ?> wrapped) { - this.wrapped = wrapped; - } - - @Override - public String get(Object key) { - return get((String) key); - } - - public String get(String key) { - if (resolved.containsKey(key)) { - return resolved.get(key); - } - - if (currentResolutionStack.contains(key)) { - throw new IllegalArgumentException("Property '" + key + "' indirectly references itself in its value."); - } - - Object rawValue = wrapped.get(key); - - if (rawValue == null) { - return null; - } - - currentResolutionStack.push(key); - - String ret = readAll(new TokenReplacingReader(new StringReader(rawValue.toString()), this)); - - currentResolutionStack.pop(); - - resolved.put(key, ret); - - return ret; - } - - @Override - public String put(String key, String value) { - return (String) wrapped.put(key, value); - } - - @Override - public void putAll(Map<? extends String, ? extends String> m) { - wrapped.putAll(m); - } - - @Override - public void clear() { - wrapped.clear(); - resolved.clear(); - } - - @Override - public boolean containsKey(Object key) { - return wrapped.containsKey(key); - } - - @Override - public Set<String> keySet() { - return (Set<String>) wrapped.keySet(); - } - - @Override - public boolean containsValue(Object value) { - return wrapped.containsValue(value); - } - - @Override - public Set<Map.Entry<String, String>> entrySet() { - throw new UnsupportedOperationException(); - } - - @Override - public String remove(Object key) { - resolved.remove(key); - return wrapped.remove(key).toString(); - } - - @Override - public int size() { - return wrapped.size(); - } - - @Override - public Collection<String> values() { - throw new UnsupportedOperationException(); - } - - private String readAll(Reader rdr) { - int in = -1; - StringBuilder bld = new StringBuilder(); try { - while((in = rdr.read()) != -1) { - bld.append((char) in); - } - } catch (IOException e) { - throw new IllegalStateException("Exception while reading a string.", e); + return InetAddress.getByName("127.0.0.1"); + } catch (UnknownHostException u) { + //doesn't happen + return null; } - - return bld.toString(); } }; } diff --git a/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/includes/1.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/includes/1.vhost.conf new file mode 100644 index 0000000..7b56cae --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/includes/1.vhost.conf @@ -0,0 +1,9 @@ +<VirtualHost ${vhost1.urls}> + ${vhost1.servername.directive} + ${vhost1.additional.directives} +</VirtualHost> + +<VirtualHost ${vhost2.urls}> + ${vhost2.servername.directive} + ${vhost2.additional.directives} +</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/includes/2.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/includes/2.vhost.conf new file mode 100644 index 0000000..b4a7725 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/includes/2.vhost.conf @@ -0,0 +1,9 @@ +<VirtualHost ${vhost3.urls}> + ${vhost3.servername.directive} + ${vhost3.additional.directives} +</VirtualHost> + +<VirtualHost ${vhost4.urls}> + ${vhost4.servername.directive} + ${vhost4.additional.directives} +</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/includes/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/includes/httpd.conf new file mode 100644 index 0000000..ebc07ac --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/includes/httpd.conf @@ -0,0 +1,40 @@ +ServerRoot ${server.root} + +Listen ${listen1} +Listen ${listen2} +Listen ${listen3} +Listen ${listen4} + +ServerAdmin root@localhost + +${servername.directive} + +DocumentRoot ${document.root} + +DirectoryIndex index.html index.html.var + +TypesConfig conf/mime.types + +DefaultType text/plain + +ErrorLog logs/error_log + +LogLevel debug + +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent + +CustomLog logs/access_log combined + +# Apache SNMP +LoadModule snmpcommon_module modules/libsnmpcommon.so +LoadModule snmpagt_module modules/libsnmpmonagt.so +SNMPConf conf +SNMPVar var +# End of apache SNMP + +${additional.directives} + +Include *.vhost.conf diff --git a/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/mess/1.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/mess/1.vhost.conf new file mode 100644 index 0000000..39cf84a --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/mess/1.vhost.conf @@ -0,0 +1,17 @@ +<IfModule not_loaded_module> + <VirtualHost ${vhost1.urls}> + ${vhost1.servername.directive} + ${vhost1.additional.directives} + </VirtualHost> +</IfModule> + +LoadModule proxy_module modules/mod_proxy.so + +<IfModule snmpcommon_module> +<IfModule mod_proxy.c> + <VirtualHost ${vhost2.urls}> + ${vhost2.servername.directive} + ${vhost2.additional.directives} + </VirtualHost> +</IfModule> +</IfModule> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/mess/2.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/mess/2.vhost.conf new file mode 100644 index 0000000..37854b6 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/mess/2.vhost.conf @@ -0,0 +1,13 @@ +<IfModule snmpcommon_module> +<IfModule mod_unknown.c> + <VirtualHost ${vhost3.urls}> + ${vhost3.servername.directive} + ${vhost3.additional.directives} + </VirtualHost> +</IfModule> +</IfModule> + +<VirtualHost ${vhost4.urls}> + ${vhost4.servername.directive} + ${vhost4.additional.directives} +</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/mess/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/mess/httpd.conf new file mode 100644 index 0000000..ebc07ac --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/mess/httpd.conf @@ -0,0 +1,40 @@ +ServerRoot ${server.root} + +Listen ${listen1} +Listen ${listen2} +Listen ${listen3} +Listen ${listen4} + +ServerAdmin root@localhost + +${servername.directive} + +DocumentRoot ${document.root} + +DirectoryIndex index.html index.html.var + +TypesConfig conf/mime.types + +DefaultType text/plain + +ErrorLog logs/error_log + +LogLevel debug + +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent + +CustomLog logs/access_log combined + +# Apache SNMP +LoadModule snmpcommon_module modules/libsnmpcommon.so +LoadModule snmpagt_module modules/libsnmpmonagt.so +SNMPConf conf +SNMPVar var +# End of apache SNMP + +${additional.directives} + +Include *.vhost.conf diff --git a/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/nested/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/nested/httpd.conf new file mode 100644 index 0000000..6112bdc --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/nested/httpd.conf @@ -0,0 +1,68 @@ +ServerRoot ${server.root} + +Listen ${listen1} +Listen ${listen2} +Listen ${listen3} +Listen ${listen4} + +ServerAdmin root@localhost + +${servername.directive} + +DocumentRoot ${document.root} + +DirectoryIndex index.html index.html.var + +TypesConfig conf/mime.types + +DefaultType text/plain + +ErrorLog logs/error_log + +LogLevel debug + +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent + +CustomLog logs/access_log combined + +# Apache SNMP +LoadModule snmpcommon_module modules/libsnmpcommon.so +LoadModule snmpagt_module modules/libsnmpmonagt.so +SNMPConf conf +SNMPVar var +# End of apache SNMP + +${additional.directives} + +<IfModule not_loaded_module> + <VirtualHost ${vhost1.urls}> + ${vhost1.servername.directive} + ${vhost1.additional.directives} + </VirtualHost> +</IfModule> + +LoadModule proxy_module modules/mod_proxy.so + +<IfModule snmpcommon_module> +<IfModule mod_proxy.c> + <VirtualHost ${vhost2.urls}> + ${vhost2.servername.directive} + ${vhost2.additional.directives} + </VirtualHost> +</IfModule> + +<IfModule mod_unknown.c> + <VirtualHost ${vhost3.urls}> + ${vhost3.servername.directive} + ${vhost3.additional.directives} + </VirtualHost> +</IfModule> +</IfModule> + +<VirtualHost ${vhost4.urls}> + ${vhost4.servername.directive} + ${vhost4.additional.directives} +</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/simple/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/simple/httpd.conf new file mode 100644 index 0000000..f14b48e --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/1.3.x/simple/httpd.conf @@ -0,0 +1,47 @@ +ServerRoot ${server.root} + +Listen ${listen1} +Listen ${listen2} +Listen ${listen3} +Listen ${listen4} + +ServerAdmin root@localhost + +${servername.directive} + +DocumentRoot ${document.root} + +DefaultType text/plain + +ErrorLog logs/error_log + +LogLevel debug + +# Apache SNMP +#LoadModule snmp_agt_module libexec/libsnmp_agt.so +#AddModule covalent-snmp-v13.c +#SNMPConf conf +#SNMPVar var +# End of apache SNMP + +${additional.directives} + +<VirtualHost ${vhost1.urls}> + ${vhost1.servername.directive} + ${vhost1.additional.directives} +</VirtualHost> + +<VirtualHost ${vhost2.urls}> + ${vhost2.servername.directive} + ${vhost2.additional.directives} +</VirtualHost> + +<VirtualHost ${vhost3.urls}> + ${vhost3.servername.directive} + ${vhost3.additional.directives} +</VirtualHost> + +<VirtualHost ${vhost4.urls}> + ${vhost4.servername.directive} + ${vhost4.additional.directives} +</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/1.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/1.vhost.conf new file mode 100644 index 0000000..7b56cae --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/1.vhost.conf @@ -0,0 +1,9 @@ +<VirtualHost ${vhost1.urls}> + ${vhost1.servername.directive} + ${vhost1.additional.directives} +</VirtualHost> + +<VirtualHost ${vhost2.urls}> + ${vhost2.servername.directive} + ${vhost2.additional.directives} +</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/2.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/2.vhost.conf new file mode 100644 index 0000000..b4a7725 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/2.vhost.conf @@ -0,0 +1,9 @@ +<VirtualHost ${vhost3.urls}> + ${vhost3.servername.directive} + ${vhost3.additional.directives} +</VirtualHost> + +<VirtualHost ${vhost4.urls}> + ${vhost4.servername.directive} + ${vhost4.additional.directives} +</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/httpd.conf new file mode 100644 index 0000000..ebc07ac --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/httpd.conf @@ -0,0 +1,40 @@ +ServerRoot ${server.root} + +Listen ${listen1} +Listen ${listen2} +Listen ${listen3} +Listen ${listen4} + +ServerAdmin root@localhost + +${servername.directive} + +DocumentRoot ${document.root} + +DirectoryIndex index.html index.html.var + +TypesConfig conf/mime.types + +DefaultType text/plain + +ErrorLog logs/error_log + +LogLevel debug + +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent + +CustomLog logs/access_log combined + +# Apache SNMP +LoadModule snmpcommon_module modules/libsnmpcommon.so +LoadModule snmpagt_module modules/libsnmpmonagt.so +SNMPConf conf +SNMPVar var +# End of apache SNMP + +${additional.directives} + +Include *.vhost.conf diff --git a/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/mess/1.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/mess/1.vhost.conf new file mode 100644 index 0000000..39cf84a --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/mess/1.vhost.conf @@ -0,0 +1,17 @@ +<IfModule not_loaded_module> + <VirtualHost ${vhost1.urls}> + ${vhost1.servername.directive} + ${vhost1.additional.directives} + </VirtualHost> +</IfModule> + +LoadModule proxy_module modules/mod_proxy.so + +<IfModule snmpcommon_module> +<IfModule mod_proxy.c> + <VirtualHost ${vhost2.urls}> + ${vhost2.servername.directive} + ${vhost2.additional.directives} + </VirtualHost> +</IfModule> +</IfModule> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/mess/2.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/mess/2.vhost.conf new file mode 100644 index 0000000..37854b6 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/mess/2.vhost.conf @@ -0,0 +1,13 @@ +<IfModule snmpcommon_module> +<IfModule mod_unknown.c> + <VirtualHost ${vhost3.urls}> + ${vhost3.servername.directive} + ${vhost3.additional.directives} + </VirtualHost> +</IfModule> +</IfModule> + +<VirtualHost ${vhost4.urls}> + ${vhost4.servername.directive} + ${vhost4.additional.directives} +</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/mess/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/mess/httpd.conf new file mode 100644 index 0000000..ebc07ac --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/mess/httpd.conf @@ -0,0 +1,40 @@ +ServerRoot ${server.root} + +Listen ${listen1} +Listen ${listen2} +Listen ${listen3} +Listen ${listen4} + +ServerAdmin root@localhost + +${servername.directive} + +DocumentRoot ${document.root} + +DirectoryIndex index.html index.html.var + +TypesConfig conf/mime.types + +DefaultType text/plain + +ErrorLog logs/error_log + +LogLevel debug + +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent + +CustomLog logs/access_log combined + +# Apache SNMP +LoadModule snmpcommon_module modules/libsnmpcommon.so +LoadModule snmpagt_module modules/libsnmpmonagt.so +SNMPConf conf +SNMPVar var +# End of apache SNMP + +${additional.directives} + +Include *.vhost.conf diff --git a/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/nested/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/nested/httpd.conf new file mode 100644 index 0000000..6112bdc --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/nested/httpd.conf @@ -0,0 +1,68 @@ +ServerRoot ${server.root} + +Listen ${listen1} +Listen ${listen2} +Listen ${listen3} +Listen ${listen4} + +ServerAdmin root@localhost + +${servername.directive} + +DocumentRoot ${document.root} + +DirectoryIndex index.html index.html.var + +TypesConfig conf/mime.types + +DefaultType text/plain + +ErrorLog logs/error_log + +LogLevel debug + +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent + +CustomLog logs/access_log combined + +# Apache SNMP +LoadModule snmpcommon_module modules/libsnmpcommon.so +LoadModule snmpagt_module modules/libsnmpmonagt.so +SNMPConf conf +SNMPVar var +# End of apache SNMP + +${additional.directives} + +<IfModule not_loaded_module> + <VirtualHost ${vhost1.urls}> + ${vhost1.servername.directive} + ${vhost1.additional.directives} + </VirtualHost> +</IfModule> + +LoadModule proxy_module modules/mod_proxy.so + +<IfModule snmpcommon_module> +<IfModule mod_proxy.c> + <VirtualHost ${vhost2.urls}> + ${vhost2.servername.directive} + ${vhost2.additional.directives} + </VirtualHost> +</IfModule> + +<IfModule mod_unknown.c> + <VirtualHost ${vhost3.urls}> + ${vhost3.servername.directive} + ${vhost3.additional.directives} + </VirtualHost> +</IfModule> +</IfModule> + +<VirtualHost ${vhost4.urls}> + ${vhost4.servername.directive} + ${vhost4.additional.directives} +</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/simple/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/simple/httpd.conf new file mode 100644 index 0000000..87142b4 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/simple/httpd.conf @@ -0,0 +1,58 @@ +ServerRoot ${server.root} + +Listen ${listen1} +Listen ${listen2} +Listen ${listen3} +Listen ${listen4} + +ServerAdmin root@localhost + +${servername.directive} + +DocumentRoot ${document.root} + +DirectoryIndex index.html index.html.var + +TypesConfig conf/mime.types + +DefaultType text/plain + +ErrorLog logs/error_log + +LogLevel debug + +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent + +CustomLog logs/access_log combined + +# Apache SNMP +LoadModule snmpcommon_module modules/libsnmpcommon.so +LoadModule snmpagt_module modules/libsnmpmonagt.so +SNMPConf conf +SNMPVar var +# End of apache SNMP + +${additional.directives} + +<VirtualHost ${vhost1.urls}> + ${vhost1.servername.directive} + ${vhost1.additional.directives} +</VirtualHost> + +<VirtualHost ${vhost2.urls}> + ${vhost2.servername.directive} + ${vhost2.additional.directives} +</VirtualHost> + +<VirtualHost ${vhost3.urls}> + ${vhost3.servername.directive} + ${vhost3.additional.directives} +</VirtualHost> + +<VirtualHost ${vhost4.urls}> + ${vhost4.servername.directive} + ${vhost4.additional.directives} +</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/includes/1.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/includes/1.vhost.conf deleted file mode 100644 index 7b56cae..0000000 --- a/modules/plugins/apache/src/test/resources/full-configurations/includes/1.vhost.conf +++ /dev/null @@ -1,9 +0,0 @@ -<VirtualHost ${vhost1.urls}> - ${vhost1.servername.directive} - ${vhost1.additional.directives} -</VirtualHost> - -<VirtualHost ${vhost2.urls}> - ${vhost2.servername.directive} - ${vhost2.additional.directives} -</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/includes/2.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/includes/2.vhost.conf deleted file mode 100644 index b4a7725..0000000 --- a/modules/plugins/apache/src/test/resources/full-configurations/includes/2.vhost.conf +++ /dev/null @@ -1,9 +0,0 @@ -<VirtualHost ${vhost3.urls}> - ${vhost3.servername.directive} - ${vhost3.additional.directives} -</VirtualHost> - -<VirtualHost ${vhost4.urls}> - ${vhost4.servername.directive} - ${vhost4.additional.directives} -</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/includes/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/includes/httpd.conf deleted file mode 100644 index ebc07ac..0000000 --- a/modules/plugins/apache/src/test/resources/full-configurations/includes/httpd.conf +++ /dev/null @@ -1,40 +0,0 @@ -ServerRoot ${server.root} - -Listen ${listen1} -Listen ${listen2} -Listen ${listen3} -Listen ${listen4} - -ServerAdmin root@localhost - -${servername.directive} - -DocumentRoot ${document.root} - -DirectoryIndex index.html index.html.var - -TypesConfig conf/mime.types - -DefaultType text/plain - -ErrorLog logs/error_log - -LogLevel debug - -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %b" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent - -CustomLog logs/access_log combined - -# Apache SNMP -LoadModule snmpcommon_module modules/libsnmpcommon.so -LoadModule snmpagt_module modules/libsnmpmonagt.so -SNMPConf conf -SNMPVar var -# End of apache SNMP - -${additional.directives} - -Include *.vhost.conf diff --git a/modules/plugins/apache/src/test/resources/full-configurations/mess/1.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/mess/1.vhost.conf deleted file mode 100644 index 39cf84a..0000000 --- a/modules/plugins/apache/src/test/resources/full-configurations/mess/1.vhost.conf +++ /dev/null @@ -1,17 +0,0 @@ -<IfModule not_loaded_module> - <VirtualHost ${vhost1.urls}> - ${vhost1.servername.directive} - ${vhost1.additional.directives} - </VirtualHost> -</IfModule> - -LoadModule proxy_module modules/mod_proxy.so - -<IfModule snmpcommon_module> -<IfModule mod_proxy.c> - <VirtualHost ${vhost2.urls}> - ${vhost2.servername.directive} - ${vhost2.additional.directives} - </VirtualHost> -</IfModule> -</IfModule> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/mess/2.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/mess/2.vhost.conf deleted file mode 100644 index 37854b6..0000000 --- a/modules/plugins/apache/src/test/resources/full-configurations/mess/2.vhost.conf +++ /dev/null @@ -1,13 +0,0 @@ -<IfModule snmpcommon_module> -<IfModule mod_unknown.c> - <VirtualHost ${vhost3.urls}> - ${vhost3.servername.directive} - ${vhost3.additional.directives} - </VirtualHost> -</IfModule> -</IfModule> - -<VirtualHost ${vhost4.urls}> - ${vhost4.servername.directive} - ${vhost4.additional.directives} -</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/mess/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/mess/httpd.conf deleted file mode 100644 index ebc07ac..0000000 --- a/modules/plugins/apache/src/test/resources/full-configurations/mess/httpd.conf +++ /dev/null @@ -1,40 +0,0 @@ -ServerRoot ${server.root} - -Listen ${listen1} -Listen ${listen2} -Listen ${listen3} -Listen ${listen4} - -ServerAdmin root@localhost - -${servername.directive} - -DocumentRoot ${document.root} - -DirectoryIndex index.html index.html.var - -TypesConfig conf/mime.types - -DefaultType text/plain - -ErrorLog logs/error_log - -LogLevel debug - -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %b" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent - -CustomLog logs/access_log combined - -# Apache SNMP -LoadModule snmpcommon_module modules/libsnmpcommon.so -LoadModule snmpagt_module modules/libsnmpmonagt.so -SNMPConf conf -SNMPVar var -# End of apache SNMP - -${additional.directives} - -Include *.vhost.conf diff --git a/modules/plugins/apache/src/test/resources/full-configurations/nested/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/nested/httpd.conf deleted file mode 100644 index 6112bdc..0000000 --- a/modules/plugins/apache/src/test/resources/full-configurations/nested/httpd.conf +++ /dev/null @@ -1,68 +0,0 @@ -ServerRoot ${server.root} - -Listen ${listen1} -Listen ${listen2} -Listen ${listen3} -Listen ${listen4} - -ServerAdmin root@localhost - -${servername.directive} - -DocumentRoot ${document.root} - -DirectoryIndex index.html index.html.var - -TypesConfig conf/mime.types - -DefaultType text/plain - -ErrorLog logs/error_log - -LogLevel debug - -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %b" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent - -CustomLog logs/access_log combined - -# Apache SNMP -LoadModule snmpcommon_module modules/libsnmpcommon.so -LoadModule snmpagt_module modules/libsnmpmonagt.so -SNMPConf conf -SNMPVar var -# End of apache SNMP - -${additional.directives} - -<IfModule not_loaded_module> - <VirtualHost ${vhost1.urls}> - ${vhost1.servername.directive} - ${vhost1.additional.directives} - </VirtualHost> -</IfModule> - -LoadModule proxy_module modules/mod_proxy.so - -<IfModule snmpcommon_module> -<IfModule mod_proxy.c> - <VirtualHost ${vhost2.urls}> - ${vhost2.servername.directive} - ${vhost2.additional.directives} - </VirtualHost> -</IfModule> - -<IfModule mod_unknown.c> - <VirtualHost ${vhost3.urls}> - ${vhost3.servername.directive} - ${vhost3.additional.directives} - </VirtualHost> -</IfModule> -</IfModule> - -<VirtualHost ${vhost4.urls}> - ${vhost4.servername.directive} - ${vhost4.additional.directives} -</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/simple/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/simple/httpd.conf deleted file mode 100644 index 87142b4..0000000 --- a/modules/plugins/apache/src/test/resources/full-configurations/simple/httpd.conf +++ /dev/null @@ -1,58 +0,0 @@ -ServerRoot ${server.root} - -Listen ${listen1} -Listen ${listen2} -Listen ${listen3} -Listen ${listen4} - -ServerAdmin root@localhost - -${servername.directive} - -DocumentRoot ${document.root} - -DirectoryIndex index.html index.html.var - -TypesConfig conf/mime.types - -DefaultType text/plain - -ErrorLog logs/error_log - -LogLevel debug - -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %b" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent - -CustomLog logs/access_log combined - -# Apache SNMP -LoadModule snmpcommon_module modules/libsnmpcommon.so -LoadModule snmpagt_module modules/libsnmpmonagt.so -SNMPConf conf -SNMPVar var -# End of apache SNMP - -${additional.directives} - -<VirtualHost ${vhost1.urls}> - ${vhost1.servername.directive} - ${vhost1.additional.directives} -</VirtualHost> - -<VirtualHost ${vhost2.urls}> - ${vhost2.servername.directive} - ${vhost2.additional.directives} -</VirtualHost> - -<VirtualHost ${vhost3.urls}> - ${vhost3.servername.directive} - ${vhost3.additional.directives} -</VirtualHost> - -<VirtualHost ${vhost4.urls}> - ${vhost4.servername.directive} - ${vhost4.additional.directives} -</VirtualHost> diff --git a/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingProperties.java b/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingProperties.java new file mode 100644 index 0000000..9e359cb --- /dev/null +++ b/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingProperties.java @@ -0,0 +1,306 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.test; + +import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + + +/** + * This map is basically an extension of the {@link Properties} class that can resolve the references + * to values of other keys inside the values. + * + * I.e., if the map is initialized with the following mappings: + * + * <code> + * name => world + * hello => Hello ${name}! + * </code> + * + * then the call to: + * + * <code> + * get("hello") + * </code> + * + * will return: + * <code> + * "Hello world!" + * </code> + * + * To access and modify the underlying unprocessed values, one can use the "raw" counterparts of the standard + * map methods (e.g. instead of {@link #get(Object)}, use {@link #getRaw(Object)}, etc.). + * + * @author Lukas Krejci + */ +public class TokenReplacingProperties extends HashMap<String, String> { + private static final long serialVersionUID = 1L; + + private Map<String, String> wrapped; + private Deque<String> currentResolutionStack = new ArrayDeque<String>(); + private Map<Object, String> resolved = new HashMap<Object, String>(); + + private class Entry implements Map.Entry<String, String> { + private Map.Entry<String, String> wrapped; + private boolean process; + + public Entry(Map.Entry<String, String> wrapped, boolean process) { + this.wrapped = wrapped; + this.process = process; + } + + @Override + public boolean equals(Object obj) { + if (obj == this) { + return true; + } + + if (!(obj instanceof Entry)) { + return false; + } + + Entry other = (Entry) obj; + + String key = wrapped.getKey(); + String otherKey = other.getKey(); + String value = getValue(); + String otherValue = other.getValue(); + + return (key == null ? otherKey == null : key.equals(otherKey)) && + (value == null ? otherValue == null : value.equals(otherValue)); + } + + public String getKey() { + return wrapped.getKey(); + } + + public String getValue() { + if (process) { + return get(wrapped.getKey()); + } else { + return wrapped.getValue(); + } + } + + @Override + public int hashCode() { + String key = wrapped.getKey(); + String value = getValue(); + return (key == null ? 0 : key.hashCode()) ^ + (value == null ? 0 : value.hashCode()); + } + + public String setValue(String value) { + resolved.remove(wrapped.getKey()); + return wrapped.setValue(value); + } + + @Override + public String toString() { + return wrapped.toString(); + } + } + + public TokenReplacingProperties(Map<String, String> wrapped) { + this.wrapped = wrapped; + } + + @SuppressWarnings("unchecked") + public TokenReplacingProperties(Properties properties) { + @SuppressWarnings("rawtypes") + Map map = (Map<Object, Object>) properties; + + this.wrapped = (Map<String, String>) map; + } + + @Override + public String get(Object key) { + if (resolved.containsKey(key)) { + return resolved.get(key); + } + + if (currentResolutionStack.contains(key)) { + throw new IllegalArgumentException("Property '" + key + "' indirectly references itself in its value."); + } + + String rawValue = getRaw(key); + + if (rawValue == null) { + return null; + } + + currentResolutionStack.push(key.toString()); + + String ret = readAll(new TokenReplacingReader(new StringReader(rawValue.toString()), this)); + + currentResolutionStack.pop(); + + resolved.put(key, ret); + + return ret; + } + + public String getRaw(Object key) { + return wrapped.get(key); + } + + @Override + public String put(String key, String value) { + resolved.remove(key); + return wrapped.put(key, value); + } + + @Override + public void putAll(Map<? extends String, ? extends String> m) { + for(String key : m.keySet()) { + resolved.remove(key); + } + wrapped.putAll(m); + } + + @Override + public void clear() { + wrapped.clear(); + resolved.clear(); + } + + @Override + public boolean containsKey(Object key) { + return wrapped.containsKey(key); + } + + @Override + public Set<String> keySet() { + return wrapped.keySet(); + } + + @Override + public boolean containsValue(Object value) { + for(String key : keySet()) { + String thisVal = get(key); + if (thisVal == null) { + if (value == null) { + return true; + } + } else { + if (thisVal.equals(value)) { + return true; + } + } + } + + return false; + } + + /** + * Checks whether this map contains the unprocessed value. + * + * @param value + * @return + */ + public boolean containsRawValue(Object value) { + return wrapped.containsValue(value); + } + + /** + * The returned set IS NOT backed by this map + * (unlike in the default map implementations). + * + * The {@link java.util.Map.Entry#setValue(Object)} method + * does modify this map though. + */ + @Override + public Set<Map.Entry<String, String>> entrySet() { + Set<Map.Entry<String, String>> ret = new HashSet<Map.Entry<String, String>>(); + for(Map.Entry<String, String> entry : wrapped.entrySet()) { + ret.add(new Entry(entry, true)); + } + + return ret; + } + + public Set<Map.Entry<String, String>> getRawEntrySet() { + Set<Map.Entry<String, String>> ret = new HashSet<Map.Entry<String, String>>(); + for(Map.Entry<String, String> entry : wrapped.entrySet()) { + ret.add(new Entry(entry, false)); + } + + return ret; + } + + @Override + public String remove(Object key) { + resolved.remove(key); + return wrapped.remove(key).toString(); + } + + @Override + public int size() { + return wrapped.size(); + } + + /** + * Unlike in the default implementation the collection returned + * from this method IS NOT backed by this map. + */ + @Override + public Collection<String> values() { + List<String> ret = new ArrayList<String>(); + for(String key : keySet()) { + ret.add(get(key)); + } + + return ret; + } + + public Collection<String> getRawValues() { + List<String> ret = new ArrayList<String>(); + for(String key : keySet()) { + ret.add(wrapped.get(key)); + } + + return ret; + } + + private String readAll(Reader rdr) { + int in = -1; + StringBuilder bld = new StringBuilder(); + try { + while ((in = rdr.read()) != -1) { + bld.append((char) in); + } + } catch (IOException e) { + throw new IllegalStateException("Exception while reading a string.", e); + } + + return bld.toString(); + } +} \ No newline at end of file commit 31a67b57f4c3d8a21c3b3088967d6b84095399db Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jun 20 18:30:51 2011 +0200 support for system properties defined by referencing other system properties and reduce the number of needed configuration properties in the pom.xml diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index a7a6bf5..ebfc749 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -246,28 +246,38 @@ <apache1.install.dir>PASS THIS IN FROM THE COMMAND LINE</apache1.install.dir> <apache1.exe.path>bin/httpd</apache1.exe.path> + <port1></port1> + <port2></port2> + <port3></port3> + <port4></port4> + <localhost></localhost> + <unresolvable.host></unresolvable.host> +  +  + <simpleWithResolvableServerNames.server.root>${apache2.install.dir}</simpleWithResolvableServerNames.server.root> -  - <simpleWithResolvableServerNames.document.root></simpleWithResolvableServerNames.document.root> - <simpleWithResolvableServerNames.listen1>11675</simpleWithResolvableServerNames.listen1> - <simpleWithResolvableServerNames.listen2>11676</simpleWithResolvableServerNames.listen2> - <simpleWithResolvableServerNames.listen3>11677</simpleWithResolvableServerNames.listen3> - <simpleWithResolvableServerNames.listen4>11678</simpleWithResolvableServerNames.listen4> - <simpleWithResolvableServerNames.servername.directive></simpleWithResolvableServerNames.servername.directive> - <simpleWithResolvableServerNames.additional.directives></simpleWithResolvableServerNames.additional.directives> - <simpleWithResolvableServerNames.vhost1.urls>127.0.0.1:11675</simpleWithResolvableServerNames.vhost1.urls> - <simpleWithResolvableServerNames.vhost1.servername.directive>ServerName 127.0.0.1:11675</simpleWithResolvableServerNames.vhost1.servername.directive> - <simpleWithResolvableServerNames.vhost1.additional.directives></simpleWithResolvableServerNames.vhost1.additional.directives> - <simpleWithResolvableServerNames.vhost2.urls>127.0.0.1:11676</simpleWithResolvableServerNames.vhost2.urls> - <simpleWithResolvableServerNames.vhost2.servername.directive>ServerName 127.0.0.1:11676</simpleWithResolvableServerNames.vhost2.servername.directive> - <simpleWithResolvableServerNames.vhost2.additional.directives></simpleWithResolvableServerNames.vhost2.additional.directives> - <simpleWithResolvableServerNames.vhost3.urls>127.0.0.1:11677</simpleWithResolvableServerNames.vhost3.urls> - <simpleWithResolvableServerNames.vhost3.servername.directive>ServerName 127.0.0.1:11677</simpleWithResolvableServerNames.vhost3.servername.directive> - <simpleWithResolvableServerNames.vhost3.additional.directives></simpleWithResolvableServerNames.vhost3.additional.directives> - <simpleWithResolvableServerNames.vhost4.urls>127.0.0.1:11678</simpleWithResolvableServerNames.vhost4.urls> - <simpleWithResolvableServerNames.vhost4.servername.directive>ServerName 127.0.0.1:11678</simpleWithResolvableServerNames.vhost4.servername.directive> - <simpleWithResolvableServerNames.vhost4.additional.directives></simpleWithResolvableServerNames.vhost4.additional.directives> + </systemPropertyVariables> </configuration> </execution> diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java index 524370e..3db6181 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java @@ -19,16 +19,24 @@ package org.rhq.plugins.apache.util; +import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; +import java.net.InetAddress; import java.net.URL; +import java.net.UnknownHostException; +import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Collection; +import java.util.Deque; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -75,7 +83,7 @@ public class ApacheDeploymentUtil { public String getServerName() { String serverName = null; - if (serverNameDirective != null) { + if (serverNameDirective != null && serverNameDirective.startsWith("ServerName")) { int startIdx = serverNameDirective.indexOf(' '); if (startIdx >= 0) { while (serverNameDirective.charAt(startIdx) == ' ') { @@ -189,28 +197,72 @@ public class ApacheDeploymentUtil { } } + public static void addDefaultVariables(Map<String, String> variables, String prefix) { + String localhost = determineLocalhost(); + checkOrAddDefault(variables, "localhost", localhost); + checkOrAddDefault(variables, "unresolvable.host", "unreachable.host.com"); + checkOrAddDefault(variables, "port1", "11675"); + checkOrAddDefault(variables, "port2", "11676"); + checkOrAddDefault(variables, "port3", "11677"); + checkOrAddDefault(variables, "port4", "11678"); + + checkOrAddDefault(variables, prefix + ".listen1", "${port1}"); + checkOrAddDefault(variables, prefix + ".listen2", "${port2}"); + checkOrAddDefault(variables, prefix + ".listen3", "${port3}"); + checkOrAddDefault(variables, prefix + ".listen4", "${port4}"); + + checkOrAddDefault(variables, prefix + ".vhost1.servername", "${localhost}:${port1}"); + checkOrAddDefault(variables, prefix + ".vhost1.urls", "${" + prefix + ".vhost1.servername}"); + checkOrAddDefault(variables, prefix + ".vhost1.servername.directive", "ServerName ${" + prefix + ".vhost1.servername}"); + + checkOrAddDefault(variables, prefix + ".vhost2.servername", "${localhost}:${port2}"); + checkOrAddDefault(variables, prefix + ".vhost2.urls", "${" + prefix + ".vhost2.servername}"); + checkOrAddDefault(variables, prefix + ".vhost2.servername.directive", "ServerName ${" + prefix + ".vhost2.servername}"); + + checkOrAddDefault(variables, prefix + ".vhost3.servername", "${localhost}:${port3}"); + checkOrAddDefault(variables, prefix + ".vhost3.urls", "${" + prefix + ".vhost3.servername}"); + checkOrAddDefault(variables, prefix + ".vhost3.servername.directive", "ServerName ${" + prefix + ".vhost3.servername}"); + + checkOrAddDefault(variables, prefix + ".vhost4.servername", "${localhost}:${port4}"); + checkOrAddDefault(variables, prefix + ".vhost4.urls", "${" + prefix + ".vhost4.servername}"); + checkOrAddDefault(variables, prefix + ".vhost4.servername.directive", "ServerName ${" + prefix + ".vhost4.servername}"); + } + + private static void checkOrAddDefault(Map<String, String> map, String key, String value) { + if (!map.containsKey(key)) { + map.put(key, value); + } + } + public static DeploymentConfig getDeploymentConfigurationFromSystemProperties(String variablesPrefix) { DeploymentConfig ret = new DeploymentConfig(); + Map<String, String> properties = new TokenReplacingMap(System.getProperties()); + addDefaultVariables(properties, variablesPrefix); + variablesPrefix += "."; - ret.serverRoot = System.getProperty(variablesPrefix + SERVER_ROOT); - ret.documentRoot = System.getProperty(variablesPrefix + DOCUMENT_ROOT, "htdocs"); - ret.snmpHost = System.getProperty(variablesPrefix + SNMP_HOST, "localhost"); - ret.snmpPort = Integer.parseInt(System.getProperty(variablesPrefix + SNMP_PORT, "1610")); - ret.mainServer.address1 = HttpdAddressUtility.parseListen(System.getProperty(variablesPrefix + LISTEN1)); - ret.mainServer.address2 = HttpdAddressUtility.parseListen(System.getProperty(variablesPrefix + LISTEN2)); - ret.mainServer.address3 = HttpdAddressUtility.parseListen(System.getProperty(variablesPrefix + LISTEN3)); - ret.mainServer.address4 = HttpdAddressUtility.parseListen(System.getProperty(variablesPrefix + LISTEN4)); - ret.mainServer.serverNameDirective = System.getProperty(variablesPrefix + SERVERNAME_DIRECTIVE); - - String additionalDirectives = System.getProperty(variablesPrefix + ADDITIONAL_DIRECTIVES); + ret.serverRoot = properties.get(variablesPrefix + SERVER_ROOT); + ret.documentRoot = properties.get(variablesPrefix + DOCUMENT_ROOT); + ret.documentRoot = ret.documentRoot == null ? "htdocs" : ret.documentRoot; + ret.snmpHost = properties.get(variablesPrefix + SNMP_HOST); + ret.snmpHost = ret.snmpHost == null ? "localhost" : ret.snmpHost; + String snmpPort = properties.get(variablesPrefix + SNMP_PORT); + snmpPort = snmpPort == null ? "1610" : snmpPort; + ret.snmpPort = Integer.parseInt(snmpPort); + ret.mainServer.address1 = HttpdAddressUtility.parseListen(properties.get(variablesPrefix + LISTEN1)); + ret.mainServer.address2 = HttpdAddressUtility.parseListen(properties.get(variablesPrefix + LISTEN2)); + ret.mainServer.address3 = HttpdAddressUtility.parseListen(properties.get(variablesPrefix + LISTEN3)); + ret.mainServer.address4 = HttpdAddressUtility.parseListen(properties.get(variablesPrefix + LISTEN4)); + ret.mainServer.serverNameDirective = properties.get(variablesPrefix + SERVERNAME_DIRECTIVE); + + String additionalDirectives = properties.get(variablesPrefix + ADDITIONAL_DIRECTIVES); fillAdditionalDirectives(additionalDirectives, ret.mainServer.additionalDirectives); - readVHostConfigFromSystemProperties(ret.vhost1, variablesPrefix + VHOST + 1); - readVHostConfigFromSystemProperties(ret.vhost2, variablesPrefix + VHOST + 2); - readVHostConfigFromSystemProperties(ret.vhost3, variablesPrefix + VHOST + 3); - readVHostConfigFromSystemProperties(ret.vhost4, variablesPrefix + VHOST + 4); + readVHostConfigFromProperties(ret.vhost1, variablesPrefix + VHOST + 1, properties); + readVHostConfigFromProperties(ret.vhost2, variablesPrefix + VHOST + 2, properties); + readVHostConfigFromProperties(ret.vhost3, variablesPrefix + VHOST + 3, properties); + readVHostConfigFromProperties(ret.vhost4, variablesPrefix + VHOST + 4, properties); return ret; } @@ -263,10 +315,10 @@ public class ApacheDeploymentUtil { } } - private static void readVHostConfigFromSystemProperties(DeploymentConfig.VHost vhost, String prefix) { + private static void readVHostConfigFromProperties(DeploymentConfig.VHost vhost, String prefix, Map<String, String> properties) { prefix += "."; - String addrsString = System.getProperty(prefix + URLS); + String addrsString = properties.get(prefix + URLS); if (addrsString == null) { throw new IllegalStateException("The system property '" + prefix + "urls' doesn't exist. It is needed to define the vhost."); @@ -289,9 +341,9 @@ public class ApacheDeploymentUtil { throw new IllegalStateException("The system property '" + prefix + "urls' specified " + addrs.length + " addresses. Only 1-4 addresses are supported."); } - vhost.serverNameDirective = System.getProperty(prefix + SERVERNAME_DIRECTIVE); + vhost.serverNameDirective = properties.get(prefix + SERVERNAME_DIRECTIVE); - String additionalDirectives = System.getProperty(prefix + ADDITIONAL_DIRECTIVES); + String additionalDirectives = properties.get(prefix + ADDITIONAL_DIRECTIVES); fillAdditionalDirectives(additionalDirectives, vhost.additionalDirectives); } @@ -302,4 +354,122 @@ public class ApacheDeploymentUtil { } } } + + private static String determineLocalhost() { + try { + return InetAddress.getLocalHost().getCanonicalHostName(); + } catch (UnknownHostException e) { + return "127.0.0.1"; + } + } + + private static class TokenReplacingMap extends HashMap<String, String> { + private static final long serialVersionUID = 1L; + + @SuppressWarnings("rawtypes") + private Map wrapped; + private Deque<String> currentResolutionStack = new ArrayDeque<String>(); + private Map<Object, String> resolved = new HashMap<Object, String>(); + + public TokenReplacingMap(Map<?, ?> wrapped) { + this.wrapped = wrapped; + } + + @Override + public String get(Object key) { + return get((String) key); + } + + public String get(String key) { + if (resolved.containsKey(key)) { + return resolved.get(key); + } + + if (currentResolutionStack.contains(key)) { + throw new IllegalArgumentException("Property '" + key + "' indirectly references itself in its value."); + } + + Object rawValue = wrapped.get(key); + + if (rawValue == null) { + return null; + } + + currentResolutionStack.push(key); + + String ret = readAll(new TokenReplacingReader(new StringReader(rawValue.toString()), this)); + + currentResolutionStack.pop(); + + resolved.put(key, ret); + + return ret; + } + + @Override + public String put(String key, String value) { + return (String) wrapped.put(key, value); + } + + @Override + public void putAll(Map<? extends String, ? extends String> m) { + wrapped.putAll(m); + } + + @Override + public void clear() { + wrapped.clear(); + resolved.clear(); + } + + @Override + public boolean containsKey(Object key) { + return wrapped.containsKey(key); + } + + @Override + public Set<String> keySet() { + return (Set<String>) wrapped.keySet(); + } + + @Override + public boolean containsValue(Object value) { + return wrapped.containsValue(value); + } + + @Override + public Set<Map.Entry<String, String>> entrySet() { + throw new UnsupportedOperationException(); + } + + @Override + public String remove(Object key) { + resolved.remove(key); + return wrapped.remove(key).toString(); + } + + @Override + public int size() { + return wrapped.size(); + } + + @Override + public Collection<String> values() { + throw new UnsupportedOperationException(); + } + + private String readAll(Reader rdr) { + int in = -1; + StringBuilder bld = new StringBuilder(); + try { + while((in = rdr.read()) != -1) { + bld.append((char) in); + } + } catch (IOException e) { + throw new IllegalStateException("Exception while reading a string.", e); + } + + return bld.toString(); + } + }; } commit 2197c9572aabb70e76d1f6f721c8e58aad6b5ef5 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jun 20 18:19:57 2011 +0200 docs diff --git a/modules/test-utils/src/main/java/org/rhq/test/ObjectCollectionSerializer.java b/modules/test-utils/src/main/java/org/rhq/test/ObjectCollectionSerializer.java index d3a3cab..c10c34e 100644 --- a/modules/test-utils/src/main/java/org/rhq/test/ObjectCollectionSerializer.java +++ b/modules/test-utils/src/main/java/org/rhq/test/ObjectCollectionSerializer.java @@ -133,11 +133,17 @@ public class ObjectCollectionSerializer { out.append("</inventory-dump>\n"); } + /** + * @see #deserialize(XMLStreamReader) + */ public List<?> deserialize(InputStream inputStream) throws IOException, XMLStreamException, ClassNotFoundException, JAXBException { XMLStreamReader rdr = XMLInputFactory.newFactory().createXMLStreamReader(inputStream); return deserialize(rdr); } + /** + * @see #deserialize(XMLStreamReader) + */ public List<?> deserialize(Reader inputReader) throws IOException, XMLStreamException, ClassNotFoundException, JAXBException { XMLStreamReader rdr = XMLInputFactory.newFactory().createXMLStreamReader(inputReader); return deserialize(rdr); commit 400c9c6253f7aeabdb6ee0b9107845f6f854462a Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jun 20 18:19:42 2011 +0200 abstract out the functionality that will be common to all upgrade tests to a base class so that we can have more freedom in splitting stuff up diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java index 861c5e8..056fead 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java @@ -22,63 +22,17 @@ package org.rhq.plugins.apache; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.net.InetAddress; -import java.net.URI; -import java.net.UnknownHostException; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Set; -import java.util.UUID; -import org.jmock.Expectations; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; import org.testng.annotations.Parameters; import org.testng.annotations.Test; -import org.rhq.core.clientapi.agent.metadata.PluginMetadataParser; -import org.rhq.core.clientapi.descriptor.AgentPluginDescriptorUtil; -import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor; -import org.rhq.core.clientapi.server.discovery.InventoryReport; -import org.rhq.core.domain.configuration.Configuration; -import org.rhq.core.domain.configuration.PropertySimple; -import org.rhq.core.domain.discovery.AvailabilityReport; -import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceError; import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.pc.ServerServices; -import org.rhq.core.pc.upgrade.FakeServerInventory; -import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; -import org.rhq.core.pluginapi.inventory.PluginContainerDeployment; -import org.rhq.core.pluginapi.inventory.ResourceContext; -import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; -import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; -import org.rhq.core.system.ProcessInfo; -import org.rhq.core.system.SystemInfo; -import org.rhq.core.system.SystemInfoFactory; -import org.rhq.plugins.apache.parser.ApacheDirectiveTree; -import org.rhq.plugins.apache.util.ApacheDeploymentUtil; import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; -import org.rhq.plugins.apache.util.ApacheExecutionUtil; -import org.rhq.plugins.apache.util.HttpdAddressUtility; -import org.rhq.plugins.apache.util.MockApacheBinaryInfo; -import org.rhq.plugins.apache.util.MockProcessInfo; -import org.rhq.plugins.platform.PlatformComponent; -import org.rhq.test.ObjectCollectionSerializer; -import org.rhq.test.TokenReplacingReader; import org.rhq.test.pc.PluginContainerSetup; -import org.rhq.test.pc.PluginContainerTest; /** * @@ -86,296 +40,7 @@ import org.rhq.test.pc.PluginContainerTest; * @author Lukas Krejci */ @Test(groups = "apache-integration-tests") -public class UpgradeTest extends PluginContainerTest { - - private static final String PLATFORM_PLUGIN = "file:target/itest/plugins/rhq-platform-plugin-for-apache-test.jar"; - private static final String AUGEAS_PLUGIN = "file:target/itest/plugins/rhq-augeas-plugin-for-apache-test.jar"; - private static final String APACHE_PLUGIN = "file:target/itest/plugins/rhq-apache-plugin-for-apache-test.jar"; - - private static final String DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES = "simpleWithResolvableServerNames"; - - private List<ResourceType> resourceTypesInApachePlugin; - - private Resource platform; - - private class TestSetup { - private String configurationName; - private FakeServerInventory fakeInventory = new FakeServerInventory(); - private String inventoryFile; - private Resource platform; - private ApacheSetup apacheSetup = new ApacheSetup(); - private DeploymentConfig deploymentConfig; - - public class ApacheSetup { - private String serverRoot; - private String exePath; - private Collection<String> configurationFiles; - private ApacheExecutionUtil execution; - private boolean deploy = true; - - private ApacheSetup() { - - } - - public ApacheSetup withServerRoot(String serverRoot) { - this.serverRoot = serverRoot; - return this; - } - - public ApacheSetup withExePath(String exePath) { - this.exePath = exePath; - return this; - } - - public ApacheSetup withConfigurationFiles(String... classPathUris) { - return withConfigurationFiles(Arrays.asList(classPathUris)); - } - - public ApacheSetup withConfigurationFiles(Collection<String> classPathUris) { - this.configurationFiles = classPathUris; - return this; - } - - public ApacheSetup withDeploymentOnSetup() { - this.deploy = true; - return this; - } - - public ApacheSetup withNoDeploymentOnSetup() { - this.deploy = false; - return this; - } - - public ApacheExecutionUtil getExecutionUtil() { - return execution; - } - - public void init() throws Exception { - File serverRootDir = new File(serverRoot); - - assertTrue(serverRootDir.exists(), "The configured server root denotes a non-existant directory: '" - + serverRootDir + "'."); - - File confDir = new File(serverRootDir, "conf"); - - assertTrue(confDir.exists(), - "The configured server root denotes a directory that doesn't have a 'conf' subdirectory. This is unexpected."); - - String snmpHost = null; - int snmpPort = 0; - String pingUrl = null; - - if (configurationName != null) { - if (deploy) { - ApacheDeploymentUtil.deployConfiguration(confDir, configurationFiles, deploymentConfig); - } - - HttpdAddressUtility.Address addr = deploymentConfig.mainServer.address1; - HttpdAddressUtility.Address addrToUse = new HttpdAddressUtility.Address(null, null, - HttpdAddressUtility.Address.NO_PORT_SPECIFIED_VALUE); - addrToUse.scheme = addr.scheme == null ? "http" : addr.scheme; - addrToUse.host = addr.host == null ? "localhost" : addr.host; - addrToUse.port = addr.port; - pingUrl = addrToUse.toString(); - - snmpHost = deploymentConfig.snmpHost; - snmpPort = deploymentConfig.snmpPort; - } - - execution = new ApacheExecutionUtil(findApachePluginResourceTypeByName("Apache HTTP Server"), - serverRoot, exePath, confDir.getAbsolutePath() + File.separatorChar + "httpd.conf", pingUrl, - snmpHost, snmpPort); - execution.init(); - } - - private void doSetup() throws Exception { - init(); - execution.invokeOperation("restart", "start"); - } - - public TestSetup setup() throws Exception { - return TestSetup.this.setup(); - } - } - - public TestSetup(String configurationName) { - this.configurationName = configurationName; - deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName); - } - - public TestSetup withInventoryFrom(String classPathUri) { - inventoryFile = classPathUri; - return this; - } - - public TestSetup withPlatformResource(Resource platform) { - this.platform = platform; - return this; - } - - public ApacheSetup withApacheSetup() { - return apacheSetup; - } - - public TestSetup withDefaultExpectations() throws Exception { - context.checking(new Expectations() { - { - addDefaultExceptations(this); - } - }); - - return this; - } - - @SuppressWarnings("unchecked") - public void addDefaultExceptations(Expectations expectations) throws Exception { - ServerServices ss = getCurrentPluginContainerConfiguration().getServerServices(); - - expectations.allowing(ss.getDiscoveryServerService()).mergeInventoryReport( - expectations.with(Expectations.any(InventoryReport.class))); - expectations.will(fakeInventory.mergeInventoryReport(InventoryStatus.COMMITTED)); - - expectations.allowing(ss.getDiscoveryServerService()).upgradeResources( - expectations.with(Expectations.any(Set.class))); - expectations.will(fakeInventory.upgradeResources()); - - expectations.allowing(ss.getDiscoveryServerService()).getResources( - expectations.with(Expectations.any(Set.class)), expectations.with(Expectations.any(boolean.class))); - expectations.will(fakeInventory.getResources()); - - expectations.allowing(ss.getDiscoveryServerService()).setResourceError(expectations.with(Expectations.any(ResourceError.class))); - expectations.will(fakeInventory.setResourceError()); - - expectations.allowing(ss.getDiscoveryServerService()).mergeAvailabilityReport( - expectations.with(Expectations.any(AvailabilityReport.class))); - - expectations.allowing(ss.getDiscoveryServerService()).postProcessNewlyCommittedResources( - expectations.with(Expectations.any(Set.class))); - - expectations.allowing(ss.getDiscoveryServerService()).clearResourceConfigError( - expectations.with(Expectations.any(int.class))); - - expectations.ignoring(ss.getBundleServerService()); - expectations.ignoring(ss.getConfigurationServerService()); - expectations.ignoring(ss.getContentServerService()); - expectations.ignoring(ss.getCoreServerService()); - expectations.ignoring(ss.getEventServerService()); - expectations.ignoring(ss.getMeasurementServerService()); - expectations.ignoring(ss.getOperationServerService()); - expectations.ignoring(ss.getResourceFactoryServerService()); - } - - public FakeServerInventory getFakeInventory() { - return fakeInventory; - } - - public DeploymentConfig getDeploymentConfig() { - return deploymentConfig; - } - - public TestSetup setup() throws Exception { - apacheSetup.doSetup(); - - Map<String, String> replacements = deploymentConfig.getTokenReplacements(); - replacements.put("server.root", apacheSetup.serverRoot); - replacements.put("exe.path", apacheSetup.exePath); - replacements.put("localhost", determineLocalhost()); - - HttpdAddressUtility addressUtility = apacheSetup.getExecutionUtil().getServerComponent() - .getAddressUtility(); - ApacheDirectiveTree runtimeConfig = apacheSetup.getExecutionUtil().getRuntimeConfiguration(); - - replacements.put("snmp.identifier", - addressUtility.getHttpdInternalMainServerAddressRepresentation(runtimeConfig).toString(false, false)); - - String vhost1Address = deploymentConfig.vhost1 == null ? null : deploymentConfig.vhost1.address1.toString( - false, false); - String vhost2Address = deploymentConfig.vhost2 == null ? null : deploymentConfig.vhost2.address1.toString( - false, false); - String vhost3Address = deploymentConfig.vhost3 == null ? null : deploymentConfig.vhost3.address1.toString( - false, false); - String vhost4Address = deploymentConfig.vhost4 == null ? null : deploymentConfig.vhost4.address1.toString( - false, false); - - if (vhost1Address != null) { - replacements.put( - "vhost1.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost1Address, - deploymentConfig.vhost1.getServerName()).toString(false, false)); - } - - if (vhost2Address != null) { - replacements.put( - "vhost2.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost2Address, - deploymentConfig.vhost2.getServerName()).toString(false, false)); - } - - if (vhost3Address != null) { - replacements.put( - "vhost3.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost3Address, - deploymentConfig.vhost3.getServerName()).toString(false, false)); - } - - if (vhost4Address != null) { - replacements.put( - "vhost4.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost4Address, - deploymentConfig.vhost4.getServerName()).toString(false, false)); - } - - InputStream dataStream = getClass().getResourceAsStream(inventoryFile); - - Reader rdr = new TokenReplacingReader(new InputStreamReader(dataStream), replacements); - - @SuppressWarnings("unchecked") - List<Resource> inventory = (List<Resource>) new ObjectCollectionSerializer().deserialize(rdr); - - //fix up the parent relationships, because they might not be reconstructed correctly by - //JAXB - we're missing XmlID and XmlIDRef annotations in our model - fixupParent(null, inventory); - - fakeInventory.prepopulateInventory(platform, inventory); - - return this; - } - - private void fixupParent(Resource parent, Collection<Resource> children) { - for (Resource child : children) { - child.setParentResource(parent); - if (child.getChildResources() != null) { - fixupParent(child, child.getChildResources()); - } - } - } - - private String determineLocalhost() { - try { - return InetAddress.getLocalHost().getCanonicalHostName(); - } catch (UnknownHostException e) { - return "127.0.0.1"; - } - } - } - - @BeforeClass - public void parseResourceTypesFromApachePlugin() throws Exception { - resourceTypesInApachePlugin = getResourceTypesInPlugin(APACHE_PLUGIN); - platform = discoverPlatform(); - } - - @AfterClass - @Parameters({ "apache2.install.dir", "apache2.exe.path" }) - public void shutdownApache(String apacheInstallationDirectory, String exePath) throws Exception { - - //it really doesn't matter which configuration i use here - TestSetup.ApacheSetup apacheSetup = new TestSetup(DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES) - .withApacheSetup().withServerRoot(apacheInstallationDirectory).withExePath(exePath) - .withNoDeploymentOnSetup(); - apacheSetup.init(); - apacheSetup.getExecutionUtil().invokeOperation("stop"); - } +public class UpgradeTest extends UpgradeTestBase { @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) @Parameters({ "apache2.install.dir", "apache2.exe.path" }) @@ -424,62 +89,4 @@ public class UpgradeTest extends PluginContainerTest { assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'."); } } - - private ResourceType findApachePluginResourceTypeByName(String resourceTypeName) { - for (ResourceType rt : resourceTypesInApachePlugin) { - if (resourceTypeName.equals(rt.getName())) { - return rt; - } - } - - return null; - } - - private static List<ResourceType> getResourceTypesInPlugin(String pluginUri) throws Exception { - PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(new URI(pluginUri).toURL()); - PluginMetadataParser parser = new PluginMetadataParser(descriptor, - Collections.<String, PluginMetadataParser> emptyMap()); - - return parser.getAllTypes(); - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - private static Resource discoverPlatform() throws Exception { - PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(new URI(PLATFORM_PLUGIN) - .toURL()); - PluginMetadataParser parser = new PluginMetadataParser(descriptor, - Collections.<String, PluginMetadataParser> emptyMap()); - - List<ResourceType> platformTypes = parser.getAllTypes(); - - for (ResourceType rt : platformTypes) { - Class discoveryClass = Class.forName(parser.getDiscoveryComponentClass(rt)); - - ResourceDiscoveryComponent discoveryComponent = (ResourceDiscoveryComponent) discoveryClass.newInstance(); - - ResourceDiscoveryContext context = new ResourceDiscoveryContext(rt, null, null, - SystemInfoFactory.createSystemInfo(), null, null, PluginContainerDeployment.AGENT); - - Set<DiscoveredResourceDetails> results = discoveryComponent.discoverResources(context); - - if (!results.isEmpty()) { - DiscoveredResourceDetails details = results.iterator().next(); - - Resource platform = new Resource(); - - platform.setDescription(details.getResourceDescription()); - platform.setResourceKey(details.getResourceKey()); - platform.setName(details.getResourceName()); - platform.setVersion(details.getResourceVersion()); - platform.setPluginConfiguration(details.getPluginConfiguration()); - platform.setResourceType(rt); - platform.setUuid(UUID.randomUUID().toString()); - platform.setId(1); - - return platform; - } - } - - return null; - } } diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java new file mode 100644 index 0000000..2c6f4f2 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java @@ -0,0 +1,424 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache; + +import static org.testng.Assert.assertTrue; + +import java.io.File; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.net.InetAddress; +import java.net.URI; +import java.net.UnknownHostException; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + +import org.jmock.Expectations; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Parameters; + +import org.rhq.core.clientapi.agent.metadata.PluginMetadataParser; +import org.rhq.core.clientapi.descriptor.AgentPluginDescriptorUtil; +import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor; +import org.rhq.core.clientapi.server.discovery.InventoryReport; +import org.rhq.core.domain.discovery.AvailabilityReport; +import org.rhq.core.domain.resource.InventoryStatus; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceError; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pc.ServerServices; +import org.rhq.core.pc.upgrade.FakeServerInventory; +import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; +import org.rhq.core.pluginapi.inventory.PluginContainerDeployment; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.core.system.SystemInfoFactory; +import org.rhq.plugins.apache.parser.ApacheDirectiveTree; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; +import org.rhq.plugins.apache.util.ApacheExecutionUtil; +import org.rhq.plugins.apache.util.HttpdAddressUtility; +import org.rhq.test.ObjectCollectionSerializer; +import org.rhq.test.TokenReplacingReader; +import org.rhq.test.pc.PluginContainerTest; + + +/** + * Base class for the upgrade test classes. + * + * @author Lukas Krejci + */ +public class UpgradeTestBase extends PluginContainerTest { + + protected class TestSetup { + private String configurationName; + private FakeServerInventory fakeInventory = new FakeServerInventory(); + private String inventoryFile; + private Resource platform; + private ApacheSetup apacheSetup = new ApacheSetup(); + private DeploymentConfig deploymentConfig; + + public class ApacheSetup { + private String serverRoot; + private String exePath; + private Collection<String> configurationFiles; + private ApacheExecutionUtil execution; + private boolean deploy = true; + + private ApacheSetup() { + + } + + public ApacheSetup withServerRoot(String serverRoot) { + this.serverRoot = serverRoot; + return this; + } + + public ApacheSetup withExePath(String exePath) { + this.exePath = exePath; + return this; + } + + public ApacheSetup withConfigurationFiles(String... classPathUris) { + return withConfigurationFiles(Arrays.asList(classPathUris)); + } + + public ApacheSetup withConfigurationFiles(Collection<String> classPathUris) { + this.configurationFiles = classPathUris; + return this; + } + + public ApacheSetup withDeploymentOnSetup() { + this.deploy = true; + return this; + } + + public ApacheSetup withNoDeploymentOnSetup() { + this.deploy = false; + return this; + } + + public ApacheExecutionUtil getExecutionUtil() { + return execution; + } + + public void init() throws Exception { + File serverRootDir = new File(serverRoot); + + assertTrue(serverRootDir.exists(), "The configured server root denotes a non-existant directory: '" + + serverRootDir + "'."); + + File confDir = new File(serverRootDir, "conf"); + + assertTrue(confDir.exists(), + "The configured server root denotes a directory that doesn't have a 'conf' subdirectory. This is unexpected."); + + String snmpHost = null; + int snmpPort = 0; + String pingUrl = null; + + if (configurationName != null) { + if (deploy) { + ApacheDeploymentUtil.deployConfiguration(confDir, configurationFiles, deploymentConfig); + } + + HttpdAddressUtility.Address addr = deploymentConfig.mainServer.address1; + HttpdAddressUtility.Address addrToUse = new HttpdAddressUtility.Address(null, null, + HttpdAddressUtility.Address.NO_PORT_SPECIFIED_VALUE); + addrToUse.scheme = addr.scheme == null ? "http" : addr.scheme; + addrToUse.host = addr.host == null ? "localhost" : addr.host; + addrToUse.port = addr.port; + pingUrl = addrToUse.toString(); + + snmpHost = deploymentConfig.snmpHost; + snmpPort = deploymentConfig.snmpPort; + } + + execution = new ApacheExecutionUtil(findApachePluginResourceTypeByName("Apache HTTP Server"), + serverRoot, exePath, confDir.getAbsolutePath() + File.separatorChar + "httpd.conf", pingUrl, + snmpHost, snmpPort); + execution.init(); + } + + private void doSetup() throws Exception { + init(); + execution.invokeOperation("restart", "start"); + } + + public TestSetup setup() throws Exception { + return TestSetup.this.setup(); + } + } + + public TestSetup(String configurationName) { + this.configurationName = configurationName; + deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName); + } + + public TestSetup withInventoryFrom(String classPathUri) { + inventoryFile = classPathUri; + return this; + } + + public TestSetup withPlatformResource(Resource platform) { + this.platform = platform; + return this; + } + + public ApacheSetup withApacheSetup() { + return apacheSetup; + } + + public TestSetup withDefaultExpectations() throws Exception { + context.checking(new Expectations() { + { + addDefaultExceptations(this); + } + }); + + return this; + } + + @SuppressWarnings("unchecked") + public void addDefaultExceptations(Expectations expectations) throws Exception { + ServerServices ss = getCurrentPluginContainerConfiguration().getServerServices(); + + expectations.allowing(ss.getDiscoveryServerService()).mergeInventoryReport( + expectations.with(Expectations.any(InventoryReport.class))); + expectations.will(fakeInventory.mergeInventoryReport(InventoryStatus.COMMITTED)); + + expectations.allowing(ss.getDiscoveryServerService()).upgradeResources( + expectations.with(Expectations.any(Set.class))); + expectations.will(fakeInventory.upgradeResources()); + + expectations.allowing(ss.getDiscoveryServerService()).getResources( + expectations.with(Expectations.any(Set.class)), expectations.with(Expectations.any(boolean.class))); + expectations.will(fakeInventory.getResources()); + + expectations.allowing(ss.getDiscoveryServerService()).setResourceError(expectations.with(Expectations.any(ResourceError.class))); + expectations.will(fakeInventory.setResourceError()); + + expectations.allowing(ss.getDiscoveryServerService()).mergeAvailabilityReport( + expectations.with(Expectations.any(AvailabilityReport.class))); + + expectations.allowing(ss.getDiscoveryServerService()).postProcessNewlyCommittedResources( + expectations.with(Expectations.any(Set.class))); + + expectations.allowing(ss.getDiscoveryServerService()).clearResourceConfigError( + expectations.with(Expectations.any(int.class))); + + expectations.ignoring(ss.getBundleServerService()); + expectations.ignoring(ss.getConfigurationServerService()); + expectations.ignoring(ss.getContentServerService()); + expectations.ignoring(ss.getCoreServerService()); + expectations.ignoring(ss.getEventServerService()); + expectations.ignoring(ss.getMeasurementServerService()); + expectations.ignoring(ss.getOperationServerService()); + expectations.ignoring(ss.getResourceFactoryServerService()); + } + + public FakeServerInventory getFakeInventory() { + return fakeInventory; + } + + public DeploymentConfig getDeploymentConfig() { + return deploymentConfig; + } + + public TestSetup setup() throws Exception { + apacheSetup.doSetup(); + + Map<String, String> replacements = deploymentConfig.getTokenReplacements(); + replacements.put("server.root", apacheSetup.serverRoot); + replacements.put("exe.path", apacheSetup.exePath); + replacements.put("localhost", determineLocalhost()); + + HttpdAddressUtility addressUtility = apacheSetup.getExecutionUtil().getServerComponent() + .getAddressUtility(); + ApacheDirectiveTree runtimeConfig = apacheSetup.getExecutionUtil().getRuntimeConfiguration(); + + replacements.put("snmp.identifier", + addressUtility.getHttpdInternalMainServerAddressRepresentation(runtimeConfig).toString(false, false)); + + String vhost1Address = deploymentConfig.vhost1 == null ? null : deploymentConfig.vhost1.address1.toString( + false, false); + String vhost2Address = deploymentConfig.vhost2 == null ? null : deploymentConfig.vhost2.address1.toString( + false, false); + String vhost3Address = deploymentConfig.vhost3 == null ? null : deploymentConfig.vhost3.address1.toString( + false, false); + String vhost4Address = deploymentConfig.vhost4 == null ? null : deploymentConfig.vhost4.address1.toString( + false, false); + + if (vhost1Address != null) { + replacements.put( + "vhost1.snmp.identifier", + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost1Address, + deploymentConfig.vhost1.getServerName()).toString(false, false)); + } + + if (vhost2Address != null) { + replacements.put( + "vhost2.snmp.identifier", + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost2Address, + deploymentConfig.vhost2.getServerName()).toString(false, false)); + } + + if (vhost3Address != null) { + replacements.put( + "vhost3.snmp.identifier", + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost3Address, + deploymentConfig.vhost3.getServerName()).toString(false, false)); + } + + if (vhost4Address != null) { + replacements.put( + "vhost4.snmp.identifier", + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost4Address, + deploymentConfig.vhost4.getServerName()).toString(false, false)); + } + + InputStream dataStream = getClass().getResourceAsStream(inventoryFile); + + Reader rdr = new TokenReplacingReader(new InputStreamReader(dataStream), replacements); + + @SuppressWarnings("unchecked") + List<Resource> inventory = (List<Resource>) new ObjectCollectionSerializer().deserialize(rdr); + + //fix up the parent relationships, because they might not be reconstructed correctly by + //JAXB - we're missing XmlID and XmlIDRef annotations in our model + fixupParent(null, inventory); + + fakeInventory.prepopulateInventory(platform, inventory); + + return this; + } + + private void fixupParent(Resource parent, Collection<Resource> children) { + for (Resource child : children) { + child.setParentResource(parent); + if (child.getChildResources() != null) { + fixupParent(child, child.getChildResources()); + } + } + } + + private String determineLocalhost() { + try { + return InetAddress.getLocalHost().getCanonicalHostName(); + } catch (UnknownHostException e) { + return "127.0.0.1"; + } + } + } + + protected static final String PLATFORM_PLUGIN = "file:target/itest/plugins/rhq-platform-plugin-for-apache-test.jar"; + protected static final String AUGEAS_PLUGIN = "file:target/itest/plugins/rhq-augeas-plugin-for-apache-test.jar"; + protected static final String APACHE_PLUGIN = "file:target/itest/plugins/rhq-apache-plugin-for-apache-test.jar"; + + protected static final String DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES = "simpleWithResolvableServerNames"; + protected static final String DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES = "simpleWithUnresolvableServerNames"; + + private List<ResourceType> resourceTypesInApachePlugin; + protected Resource platform; + + @BeforeClass + public void parseResourceTypesFromApachePlugin() throws Exception { + resourceTypesInApachePlugin = getResourceTypesInPlugin(APACHE_PLUGIN); + platform = discoverPlatform(); + } + + @AfterClass + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void shutdownApache(String apacheInstallationDirectory, String exePath) throws Exception { + + //it really doesn't matter which configuration i use here + TestSetup.ApacheSetup apacheSetup = new TestSetup(DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES) + .withApacheSetup().withServerRoot(apacheInstallationDirectory).withExePath(exePath) + .withNoDeploymentOnSetup(); + apacheSetup.init(); + apacheSetup.getExecutionUtil().invokeOperation("stop"); + } + + protected ResourceType findApachePluginResourceTypeByName(String resourceTypeName) { + for (ResourceType rt : resourceTypesInApachePlugin) { + if (resourceTypeName.equals(rt.getName())) { + return rt; + } + } + + return null; + } + + private static List<ResourceType> getResourceTypesInPlugin(String pluginUri) throws Exception { + PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(new URI(pluginUri).toURL()); + PluginMetadataParser parser = new PluginMetadataParser(descriptor, + Collections.<String, PluginMetadataParser> emptyMap()); + + return parser.getAllTypes(); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + private static Resource discoverPlatform() throws Exception { + PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(new URI(PLATFORM_PLUGIN) + .toURL()); + PluginMetadataParser parser = new PluginMetadataParser(descriptor, + Collections.<String, PluginMetadataParser> emptyMap()); + + List<ResourceType> platformTypes = parser.getAllTypes(); + + for (ResourceType rt : platformTypes) { + Class discoveryClass = Class.forName(parser.getDiscoveryComponentClass(rt)); + + ResourceDiscoveryComponent discoveryComponent = (ResourceDiscoveryComponent) discoveryClass.newInstance(); + + ResourceDiscoveryContext context = new ResourceDiscoveryContext(rt, null, null, + SystemInfoFactory.createSystemInfo(), null, null, PluginContainerDeployment.AGENT); + + Set<DiscoveredResourceDetails> results = discoveryComponent.discoverResources(context); + + if (!results.isEmpty()) { + DiscoveredResourceDetails details = results.iterator().next(); + + Resource platform = new Resource(); + + platform.setDescription(details.getResourceDescription()); + platform.setResourceKey(details.getResourceKey()); + platform.setName(details.getResourceName()); + platform.setVersion(details.getResourceVersion()); + platform.setPluginConfiguration(details.getPluginConfiguration()); + platform.setResourceType(rt); + platform.setUuid(UUID.randomUUID().toString()); + platform.setId(1); + + return platform; + } + } + + return null; + } + +} commit 3cef7ad8dda423efd80d35d2adfb809bad934824 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jun 20 16:07:00 2011 +0200 Moving the TokenReplacingReader to test-utils, because it's a generic thing that can be reused by others. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java index 5bbdb11..861c5e8 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java @@ -74,9 +74,9 @@ import org.rhq.plugins.apache.util.ApacheExecutionUtil; import org.rhq.plugins.apache.util.HttpdAddressUtility; import org.rhq.plugins.apache.util.MockApacheBinaryInfo; import org.rhq.plugins.apache.util.MockProcessInfo; -import org.rhq.plugins.apache.util.TokenReplacingReader; import org.rhq.plugins.platform.PlatformComponent; import org.rhq.test.ObjectCollectionSerializer; +import org.rhq.test.TokenReplacingReader; import org.rhq.test.pc.PluginContainerSetup; import org.rhq.test.pc.PluginContainerTest; diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java index 3893b56..524370e 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java @@ -35,6 +35,7 @@ import org.apache.commons.logging.LogFactory; import org.unitils.thirdparty.org.apache.commons.io.FileUtils; import org.rhq.plugins.apache.util.HttpdAddressUtility.Address; +import org.rhq.test.TokenReplacingReader; /** * diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/TokenReplacingReader.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/TokenReplacingReader.java deleted file mode 100644 index 7ebf48b..0000000 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/TokenReplacingReader.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.plugins.apache.util; - -import java.io.IOException; -import java.io.PushbackReader; -import java.io.Reader; -import java.nio.CharBuffer; -import java.util.Map; - -/** - * Copied from http://tutorials.jenkov.com/java-howto/replace-strings-in-streams-arrays-fi… - * with fixes to {@link #read(char[], int, int)} and added support for escaping. - * - * @author Lukas Krejci - */ -public class TokenReplacingReader extends Reader { - - private PushbackReader pushbackReader = null; - private Map<String, String> tokens = null; - private StringBuilder tokenNameBuffer = new StringBuilder(); - private String tokenValue = null; - private int tokenValueIndex = 0; - private boolean escaping = false; - - public TokenReplacingReader(Reader source, Map<String, String> tokens) { - this.pushbackReader = new PushbackReader(source, 2); - this.tokens = tokens; - } - - public int read(CharBuffer target) throws IOException { - throw new RuntimeException("Operation Not Supported"); - } - - public int read() throws IOException { - if (this.tokenValue != null) { - if (this.tokenValueIndex < this.tokenValue.length()) { - return this.tokenValue.charAt(this.tokenValueIndex++); - } - if (this.tokenValueIndex == this.tokenValue.length()) { - this.tokenValue = null; - this.tokenValueIndex = 0; - } - } - - int data = this.pushbackReader.read(); - - if (escaping) { - escaping = false; - return data; - } - - if (data == '\\') { - escaping = true; - return data; - } - - if (data != '$') - return data; - - data = this.pushbackReader.read(); - if (data != '{') { - this.pushbackReader.unread(data); - return '$'; - } - this.tokenNameBuffer.delete(0, this.tokenNameBuffer.length()); - - data = this.pushbackReader.read(); - while (data != '}') { - this.tokenNameBuffer.append((char) data); - data = this.pushbackReader.read(); - } - - this.tokenValue = tokens.get(this.tokenNameBuffer.toString()); - - if (this.tokenValue == null) { - this.tokenValue = "${" + this.tokenNameBuffer.toString() + "}"; - } - - if (!this.tokenValue.isEmpty()) { - return this.tokenValue.charAt(this.tokenValueIndex++); - } else { - return read(); - } - } - - public int read(char cbuf[]) throws IOException { - return read(cbuf, 0, cbuf.length); - } - - public int read(char cbuf[], int off, int len) throws IOException { - int i = 0; - for (; i < len; i++) { - int nextChar = read(); - if (nextChar == -1) { - if (i == 0) { - i = -1; - } - break; - } - cbuf[off + i] = (char) nextChar; - } - return i; - } - - public void close() throws IOException { - this.pushbackReader.close(); - } - - public long skip(long n) throws IOException { - throw new RuntimeException("Operation Not Supported"); - } - - public boolean ready() throws IOException { - return this.pushbackReader.ready(); - } - - public boolean markSupported() { - return false; - } - - public void mark(int readAheadLimit) throws IOException { - throw new RuntimeException("Operation Not Supported"); - } - - public void reset() throws IOException { - throw new RuntimeException("Operation Not Supported"); - } -} diff --git a/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java b/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java new file mode 100644 index 0000000..22a3167 --- /dev/null +++ b/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java @@ -0,0 +1,146 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.test; + +import java.io.IOException; +import java.io.PushbackReader; +import java.io.Reader; +import java.nio.CharBuffer; +import java.util.Map; + +/** + * Copied from http://tutorials.jenkov.com/java-howto/replace-strings-in-streams-arrays-fi… + * with fixes to {@link #read(char[], int, int)} and added support for escaping. + * + * @author Lukas Krejci + */ +public class TokenReplacingReader extends Reader { + + private PushbackReader pushbackReader = null; + private Map<String, String> tokens = null; + private StringBuilder tokenNameBuffer = new StringBuilder(); + private String tokenValue = null; + private int tokenValueIndex = 0; + private boolean escaping = false; + + public TokenReplacingReader(Reader source, Map<String, String> tokens) { + this.pushbackReader = new PushbackReader(source, 2); + this.tokens = tokens; + } + + public int read(CharBuffer target) throws IOException { + throw new RuntimeException("Operation Not Supported"); + } + + public int read() throws IOException { + if (this.tokenValue != null) { + if (this.tokenValueIndex < this.tokenValue.length()) { + return this.tokenValue.charAt(this.tokenValueIndex++); + } + if (this.tokenValueIndex == this.tokenValue.length()) { + this.tokenValue = null; + this.tokenValueIndex = 0; + } + } + + int data = this.pushbackReader.read(); + + if (escaping) { + escaping = false; + return data; + } + + if (data == '\\') { + escaping = true; + return data; + } + + if (data != '$') + return data; + + data = this.pushbackReader.read(); + if (data != '{') { + this.pushbackReader.unread(data); + return '$'; + } + this.tokenNameBuffer.delete(0, this.tokenNameBuffer.length()); + + data = this.pushbackReader.read(); + while (data != '}') { + this.tokenNameBuffer.append((char) data); + data = this.pushbackReader.read(); + } + + this.tokenValue = tokens.get(this.tokenNameBuffer.toString()); + + if (this.tokenValue == null) { + this.tokenValue = "${" + this.tokenNameBuffer.toString() + "}"; + } + + if (!this.tokenValue.isEmpty()) { + return this.tokenValue.charAt(this.tokenValueIndex++); + } else { + return read(); + } + } + + public int read(char cbuf[]) throws IOException { + return read(cbuf, 0, cbuf.length); + } + + public int read(char cbuf[], int off, int len) throws IOException { + int i = 0; + for (; i < len; i++) { + int nextChar = read(); + if (nextChar == -1) { + if (i == 0) { + i = -1; + } + break; + } + cbuf[off + i] = (char) nextChar; + } + return i; + } + + public void close() throws IOException { + this.pushbackReader.close(); + } + + public long skip(long n) throws IOException { + throw new RuntimeException("Operation Not Supported"); + } + + public boolean ready() throws IOException { + return this.pushbackReader.ready(); + } + + public boolean markSupported() { + return false; + } + + public void mark(int readAheadLimit) throws IOException { + throw new RuntimeException("Operation Not Supported"); + } + + public void reset() throws IOException { + throw new RuntimeException("Operation Not Supported"); + } +} commit 558acc8ac6475c1729864a9b4259ac154f4df6b4 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jun 20 16:02:24 2011 +0200 The agents will report plugin config errors with inventory as we have it in the apache tests. Expect that. diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java index fd07d72..5f8a922 100644 --- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java +++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java @@ -126,6 +126,27 @@ public class FakeServerInventory { }; } + public synchronized CustomAction setResourceError() { + return new CustomAction("setResourceError") { + public Object invoke(Invocation invocation) throws Throwable { + synchronized(FakeServerInventory.this) { + throwIfFailing(); + + ResourceError error = (ResourceError) invocation.getParameter(0); + + Resource serverSideResource = resourceStore.get(error.getResource().getUuid()); + + if (serverSideResource != null) { + List<ResourceError> currentErrors = serverSideResource.getResourceErrors(); + currentErrors.add(error); + } + + return null; + } + } + }; + } + public synchronized CustomAction upgradeResources() { return new CustomAction("upgradeServerSideInventory") { @SuppressWarnings({ "serial", "unchecked" }) diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java index c1725c3..5bbdb11 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java @@ -55,6 +55,7 @@ import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.discovery.AvailabilityReport; import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceError; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pc.ServerServices; import org.rhq.core.pc.upgrade.FakeServerInventory; @@ -242,6 +243,9 @@ public class UpgradeTest extends PluginContainerTest { expectations.with(Expectations.any(Set.class)), expectations.with(Expectations.any(boolean.class))); expectations.will(fakeInventory.getResources()); + expectations.allowing(ss.getDiscoveryServerService()).setResourceError(expectations.with(Expectations.any(ResourceError.class))); + expectations.will(fakeInventory.setResourceError()); + expectations.allowing(ss.getDiscoveryServerService()).mergeAvailabilityReport( expectations.with(Expectations.any(AvailabilityReport.class))); @@ -250,7 +254,7 @@ public class UpgradeTest extends PluginContainerTest { expectations.allowing(ss.getDiscoveryServerService()).clearResourceConfigError( expectations.with(Expectations.any(int.class))); - + expectations.ignoring(ss.getBundleServerService()); expectations.ignoring(ss.getConfigurationServerService()); expectations.ignoring(ss.getContentServerService()); commit e50c68fa724b66bfb7460859f2774a62797d0e8f Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jun 20 16:01:27 2011 +0200 Catch the exceptions when activating the resources after the resource upgrade. diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeDelegate.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeDelegate.java index 915c8e0..c659b8e 100644 --- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeDelegate.java +++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/upgrade/ResourceUpgradeDelegate.java @@ -36,6 +36,7 @@ import org.rhq.core.domain.resource.ResourceUpgradeReport; import org.rhq.core.pc.PluginContainer; import org.rhq.core.pc.inventory.InventoryManager; import org.rhq.core.pc.inventory.ResourceContainer; +import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException; import org.rhq.core.pluginapi.inventory.ResourceComponent; import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; @@ -212,7 +213,13 @@ public class ResourceUpgradeDelegate { ResourceContainer container = inventoryManager.getResourceContainer(request.getResourceId()); if (container != null) { Resource resource = container.getResource(); - inventoryManager.activateResource(resource, container, true); + try { + inventoryManager.activateResource(resource, container, true); + } catch (InvalidPluginConfigurationException e) { + log.debug("Resource [" + resource + "] failed to start up after upgrade.", e); + } catch (Throwable t) { + log.error("Failed to activate the resource [" + resource + "] after upgrade.", t); + } } } } catch (Throwable t) { commit fb6e7aaf4e43359f9ede3969902386ba75e7f7a1 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jun 20 16:00:20 2011 +0200 Server never deletes resources based on their absence in the reports from the agents. Behave the same in the fake server inventory. diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java index 0f13e29..fd07d72 100644 --- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java +++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java @@ -286,8 +286,7 @@ public class FakeServerInventory { persisted.setParentResource(parent); } - Set<Resource> childResources = new HashSet<Resource>(); - persisted.setChildResources(childResources); + Set<Resource> childResources = persisted.getChildResources(); for (Resource child : agentSideResource.getChildResources()) { childResources.add(fakePersist(child, requiredInventoryStatus, inProgressUUIds)); } commit cf93304d2d42acae6f8ce42be44a5e72a3268066 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri Jun 17 16:42:47 2011 +0200 Don't assume that the httpd conf path is absolute - it isn't in the RHQ 1.x inventories. This fix is needed to correctly upgrade from RHQ 1.x to RHQ 4.1.x. diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java index 08ff372..565fd3c 100644 --- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java +++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java @@ -645,6 +645,14 @@ public class ApacheServerDiscoveryComponent implements ResourceDiscoveryComponen public static String formatResourceKey(String serverRoot, String httpdConf) { serverRoot = FileUtils.getCanonicalPath(serverRoot); + + //we could have inherited the configuration from + //RHQ 1.x times, when the httpdConf was relative. + File httpdConfF = new File(httpdConf); + if (!httpdConfF.isAbsolute()) { + httpdConfF = new File(serverRoot, httpdConf); + httpdConf = httpdConfF.getAbsolutePath(); + } httpdConf = FileUtils.getCanonicalPath(httpdConf); return serverRoot + "||" + httpdConf; commit abe95cffc03171ef2f9e602ba9788f33180e60d0 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri Jun 17 16:41:40 2011 +0200 Always include scheme in the main server sample address. This fix is needed due to changes made in the address utility to support the comprehensive plugin tests. diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java index 45f883d..874d4e3 100644 --- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java +++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java @@ -328,6 +328,9 @@ public enum HttpdAddressUtility { for (Address address : addressesToMatch) { if (isAddressConforming(address, limitToHost, limitToPort, false)) { substituteWildcards(ag, address); + if (address.scheme == null) { + address.scheme = "http"; + } return address; } } commit e1fce148784f05f121f8250665a0404eb3900d01 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri Jun 17 16:40:32 2011 +0200 More work on the apache tests infrastructure. The execution of the operations and working with the apache server resource component has been abstracted out into standalone class so that we can do more tricks. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java index 2492cb7..c1725c3 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java @@ -23,10 +23,14 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import java.io.File; +import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; +import java.net.InetAddress; import java.net.URI; +import java.net.UnknownHostException; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -59,11 +63,16 @@ import org.rhq.core.pluginapi.inventory.PluginContainerDeployment; import org.rhq.core.pluginapi.inventory.ResourceContext; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.core.system.ProcessInfo; import org.rhq.core.system.SystemInfo; import org.rhq.core.system.SystemInfoFactory; +import org.rhq.plugins.apache.parser.ApacheDirectiveTree; import org.rhq.plugins.apache.util.ApacheDeploymentUtil; import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; +import org.rhq.plugins.apache.util.ApacheExecutionUtil; import org.rhq.plugins.apache.util.HttpdAddressUtility; +import org.rhq.plugins.apache.util.MockApacheBinaryInfo; +import org.rhq.plugins.apache.util.MockProcessInfo; import org.rhq.plugins.apache.util.TokenReplacingReader; import org.rhq.plugins.platform.PlatformComponent; import org.rhq.test.ObjectCollectionSerializer; @@ -88,26 +97,20 @@ public class UpgradeTest extends PluginContainerTest { private Resource platform; - private static class DiscoveryInput { - public String serverRootPath; - public String exePath; - public String httpdConfPath; - public String snmpHost; - public int snmpPort; - public String pingUrl; - } - private class TestSetup { private String configurationName; private FakeServerInventory fakeInventory = new FakeServerInventory(); private String inventoryFile; private Resource platform; private ApacheSetup apacheSetup = new ApacheSetup(); + private DeploymentConfig deploymentConfig; public class ApacheSetup { private String serverRoot; private String exePath; private Collection<String> configurationFiles; + private ApacheExecutionUtil execution; + private boolean deploy = true; private ApacheSetup() { @@ -132,65 +135,71 @@ public class UpgradeTest extends PluginContainerTest { return this; } - private void doSetup() throws Exception { - prepareApacheForTest(TestSetup.this.configurationName, serverRoot, exePath, configurationFiles); + public ApacheSetup withDeploymentOnSetup() { + this.deploy = true; + return this; } - public TestSetup setup() throws Exception { - return TestSetup.this.setup(); + public ApacheSetup withNoDeploymentOnSetup() { + this.deploy = false; + return this; } - private void prepareApacheForTest(String configurationName, String apacheInstallationDirectory, - String apacheExePath, Collection<String> configurationFiles) throws Exception { - File apacheInstallationDir = new File(apacheInstallationDirectory); + public ApacheExecutionUtil getExecutionUtil() { + return execution; + } - assertTrue(apacheInstallationDir.exists(), - "The 'apache2.install.dir' system property denotes a non-existant directory: '" - + apacheInstallationDirectory + "'."); + public void init() throws Exception { + File serverRootDir = new File(serverRoot); - File confDir = new File(apacheInstallationDir, "conf"); + assertTrue(serverRootDir.exists(), "The configured server root denotes a non-existant directory: '" + + serverRootDir + "'."); - assertTrue( - confDir.exists(), - "The 'apache2.install.dir' system property denotes a directory that doesn't have a 'conf' subdirectory. This is unexpected."); + File confDir = new File(serverRootDir, "conf"); - DeploymentConfig deploymentConfig = ApacheDeploymentUtil - .getDeploymentConfigurationFromSystemProperties(configurationName); + assertTrue(confDir.exists(), + "The configured server root denotes a directory that doesn't have a 'conf' subdirectory. This is unexpected."); - ApacheDeploymentUtil.deployConfiguration(confDir, configurationFiles, deploymentConfig); + String snmpHost = null; + int snmpPort = 0; + String pingUrl = null; - DiscoveryInput discoveryInput = new DiscoveryInput(); - discoveryInput.serverRootPath = apacheInstallationDirectory; - discoveryInput.exePath = apacheExePath; - discoveryInput.httpdConfPath = confDir.getAbsolutePath() + File.separatorChar + "httpd.conf"; - discoveryInput.snmpHost = deploymentConfig.snmpHost; - discoveryInput.snmpPort = deploymentConfig.snmpPort; + if (configurationName != null) { + if (deploy) { + ApacheDeploymentUtil.deployConfiguration(confDir, configurationFiles, deploymentConfig); + } - HttpdAddressUtility.Address addr = deploymentConfig.mainServer.address1; - HttpdAddressUtility.Address addrToUse = new HttpdAddressUtility.Address(null, null, - HttpdAddressUtility.Address.NO_PORT_SPECIFIED_VALUE); - addrToUse.scheme = addr.scheme == null ? "http" : addr.scheme; - addrToUse.host = addr.host == null ? "localhost" : addr.host; - addrToUse.port = addr.port; + HttpdAddressUtility.Address addr = deploymentConfig.mainServer.address1; + HttpdAddressUtility.Address addrToUse = new HttpdAddressUtility.Address(null, null, + HttpdAddressUtility.Address.NO_PORT_SPECIFIED_VALUE); + addrToUse.scheme = addr.scheme == null ? "http" : addr.scheme; + addrToUse.host = addr.host == null ? "localhost" : addr.host; + addrToUse.port = addr.port; + pingUrl = addrToUse.toString(); - discoveryInput.pingUrl = addrToUse.toString(); + snmpHost = deploymentConfig.snmpHost; + snmpPort = deploymentConfig.snmpPort; + } - restartApache(discoveryInput); + execution = new ApacheExecutionUtil(findApachePluginResourceTypeByName("Apache HTTP Server"), + serverRoot, exePath, confDir.getAbsolutePath() + File.separatorChar + "httpd.conf", pingUrl, + snmpHost, snmpPort); + execution.init(); } - private void restartApache(DiscoveryInput discoveryInput) throws Exception { - ApacheServerComponent serverComponent = findAndStartServerComponent(discoveryInput); + private void doSetup() throws Exception { + init(); + execution.invokeOperation("restart", "start"); + } - try { - serverComponent.invokeOperation("restart", null); - } catch (Exception e) { - serverComponent.invokeOperation("start", null); - } + public TestSetup setup() throws Exception { + return TestSetup.this.setup(); } } public TestSetup(String configurationName) { this.configurationName = configurationName; + deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName); } public TestSetup withInventoryFrom(String classPathUri) { @@ -220,28 +229,97 @@ public class UpgradeTest extends PluginContainerTest { @SuppressWarnings("unchecked") public void addDefaultExceptations(Expectations expectations) throws Exception { ServerServices ss = getCurrentPluginContainerConfiguration().getServerServices(); - - expectations.allowing(ss.getDiscoveryServerService()).mergeInventoryReport(expectations.with(Expectations.any(InventoryReport.class))); + + expectations.allowing(ss.getDiscoveryServerService()).mergeInventoryReport( + expectations.with(Expectations.any(InventoryReport.class))); expectations.will(fakeInventory.mergeInventoryReport(InventoryStatus.COMMITTED)); - expectations.allowing(ss.getDiscoveryServerService()).upgradeResources(expectations.with(Expectations.any(Set.class))); + expectations.allowing(ss.getDiscoveryServerService()).upgradeResources( + expectations.with(Expectations.any(Set.class))); expectations.will(fakeInventory.upgradeResources()); - - expectations.allowing(ss.getDiscoveryServerService()).getResources(expectations.with(Expectations.any(Set.class)), expectations.with(Expectations.any(boolean.class))); + + expectations.allowing(ss.getDiscoveryServerService()).getResources( + expectations.with(Expectations.any(Set.class)), expectations.with(Expectations.any(boolean.class))); expectations.will(fakeInventory.getResources()); - - expectations.allowing(ss.getDiscoveryServerService()).mergeAvailabilityReport(expectations.with(Expectations.any(AvailabilityReport.class))); - expectations.allowing(ss.getDiscoveryServerService()).postProcessNewlyCommittedResources(expectations.with(Expectations.any(Set.class))); + + expectations.allowing(ss.getDiscoveryServerService()).mergeAvailabilityReport( + expectations.with(Expectations.any(AvailabilityReport.class))); + + expectations.allowing(ss.getDiscoveryServerService()).postProcessNewlyCommittedResources( + expectations.with(Expectations.any(Set.class))); + + expectations.allowing(ss.getDiscoveryServerService()).clearResourceConfigError( + expectations.with(Expectations.any(int.class))); + + expectations.ignoring(ss.getBundleServerService()); + expectations.ignoring(ss.getConfigurationServerService()); + expectations.ignoring(ss.getContentServerService()); + expectations.ignoring(ss.getCoreServerService()); + expectations.ignoring(ss.getEventServerService()); + expectations.ignoring(ss.getMeasurementServerService()); + expectations.ignoring(ss.getOperationServerService()); + expectations.ignoring(ss.getResourceFactoryServerService()); } - + public FakeServerInventory getFakeInventory() { return fakeInventory; } + public DeploymentConfig getDeploymentConfig() { + return deploymentConfig; + } + public TestSetup setup() throws Exception { - Map<String, String> replacements = new HashMap<String, String>(); + apacheSetup.doSetup(); + + Map<String, String> replacements = deploymentConfig.getTokenReplacements(); replacements.put("server.root", apacheSetup.serverRoot); replacements.put("exe.path", apacheSetup.exePath); + replacements.put("localhost", determineLocalhost()); + + HttpdAddressUtility addressUtility = apacheSetup.getExecutionUtil().getServerComponent() + .getAddressUtility(); + ApacheDirectiveTree runtimeConfig = apacheSetup.getExecutionUtil().getRuntimeConfiguration(); + + replacements.put("snmp.identifier", + addressUtility.getHttpdInternalMainServerAddressRepresentation(runtimeConfig).toString(false, false)); + + String vhost1Address = deploymentConfig.vhost1 == null ? null : deploymentConfig.vhost1.address1.toString( + false, false); + String vhost2Address = deploymentConfig.vhost2 == null ? null : deploymentConfig.vhost2.address1.toString( + false, false); + String vhost3Address = deploymentConfig.vhost3 == null ? null : deploymentConfig.vhost3.address1.toString( + false, false); + String vhost4Address = deploymentConfig.vhost4 == null ? null : deploymentConfig.vhost4.address1.toString( + false, false); + + if (vhost1Address != null) { + replacements.put( + "vhost1.snmp.identifier", + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost1Address, + deploymentConfig.vhost1.getServerName()).toString(false, false)); + } + + if (vhost2Address != null) { + replacements.put( + "vhost2.snmp.identifier", + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost2Address, + deploymentConfig.vhost2.getServerName()).toString(false, false)); + } + + if (vhost3Address != null) { + replacements.put( + "vhost3.snmp.identifier", + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost3Address, + deploymentConfig.vhost3.getServerName()).toString(false, false)); + } + + if (vhost4Address != null) { + replacements.put( + "vhost4.snmp.identifier", + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost4Address, + deploymentConfig.vhost4.getServerName()).toString(false, false)); + } InputStream dataStream = getClass().getResourceAsStream(inventoryFile); @@ -249,18 +327,16 @@ public class UpgradeTest extends PluginContainerTest { @SuppressWarnings("unchecked") List<Resource> inventory = (List<Resource>) new ObjectCollectionSerializer().deserialize(rdr); - + //fix up the parent relationships, because they might not be reconstructed correctly by //JAXB - we're missing XmlID and XmlIDRef annotations in our model fixupParent(null, inventory); - - fakeInventory.prepopulateInventory(platform, inventory); - apacheSetup.doSetup(); + fakeInventory.prepopulateInventory(platform, inventory); return this; } - + private void fixupParent(Resource parent, Collection<Resource> children) { for (Resource child : children) { child.setParentResource(parent); @@ -269,6 +345,14 @@ public class UpgradeTest extends PluginContainerTest { } } } + + private String determineLocalhost() { + try { + return InetAddress.getLocalHost().getCanonicalHostName(); + } catch (UnknownHostException e) { + return "127.0.0.1"; + } + } } @BeforeClass @@ -281,32 +365,12 @@ public class UpgradeTest extends PluginContainerTest { @Parameters({ "apache2.install.dir", "apache2.exe.path" }) public void shutdownApache(String apacheInstallationDirectory, String exePath) throws Exception { - File apacheInstallationDir = new File(apacheInstallationDirectory); - File confDir = new File(apacheInstallationDir, "conf"); - //it really doesn't matter which configuration i use here - DeploymentConfig deploymentConfig = ApacheDeploymentUtil - .getDeploymentConfigurationFromSystemProperties(DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES); - - DiscoveryInput discoveryInput = new DiscoveryInput(); - discoveryInput.serverRootPath = apacheInstallationDirectory; - discoveryInput.exePath = exePath; - discoveryInput.httpdConfPath = confDir.getAbsolutePath() + File.separatorChar + "httpd.conf"; - discoveryInput.snmpHost = deploymentConfig.snmpHost; - discoveryInput.snmpPort = deploymentConfig.snmpPort; - - HttpdAddressUtility.Address addr = deploymentConfig.mainServer.address1; - HttpdAddressUtility.Address addrToUse = new HttpdAddressUtility.Address(null, null, - HttpdAddressUtility.Address.NO_PORT_SPECIFIED_VALUE); - addrToUse.scheme = addr.scheme == null ? "http" : addr.scheme; - addrToUse.host = addr.host == null ? "localhost" : addr.host; - addrToUse.port = addr.port; - - discoveryInput.pingUrl = addrToUse.toString(); - - ApacheServerComponent serverComponent = findAndStartServerComponent(discoveryInput); - - serverComponent.invokeOperation("stop", null); + TestSetup.ApacheSetup apacheSetup = new TestSetup(DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES) + .withApacheSetup().withServerRoot(apacheInstallationDirectory).withExePath(exePath) + .withNoDeploymentOnSetup(); + apacheSetup.init(); + apacheSetup.getExecutionUtil().invokeOperation("stop"); } @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) @@ -338,7 +402,23 @@ public class UpgradeTest extends PluginContainerTest { assertEquals(server.getResourceKey(), expectedResourceKey, "The server resource key doesn't seem to be upgraded."); - //TODO test the vhosts + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertTrue(vhosts.size() == 5, "There should be 5 vhosts discovered but found " + vhosts.size()); + + List<String> expectedResourceKeys = new ArrayList<String>(5); + + DeploymentConfig dc = setup.getDeploymentConfig(); + + expectedResourceKeys.add(ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey(dc.vhost1.getServerName(), dc.vhost1.getAddresses())); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey(dc.vhost2.getServerName(), dc.vhost2.getAddresses())); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey(dc.vhost3.getServerName(), dc.vhost3.getAddresses())); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey(dc.vhost4.getServerName(), dc.vhost4.getAddresses())); + + for(Resource vhost : vhosts) { + assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'."); + } } private ResourceType findApachePluginResourceTypeByName(String resourceTypeName) { @@ -391,46 +471,11 @@ public class UpgradeTest extends PluginContainerTest { platform.setResourceType(rt); platform.setUuid(UUID.randomUUID().toString()); platform.setId(1); - + return platform; } } return null; } - - private ApacheServerComponent findAndStartServerComponent(DiscoveryInput discoveryInput) throws Exception { - ApacheServerDiscoveryComponent discoveryComponent = new ApacheServerDiscoveryComponent(); - - ResourceType resourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); - SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); - - ResourceDiscoveryContext<PlatformComponent> discoveryContext = new ResourceDiscoveryContext<PlatformComponent>( - resourceType, null, null, systemInfo, null, null, PluginContainerDeployment.AGENT); - - Configuration config = discoveryContext.getDefaultPluginConfiguration(); - config.put(new PropertySimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_SERVER_ROOT, - discoveryInput.serverRootPath)); - config - .put(new PropertySimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_EXECUTABLE_PATH, discoveryInput.exePath)); - config - .put(new PropertySimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_HTTPD_CONF, discoveryInput.httpdConfPath)); - config - .put(new PropertySimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_SNMP_AGENT_HOST, discoveryInput.snmpHost)); - config - .put(new PropertySimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_SNMP_AGENT_PORT, discoveryInput.snmpPort)); - config.put(new PropertySimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_URL, discoveryInput.pingUrl)); - - DiscoveredResourceDetails result = discoveryComponent.discoverResource(config, discoveryContext); - - ApacheServerComponent serverComponent = new ApacheServerComponent(); - - Resource resource = new Resource(result.getResourceKey(), null, resourceType); - resource.setPluginConfiguration(config); - ResourceContext<PlatformComponent> resourceContext = new ResourceContext<PlatformComponent>(resource, null, - null, systemInfo, null, null, null, null, null, null, null, null); - - serverComponent.start(resourceContext); - return serverComponent; - } } diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java index 2a19526..3893b56 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java @@ -49,6 +49,7 @@ public class ApacheDeploymentUtil { private static final String SERVER_ROOT = "server.root"; private static final String ADDITIONAL_DIRECTIVES = "additional.directives"; private static final String SERVERNAME_DIRECTIVE = "servername.directive"; + private static final String SERVERNAME = "servername"; private static final String LISTEN4 = "listen4"; private static final String LISTEN3 = "listen3"; private static final String LISTEN2 = "listen2"; @@ -71,6 +72,41 @@ public class ApacheDeploymentUtil { public String serverNameDirective = null; public final List<String> additionalDirectives = new ArrayList<String>(); + public String getServerName() { + String serverName = null; + if (serverNameDirective != null) { + int startIdx = serverNameDirective.indexOf(' '); + if (startIdx >= 0) { + while (serverNameDirective.charAt(startIdx) == ' ') { + ++startIdx; + } + + serverName = serverNameDirective.substring(startIdx); + serverName = serverName.trim(); + } + } + + return serverName; + } + + public List<String> getAddresses() { + ArrayList<String> ret = new ArrayList<String>(); + if (address1 != null) { + ret.add(address1.toString()); + } + if (address2 != null) { + ret.add(address2.toString()); + } + if (address3 != null) { + ret.add(address3.toString()); + } + if (address4 != null) { + ret.add(address4.toString()); + } + + return ret; + } + private void addToTokenReplacements(int ordinal, Map<String, String> tokenReplacements) { String prefix = null; @@ -82,6 +118,11 @@ public class ApacheDeploymentUtil { tokenReplacements.put(prefix + SERVERNAME_DIRECTIVE, serverNameDirective == null ? "" : serverNameDirective); + String serverName = getServerName(); + if (serverName != null) { + tokenReplacements.put(prefix + SERVERNAME, serverName); + } + String dirs = ""; if (!additionalDirectives.isEmpty()) { String newline = System.getProperty("line.separator"); diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java new file mode 100644 index 0000000..e8b5e51 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java @@ -0,0 +1,147 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.util; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.resource.ProcessScan; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; +import org.rhq.core.pluginapi.inventory.PluginContainerDeployment; +import org.rhq.core.pluginapi.inventory.ProcessScanResult; +import org.rhq.core.pluginapi.inventory.ResourceContext; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.core.system.ProcessInfo; +import org.rhq.core.system.SystemInfo; +import org.rhq.core.system.SystemInfoFactory; +import org.rhq.core.system.pquery.ProcessInfoQuery; +import org.rhq.plugins.apache.ApacheServerComponent; +import org.rhq.plugins.apache.ApacheServerDiscoveryComponent; +import org.rhq.plugins.apache.parser.ApacheDirectiveTree; +import org.rhq.plugins.platform.PlatformComponent; + +/** + * + * + * @author Lukas Krejci + */ +public class ApacheExecutionUtil { + + private ResourceType apacheServerResourceType; + private ApacheServerComponent serverComponent; + private ResourceContext<PlatformComponent> resourceContext; + private String serverRootPath; + private String exePath; + private String httpdConfPath; + private String snmpHost; + private int snmpPort; + private String pingUrl; + + public ApacheExecutionUtil(ResourceType apacheServerResourceType, String serverRootPath, String exePath, + String httpdConfPath, String pingUrl, String snmpHost, int snmpPort) { + + this.apacheServerResourceType = apacheServerResourceType; + this.serverRootPath = serverRootPath; + this.exePath = exePath; + this.httpdConfPath = httpdConfPath; + this.snmpHost = snmpHost; + this.snmpPort = snmpPort; + this.pingUrl = pingUrl; + } + + public void init() throws Exception { + ApacheServerDiscoveryComponent discoveryComponent = new ApacheServerDiscoveryComponent(); + + SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); + + ResourceDiscoveryContext<PlatformComponent> discoveryContext = new ResourceDiscoveryContext<PlatformComponent>( + apacheServerResourceType, null, null, systemInfo, scanProcesses(systemInfo), null, + PluginContainerDeployment.AGENT); + + Configuration config = discoveryContext.getDefaultPluginConfiguration(); + config.put(new PropertySimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_SERVER_ROOT, serverRootPath)); + config.put(new PropertySimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_EXECUTABLE_PATH, exePath)); + config.put(new PropertySimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_HTTPD_CONF, httpdConfPath)); + config.put(new PropertySimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_SNMP_AGENT_HOST, snmpHost)); + config.put(new PropertySimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_SNMP_AGENT_PORT, snmpPort)); + config.put(new PropertySimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_URL, pingUrl)); + + DiscoveredResourceDetails result = discoveryComponent.discoverResource(config, discoveryContext); + + serverComponent = new ApacheServerComponent(); + + Resource resource = new Resource(result.getResourceKey(), null, apacheServerResourceType); + resource.setPluginConfiguration(config); + resourceContext = new ResourceContext<PlatformComponent>(resource, null, + discoveryComponent, systemInfo, null, null, null, null, null, null, null, null); + + serverComponent.start(resourceContext); + } + + public void invokeOperation(String... operationAndBackupOpsInCaseOfFailure) throws Exception { + Exception lastError = null; + for (String op : operationAndBackupOpsInCaseOfFailure) { + try { + serverComponent.invokeOperation(op, new Configuration()); + return; + } catch (Exception e) { + lastError = e; + } + } + + throw lastError; + } + + public ResourceContext<PlatformComponent> getResourceContext() { + return resourceContext; + } + + public ApacheDirectiveTree getRuntimeConfiguration() { + ApacheDirectiveTree config = serverComponent.loadParser(); + return RuntimeApacheConfiguration.extract(config, resourceContext.getNativeProcess(), new ApacheBinaryInfo( + exePath), serverComponent.getModuleNames(), true); + } + + public ApacheServerComponent getServerComponent() { + return serverComponent; + } + + private List<ProcessScanResult> scanProcesses(SystemInfo systemInfo) { + List<ProcessScanResult> scanResults = new ArrayList<ProcessScanResult>(); + Set<ProcessScan> processScans = apacheServerResourceType.getProcessScans(); + if (processScans != null && !processScans.isEmpty()) { + ProcessInfoQuery piq = new ProcessInfoQuery(systemInfo.getAllProcesses()); + for (ProcessScan processScan : processScans) { + List<ProcessInfo> queryResults = piq.query(processScan.getQuery()); + if ((queryResults != null) && (queryResults.size() > 0)) { + for (ProcessInfo autoDiscoveredProcess : queryResults) { + scanResults.add(new ProcessScanResult(processScan, autoDiscoveredProcess)); + } + } + } + } + return scanResults; + } +} commit 76a248c78fe8f104cc6305613a82d1fccf468d07 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri Jun 17 16:37:37 2011 +0200 Don't create a new collection whenever Configuration.getProperties() is called. We can get away with just a single instance. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java index ce88dce..099041c 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java @@ -156,6 +156,82 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM @XmlTransient private Map<String, Property> properties = new LinkedHashMap<String, Property>(); + private class PropertiesProxy implements Collection<Property> { + + public int size() { + return properties.size(); + } + + public boolean isEmpty() { + return properties.isEmpty(); + } + + public boolean contains(Object o) { + return properties.containsValue(o); + } + + public Iterator<Property> iterator() { + return properties.values().iterator(); + } + + public Object[] toArray() { + return properties.values().toArray(); + } + + public <T> T[] toArray(T[] a) { + return properties.values().toArray(a); + } + + public boolean add(Property e) { + put(e); + return true; //we always allow adding an element even if it is already present + } + + public boolean remove(Object o) { + return properties.values().remove(o); + } + + public boolean containsAll(Collection<?> c) { + return properties.values().containsAll(c); + } + + public boolean addAll(Collection<? extends Property> c) { + boolean ret = false; + for(Property p : c) { + ret = ret || add(p); + } + + return ret; + } + + public boolean removeAll(Collection<?> c) { + boolean ret = false; + for(Object o : c) { + ret = ret || remove(o); + } + + return ret; + } + + public boolean retainAll(Collection<?> c) { + boolean ret = false; + ArrayList<Property> ps = new ArrayList<Property>(properties.values()); + for(Property p : ps) { + if (!c.contains(p)) { + ret = ret || remove(p); + } + } + + return ret; + } + + public void clear() { + properties.clear(); + } + } + + private transient PropertiesProxy propertiesProxy = new PropertiesProxy(); + @OneToMany(mappedBy = "configuration", fetch = FetchType.EAGER) @Cascade( { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.DELETE_ORPHAN }) private Set<RawConfiguration> rawConfigurations = new HashSet<RawConfiguration>(); @@ -337,79 +413,7 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM @XmlElementRef(name = "PropertySimple", type = PropertySimple.class), @XmlElementRef(name = "PropertyMap", type = PropertyMap.class) }) public Collection<Property> getProperties() { - return new Collection<Property>() { - - public int size() { - return properties.size(); - } - - public boolean isEmpty() { - return properties.isEmpty(); - } - - public boolean contains(Object o) { - return properties.containsValue(o); - } - - public Iterator<Property> iterator() { - return properties.values().iterator(); - } - - public Object[] toArray() { - return properties.values().toArray(); - } - - public <T> T[] toArray(T[] a) { - return properties.values().toArray(a); - } - - public boolean add(Property e) { - put(e); - return true; //we always allow adding an element even if it is already present - } - - public boolean remove(Object o) { - return properties.values().remove(o); - } - - public boolean containsAll(Collection<?> c) { - return properties.values().containsAll(c); - } - - public boolean addAll(Collection<? extends Property> c) { - boolean ret = false; - for(Property p : c) { - ret = ret || add(p); - } - - return ret; - } - - public boolean removeAll(Collection<?> c) { - boolean ret = false; - for(Object o : c) { - ret = ret || remove(o); - } - - return ret; - } - - public boolean retainAll(Collection<?> c) { - boolean ret = false; - ArrayList<Property> ps = new ArrayList<Property>(properties.values()); - for(Property p : ps) { - if (!c.contains(p)) { - ret = ret || remove(p); - } - } - - return ret; - } - - public void clear() { - properties.clear(); - } - }; + return propertiesProxy; } public void setProperties(Collection<Property> properties) { commit bc40722aaf2000731f003968bd97a3b09247c304 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Jun 16 12:17:01 2011 +0200 Modifying the basic apache test to shutdown the plugin container after its finished and not to pollute the source dir outside of target directory. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java index 5a6cc7e..af99d04 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java @@ -25,7 +25,10 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; + +import org.testng.annotations.AfterClass; import org.testng.annotations.AfterSuite; +import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeSuite; import org.testng.annotations.Test; import org.rhq.core.clientapi.server.discovery.InventoryReport; @@ -50,16 +53,19 @@ import org.rhq.core.pluginapi.measurement.MeasurementFacet; public class ApachePluginTest { private static final String PLUGIN_NAME = "Apache"; - @BeforeSuite + @BeforeClass public void start() { //System.out.println("java.class.path=" + System.getProperty("java.class.path")); //System.out.println("java.library.path=" + System.getProperty("java.library.path")); try { File pluginDir = new File("target/itest/plugins"); + File dataDir = new File("target/itest/plugins-data"); + dataDir.mkdir(); PluginContainerConfiguration pcConfig = new PluginContainerConfiguration(); pcConfig.setPluginFinder(new FileSystemPluginFinder(pluginDir)); pcConfig.setPluginDirectory(pluginDir); - + pcConfig.setDataDirectory(dataDir); + pcConfig.setInsideAgent(false); PluginContainer.getInstance().setConfiguration(pcConfig); PluginContainer container = PluginContainer.getInstance(); @@ -77,7 +83,7 @@ public class ApachePluginTest { } } - @AfterSuite + @AfterClass public void stop() { PluginContainer.getInstance().shutdown(); } commit ec20fdd0a1645d47461922553c1aed0a9c2bf01f Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Jun 16 12:15:36 2011 +0200 removing a temp file diff --git a/modules/helpers/inventory-serializer/inventory-rhq-1.3.0.xml b/modules/helpers/inventory-serializer/inventory-rhq-1.3.0.xml deleted file mode 100644 index 792c742..0000000 --- a/modules/helpers/inventory-serializer/inventory-rhq-1.3.0.xml +++ /dev/null @@ -1,544 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<inventory-dump> -<classes-used> -<class>org.rhq.core.domain.resource.Resource</class> -</classes-used> -<objects> - -<resource> - <id>10004</id> - <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> - <resourceKey>/home/metlos/Progs/apache-2.2.17/build</resourceKey> - <name>localhost.localdomain Apache 2.2.17 (/home/metlos/Progs/apache-2.2.17/build/)</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>true</connected> - <version>2.2.17</version> - <description>Apache Web Server</description> - <ctime>1307353451273</ctime> - <mtime>1307353509168</mtime> - <itime>1307353509168</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVER</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <description>an Apache HTTP Server instance</description> - <id>10013</id> - <name>Apache HTTP Server</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <id>10012</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>true</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10142</id> - <version>0</version> - <ctime>1307353451273</ctime> - <mtime>1307353451273</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10073</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353737118</ctime> - <mtime>1307353737118</mtime> - <propertySimple> - <id>10365</id> - <name>errorLogMinimumSeverity</name> - <override>false</override> - <stringValue>error</stringValue> - </propertySimple> - <propertySimple> - <id>10366</id> - <name>errorLogIncludesPattern</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10367</id> - <name>snmpAgentCommunity</name> - <override>false</override> - <stringValue>public</stringValue> - </propertySimple> - <propertySimple> - <id>10368</id> - <name>errorLogFilePath</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10369</id> - <name>errorLogEventsEnabled</name> - <override>false</override> - <stringValue>false</stringValue> - </propertySimple> - <propertySimple> - <id>10370</id> - <name>snmpAgentHost</name> - <override>false</override> - <stringValue>127.0.0.1</stringValue> - </propertySimple> - <propertySimple> - <id>10713</id> - <name>controlScriptPath</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10714</id> - <name>url</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10364</id> - <name>configFile</name> - <override>false</override> - <stringValue>conf/httpd.conf</stringValue> - </propertySimple> - <propertySimple> - <id>10711</id> - <name>executablePath</name> - <override>false</override> - <stringValue>/home/metlos/Progs/apache-2.2.17/build/bin/httpd</stringValue> - </propertySimple> - <propertySimple> - <id>10712</id> - <name>snmpAgentPort</name> - <override>false</override> - <stringValue>1610</stringValue> - </propertySimple> - <propertySimple> - <id>10715</id> - <name>serverRoot</name> - <override>false</override> - <stringValue>/home/metlos/Progs/apache-2.2.17/build</stringValue> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - <productVersion> - <id>10003</id> - </productVersion> -</resource> - -<resource> - <id>10021</id> - <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> - <resourceKey>127.0.0.1:11676</resourceKey> - <name>Virtual Host 127.0.0.1:11676</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587648</ctime> - <mtime>1307353587648</mtime> - <itime>1307353587648</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <id>10013</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10135</id> - <version>0</version> - <ctime>1307353587666</ctime> - <mtime>1307353587666</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10136</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587667</ctime> - <mtime>1307353587667</mtime> - <propertySimple> - <id>10685</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10684</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/127.0.0.111676_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10687</id> - <name>url</name> - <override>false</override> - <stringValue>http://127.0.0.1:11676/</stringValue> - </propertySimple> - <propertySimple> - <id>10688</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>4</stringValue> - </propertySimple> - <propertySimple> - <id>10686</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10022</id> - <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> - <resourceKey>localhost.localdomain:0</resourceKey> - <name>Virtual Host localhost.localdomain:0</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587727</ctime> - <mtime>1307353587727</mtime> - <itime>1307353587721</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <id>10013</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10137</id> - <version>0</version> - <ctime>1307353587728</ctime> - <mtime>1307353587728</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10138</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587728</ctime> - <mtime>1307353587728</mtime> - <propertySimple> - <id>10690</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10689</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain0_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10692</id> - <name>url</name> - <override>false</override> - <stringValue>http://localhost.localdomain:0/</stringValue> - </propertySimple> - <propertySimple> - <id>10693</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>1</stringValue> - </propertySimple> - <propertySimple> - <id>10691</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>DOWN</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10023</id> - <uuid>c62c5d75-81dd-4b14-a768-2d8c1fca6c88</uuid> - <resourceKey>127.0.0.1:11677</resourceKey> - <name>Virtual Host 127.0.0.1:11677</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587738</ctime> - <mtime>1307353587738</mtime> - <itime>1307353587737</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <id>10013</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10139</id> - <version>0</version> - <ctime>1307353587738</ctime> - <mtime>1307353587738</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10140</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587738</ctime> - <mtime>1307353587738</mtime> - <propertySimple> - <id>10695</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10694</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/127.0.0.111677_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10697</id> - <name>url</name> - <override>false</override> - <stringValue>http://127.0.0.1:11677/</stringValue> - </propertySimple> - <propertySimple> - <id>10698</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>3</stringValue> - </propertySimple> - <propertySimple> - <id>10696</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10024</id> - <uuid>d1b59168-8666-4bc0-957e-171bf16eec73</uuid> - <resourceKey>127.0.0.1:11675</resourceKey> - <name>Virtual Host 127.0.0.1:11675</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587751</ctime> - <mtime>1307353587751</mtime> - <itime>1307353587750</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <id>10013</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10171</id> - <version>0</version> - <ctime>1307353587751</ctime> - <mtime>1307353587751</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10172</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587751</ctime> - <mtime>1307353587751</mtime> - <propertySimple> - <id>10700</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10699</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/127.0.0.111675_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10702</id> - <name>url</name> - <override>false</override> - <stringValue>http://127.0.0.1:11675/</stringValue> - </propertySimple> - <propertySimple> - <id>10703</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>5</stringValue> - </propertySimple> - <propertySimple> - <id>10701</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10025</id> - <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> - <resourceKey>127.0.0.1:11678</resourceKey> - <name>Virtual Host 127.0.0.1:11678</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587761</ctime> - <mtime>1307353587761</mtime> - <itime>1307353587760</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <id>10013</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10173</id> - <version>0</version> - <ctime>1307353587761</ctime> - <mtime>1307353587761</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10174</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587761</ctime> - <mtime>1307353587761</mtime> - <propertySimple> - <id>10705</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10704</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/127.0.0.111678_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10707</id> - <name>url</name> - <override>false</override> - <stringValue>http://127.0.0.1:11678/</stringValue> - </propertySimple> - <propertySimple> - <id>10708</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>2</stringValue> - </propertySimple> - <propertySimple> - <id>10706</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> -</objects> -</inventory-dump> commit da3f626dae8ac26fbd9e8acc985a60dad0418f95 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Jun 16 12:08:06 2011 +0200 regenerated the persisted inventory to include the child resources so that it is more easily reconstructed in the proper resource hierarchy. diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java index 1daad90..0f13e29 100644 --- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java +++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java @@ -84,8 +84,9 @@ public class FakeServerInventory { } public synchronized void prepopulateInventory(Resource platform, Collection<Resource> topLevelServers) { - this.platform = platform; + this.platform = fakePersist(platform, InventoryStatus.COMMITTED, new HashSet<String>()); for (Resource res : topLevelServers) { + res.setParentResource(this.platform); fakePersist(res, InventoryStatus.COMMITTED, new HashSet<String>()); } } @@ -277,8 +278,10 @@ public class FakeServerInventory { Resource parent = agentSideResource.getParentResource(); if (parent != null && parent != Resource.ROOT) { - persisted.setParentResource(fakePersist(agentSideResource.getParentResource(), requiredInventoryStatus, - inProgressUUIds)); + parent = fakePersist(agentSideResource.getParentResource(), requiredInventoryStatus, + inProgressUUIds); + persisted.setParentResource(parent); + parent.getChildResources().add(persisted); } else { persisted.setParentResource(parent); } diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java index e539eaa..2492cb7 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java @@ -23,7 +23,6 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import java.io.File; -import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; @@ -35,9 +34,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; - -import javax.xml.bind.JAXBException; -import javax.xml.stream.XMLStreamException; +import java.util.UUID; import org.jmock.Expectations; import org.testng.annotations.AfterClass; @@ -48,10 +45,10 @@ import org.testng.annotations.Test; import org.rhq.core.clientapi.agent.metadata.PluginMetadataParser; import org.rhq.core.clientapi.descriptor.AgentPluginDescriptorUtil; import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor; -import org.rhq.core.clientapi.server.discovery.InvalidInventoryReportException; import org.rhq.core.clientapi.server.discovery.InventoryReport; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.discovery.AvailabilityReport; import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; @@ -78,7 +75,7 @@ import org.rhq.test.pc.PluginContainerTest; * * @author Lukas Krejci */ -@Test +@Test(groups = "apache-integration-tests") public class UpgradeTest extends PluginContainerTest { private static final String PLATFORM_PLUGIN = "file:target/itest/plugins/rhq-platform-plugin-for-apache-test.jar"; @@ -211,21 +208,32 @@ public class UpgradeTest extends PluginContainerTest { } public TestSetup withDefaultExpectations() throws Exception { - final ServerServices ss = getCurrentPluginContainerConfiguration().getServerServices(); - context.checking(new Expectations() { { - allowing(ss.getDiscoveryServerService()).mergeInventoryReport(with(any(InventoryReport.class))); - will(fakeInventory.mergeInventoryReport(InventoryStatus.COMMITTED)); - - allowing(ss.getDiscoveryServerService()).upgradeResources(with(any(Set.class))); - will(fakeInventory.upgradeResources()); + addDefaultExceptations(this); } }); return this; } + @SuppressWarnings("unchecked") + public void addDefaultExceptations(Expectations expectations) throws Exception { + ServerServices ss = getCurrentPluginContainerConfiguration().getServerServices(); + + expectations.allowing(ss.getDiscoveryServerService()).mergeInventoryReport(expectations.with(Expectations.any(InventoryReport.class))); + expectations.will(fakeInventory.mergeInventoryReport(InventoryStatus.COMMITTED)); + + expectations.allowing(ss.getDiscoveryServerService()).upgradeResources(expectations.with(Expectations.any(Set.class))); + expectations.will(fakeInventory.upgradeResources()); + + expectations.allowing(ss.getDiscoveryServerService()).getResources(expectations.with(Expectations.any(Set.class)), expectations.with(Expectations.any(boolean.class))); + expectations.will(fakeInventory.getResources()); + + expectations.allowing(ss.getDiscoveryServerService()).mergeAvailabilityReport(expectations.with(Expectations.any(AvailabilityReport.class))); + expectations.allowing(ss.getDiscoveryServerService()).postProcessNewlyCommittedResources(expectations.with(Expectations.any(Set.class))); + } + public FakeServerInventory getFakeInventory() { return fakeInventory; } @@ -241,14 +249,26 @@ public class UpgradeTest extends PluginContainerTest { @SuppressWarnings("unchecked") List<Resource> inventory = (List<Resource>) new ObjectCollectionSerializer().deserialize(rdr); - - fakeInventory = new FakeServerInventory(); + + //fix up the parent relationships, because they might not be reconstructed correctly by + //JAXB - we're missing XmlID and XmlIDRef annotations in our model + fixupParent(null, inventory); + fakeInventory.prepopulateInventory(platform, inventory); apacheSetup.doSetup(); return this; } + + private void fixupParent(Resource parent, Collection<Resource> children) { + for (Resource child : children) { + child.setParentResource(parent); + if (child.getChildResources() != null) { + fixupParent(child, child.getChildResources()); + } + } + } } @BeforeClass @@ -312,11 +332,11 @@ public class UpgradeTest extends PluginContainerTest { Resource server = servers.iterator().next(); -// String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(apacheInstallationDirectory, -// apacheInstallationDirectory + "/conf/httpd.conf"); -// -// assertEquals(server.getResourceKey(), expectedResourceKey, -// "The server resource key doesn't seem to be upgraded."); + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(apacheInstallationDirectory, + apacheInstallationDirectory + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); //TODO test the vhosts } @@ -369,7 +389,9 @@ public class UpgradeTest extends PluginContainerTest { platform.setVersion(details.getResourceVersion()); platform.setPluginConfiguration(details.getPluginConfiguration()); platform.setResourceType(rt); - + platform.setUuid(UUID.randomUUID().toString()); + platform.setId(1); + return platform; } } diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/generating.query b/modules/plugins/apache/src/test/resources/mocked-inventories/generating.query new file mode 100644 index 0000000..f7f3140 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/generating.query @@ -0,0 +1 @@ +SELECT DISTINCT r FROM org.rhq.core.domain.resource.Resource r INNER JOIN FETCH r.pluginConfiguration INNER JOIN FETCH r.resourceConfiguration INNER JOIN FETCH r.childResources ch INNER JOIN FETCH ch.pluginConfiguration INNER JOIN FETCH ch.resourceConfiguration WHERE r.resourceType.name = 'Apache HTTP Server' diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory.xml index 1aabda1..c3a82eb 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory.xml @@ -9,7 +9,7 @@ <id>10004</id> <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> <resourceKey>${server.root}</resourceKey> - <name>localhost.localdomain Apache 2.2.17 (${server.root}/)</name> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> <inventoryStatus>COMMITTED</inventoryStatus> <connected>true</connected> <version>2.2.17</version> @@ -37,6 +37,411 @@ <singleton>false</singleton> <supportsManualAdd>true</supportsManualAdd> </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${localhost}:0</resourceKey> + <name>Virtual Host ${localhost}:0</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10021</id> + <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> + <resourceKey>${vhost2.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587648</ctime> + <mtime>1307353587648</mtime> + <itime>1307353587648</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10135</id> + <version>0</version> + <ctime>1307353587666</ctime> + <mtime>1307353587666</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10136</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587667</ctime> + <mtime>1307353587667</mtime> + <propertySimple> + <id>10685</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10684</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10687</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10688</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>4</stringValue> + </propertySimple> + <propertySimple> + <id>10686</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10023</id> + <uuid>c62c5d75-81dd-4b14-a768-2d8c1fca6c88</uuid> + <resourceKey>${vhost3.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <itime>1307353587737</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10139</id> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10140</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <propertySimple> + <id>10695</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10694</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10697</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10698</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>3</stringValue> + </propertySimple> + <propertySimple> + <id>10696</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10024</id> + <uuid>d1b59168-8666-4bc0-957e-171bf16eec73</uuid> + <resourceKey>${vhost1.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost1.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <itime>1307353587750</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10171</id> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10172</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <propertySimple> + <id>10700</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10699</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10702</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost1.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10703</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>5</stringValue> + </propertySimple> + <propertySimple> + <id>10701</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>${vhost4.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> <resourceConfiguration> <id>10142</id> <version>0</version> @@ -130,415 +535,5 @@ <id>10003</id> </productVersion> </resource> - -<resource> - <id>10021</id> - <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> - <resourceKey>127.0.0.1:11676</resourceKey> - <name>Virtual Host 127.0.0.1:11676</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587648</ctime> - <mtime>1307353587648</mtime> - <itime>1307353587648</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <id>10013</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10135</id> - <version>0</version> - <ctime>1307353587666</ctime> - <mtime>1307353587666</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10136</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587667</ctime> - <mtime>1307353587667</mtime> - <propertySimple> - <id>10685</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10684</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>${server.root}/logs/127.0.0.111676_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10687</id> - <name>url</name> - <override>false</override> - <stringValue>http://127.0.0.1:11676/</stringValue> - </propertySimple> - <propertySimple> - <id>10688</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>4</stringValue> - </propertySimple> - <propertySimple> - <id>10686</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10022</id> - <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> - <resourceKey>localhost.localdomain:0</resourceKey> - <name>Virtual Host localhost.localdomain:0</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587727</ctime> - <mtime>1307353587727</mtime> - <itime>1307353587721</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <id>10013</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10137</id> - <version>0</version> - <ctime>1307353587728</ctime> - <mtime>1307353587728</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10138</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587728</ctime> - <mtime>1307353587728</mtime> - <propertySimple> - <id>10690</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10689</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>${server.root}/logs/localhost.localdomain0_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10692</id> - <name>url</name> - <override>false</override> - <stringValue>http://localhost.localdomain:0/</stringValue> - </propertySimple> - <propertySimple> - <id>10693</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>1</stringValue> - </propertySimple> - <propertySimple> - <id>10691</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>DOWN</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10023</id> - <uuid>c62c5d75-81dd-4b14-a768-2d8c1fca6c88</uuid> - <resourceKey>127.0.0.1:11677</resourceKey> - <name>Virtual Host 127.0.0.1:11677</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587738</ctime> - <mtime>1307353587738</mtime> - <itime>1307353587737</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <id>10013</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10139</id> - <version>0</version> - <ctime>1307353587738</ctime> - <mtime>1307353587738</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10140</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587738</ctime> - <mtime>1307353587738</mtime> - <propertySimple> - <id>10695</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10694</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>${server.root}/logs/127.0.0.111677_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10697</id> - <name>url</name> - <override>false</override> - <stringValue>http://127.0.0.1:11677/</stringValue> - </propertySimple> - <propertySimple> - <id>10698</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>3</stringValue> - </propertySimple> - <propertySimple> - <id>10696</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10024</id> - <uuid>d1b59168-8666-4bc0-957e-171bf16eec73</uuid> - <resourceKey>127.0.0.1:11675</resourceKey> - <name>Virtual Host 127.0.0.1:11675</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587751</ctime> - <mtime>1307353587751</mtime> - <itime>1307353587750</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <id>10013</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10171</id> - <version>0</version> - <ctime>1307353587751</ctime> - <mtime>1307353587751</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10172</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587751</ctime> - <mtime>1307353587751</mtime> - <propertySimple> - <id>10700</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10699</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10702</id> - <name>url</name> - <override>false</override> - <stringValue>http://127.0.0.1:11675/</stringValue> - </propertySimple> - <propertySimple> - <id>10703</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>5</stringValue> - </propertySimple> - <propertySimple> - <id>10701</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10025</id> - <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> - <resourceKey>127.0.0.1:11678</resourceKey> - <name>Virtual Host 127.0.0.1:11678</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587761</ctime> - <mtime>1307353587761</mtime> - <itime>1307353587760</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <id>10013</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10173</id> - <version>0</version> - <ctime>1307353587761</ctime> - <mtime>1307353587761</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10174</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587761</ctime> - <mtime>1307353587761</mtime> - <propertySimple> - <id>10705</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10704</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10707</id> - <name>url</name> - <override>false</override> - <stringValue>http://127.0.0.1:11678/</stringValue> - </propertySimple> - <propertySimple> - <id>10708</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>2</stringValue> - </propertySimple> - <propertySimple> - <id>10706</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> </objects> </inventory-dump> commit a1ddb9d7b527d3f8fe05c88831637add713a0e17 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Jun 16 12:03:14 2011 +0200 Fixing the implementation of the proxy collection of configuration properties returned from Configuration.getProperties() diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java index cf1ce4e..ce88dce 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java @@ -364,8 +364,7 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM } public boolean add(Property e) { - properties.put(e.getName(), e); - e.setConfiguration(Configuration.this); + put(e); return true; //we always allow adding an element even if it is already present } @@ -374,7 +373,7 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM } public boolean containsAll(Collection<?> c) { - return false; + return properties.values().containsAll(c); } public boolean addAll(Collection<? extends Property> c) { commit d4e6f85418ff299734a3fa719c2ef4c216760c03 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed Jun 15 10:35:25 2011 +0200 refactoring the token replacement in the config and inventory export files to be more efficient. everything should ready for the actual tests now diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java index d3b54aa..1daad90 100644 --- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java +++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java @@ -26,11 +26,13 @@ package org.rhq.core.pc.upgrade; import static org.testng.Assert.fail; import java.lang.reflect.Field; +import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashSet; +import java.util.List; import java.util.Map; import java.util.Set; @@ -81,6 +83,13 @@ public class FakeServerInventory { this.failing = failing; } + public synchronized void prepopulateInventory(Resource platform, Collection<Resource> topLevelServers) { + this.platform = platform; + for (Resource res : topLevelServers) { + fakePersist(res, InventoryStatus.COMMITTED, new HashSet<String>()); + } + } + public synchronized CustomAction mergeInventoryReport(final InventoryStatus requiredInventoryStatus) { return new CustomAction("updateServerSideInventory") { public Object invoke(Invocation invocation) throws Throwable { @@ -248,6 +257,9 @@ public class FakeServerInventory { } if (persisted == null) { persisted = new Resource(); + if (agentSideResource.getId() != 0 && counter < agentSideResource.getId()) { + counter = agentSideResource.getId() - 1; + } persisted.setId(++counter); persisted.setUuid(agentSideResource.getUuid()); resourceStore.put(persisted.getUuid(), persisted); diff --git a/modules/helpers/inventory-serializer/inventory-rhq-1.3.0.xml b/modules/helpers/inventory-serializer/inventory-rhq-1.3.0.xml new file mode 100644 index 0000000..792c742 --- /dev/null +++ b/modules/helpers/inventory-serializer/inventory-rhq-1.3.0.xml @@ -0,0 +1,544 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>/home/metlos/Progs/apache-2.2.17/build</resourceKey> + <name>localhost.localdomain Apache 2.2.17 (/home/metlos/Progs/apache-2.2.17/build/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>127.0.0.1</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/bin/httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>/home/metlos/Progs/apache-2.2.17/build</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> + +<resource> + <id>10021</id> + <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> + <resourceKey>127.0.0.1:11676</resourceKey> + <name>Virtual Host 127.0.0.1:11676</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587648</ctime> + <mtime>1307353587648</mtime> + <itime>1307353587648</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10135</id> + <version>0</version> + <ctime>1307353587666</ctime> + <mtime>1307353587666</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10136</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587667</ctime> + <mtime>1307353587667</mtime> + <propertySimple> + <id>10685</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10684</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/127.0.0.111676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10687</id> + <name>url</name> + <override>false</override> + <stringValue>http://127.0.0.1:11676/</stringValue> + </propertySimple> + <propertySimple> + <id>10688</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>4</stringValue> + </propertySimple> + <propertySimple> + <id>10686</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>localhost.localdomain:0</resourceKey> + <name>Virtual Host localhost.localdomain:0</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://localhost.localdomain:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10023</id> + <uuid>c62c5d75-81dd-4b14-a768-2d8c1fca6c88</uuid> + <resourceKey>127.0.0.1:11677</resourceKey> + <name>Virtual Host 127.0.0.1:11677</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <itime>1307353587737</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10139</id> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10140</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <propertySimple> + <id>10695</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10694</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/127.0.0.111677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10697</id> + <name>url</name> + <override>false</override> + <stringValue>http://127.0.0.1:11677/</stringValue> + </propertySimple> + <propertySimple> + <id>10698</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>3</stringValue> + </propertySimple> + <propertySimple> + <id>10696</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10024</id> + <uuid>d1b59168-8666-4bc0-957e-171bf16eec73</uuid> + <resourceKey>127.0.0.1:11675</resourceKey> + <name>Virtual Host 127.0.0.1:11675</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <itime>1307353587750</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10171</id> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10172</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <propertySimple> + <id>10700</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10699</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10702</id> + <name>url</name> + <override>false</override> + <stringValue>http://127.0.0.1:11675/</stringValue> + </propertySimple> + <propertySimple> + <id>10703</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>5</stringValue> + </propertySimple> + <propertySimple> + <id>10701</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>127.0.0.1:11678</resourceKey> + <name>Virtual Host 127.0.0.1:11678</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://127.0.0.1:11678/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> +</objects> +</inventory-dump> diff --git a/modules/helpers/inventory-serializer/inventory-rhq-2.3.0.xml b/modules/helpers/inventory-serializer/inventory-rhq-2.3.0.xml deleted file mode 100644 index b70f83e..0000000 --- a/modules/helpers/inventory-serializer/inventory-rhq-2.3.0.xml +++ /dev/null @@ -1,1423 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<inventory-dump> -<classes-used> -<class>org.rhq.core.domain.resource.Resource</class> -</classes-used> -<objects> - -<resource> - <id>10001</id> - <uuid>7e83a3c0-2b25-4631-8a69-a15fa14b5565</uuid> - <resourceKey>localhost.localdomain</resourceKey> - <name>localhost.localdomain</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version>Linux 2.6.35.13-91.fc14.i686.PAE</version> - <description>Linux Operating System</description> - <ctime>1307353451263</ctime> - <mtime>1307353509094</mtime> - <itime>1307353509094</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>PLATFORM</category> - <createDeletePolicy>BOTH</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <description>Linux Operating System</description> - <id>10003</id> - <name>Linux</name> - <plugin>Platforms</plugin> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10126</id> - <version>0</version> - <ctime>1307353451263</ctime> - <mtime>1307353451263</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10127</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353451263</ctime> - <mtime>1307353451263</mtime> - <propertyList> - <id>10582</id> - <name>logs</name> - </propertyList> - <propertySimple> - <id>10581</id> - <name>metadataCacheTimeout</name> - <override>false</override> - <stringValue>1800</stringValue> - </propertySimple> - <propertySimple> - <id>10558</id> - <name>enableContentDiscovery</name> - <override>false</override> - <stringValue>false</stringValue> - </propertySimple> - <propertySimple> - <id>10559</id> - <name>enableInternalYumServer</name> - <override>false</override> - <stringValue>false</stringValue> - </propertySimple> - <propertySimple> - <id>10560</id> - <name>yumPort</name> - <override>false</override> - <stringValue>9080</stringValue> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - <productVersion> - <id>10001</id> - </productVersion> -</resource> - -<resource> - <id>10002</id> - <uuid>aabcc93d-29cc-48f7-bfd4-73e0c319d281</uuid> - <resourceKey>localhost.localdomain RHQ Agent</resourceKey> - <name>localhost.localdomain RHQ Agent</name> - <inventoryStatus>NEW</inventoryStatus> - <connected>false</connected> - <version>1.3.1.GA</version> - <description>RHQ Management Agent</description> - <ctime>1307353451265</ctime> - <mtime>1307353451265</mtime> - <itime>1307353451262</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVER</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <description>Management Agent</description> - <id>10030</id> - <name>RHQ Agent</name> - <plugin>RHQAgent</plugin> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10128</id> - <version>0</version> - <ctime>1307353451265</ctime> - <mtime>1307353451265</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10129</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353451265</ctime> - <mtime>1307353451265</mtime> - <propertySimple> - <id>10584</id> - <name>snapshotLogEnabled</name> - <override>false</override> - <stringValue>true</stringValue> - </propertySimple> - <propertyList> - <id>10586</id> - <name>logEventSources</name> - <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="propertyMap"> - <id>10593</id> - <name>logEventSource</name> - <map> - <entry> - <key>enabled</key> - <value xsi:type="propertySimple"> - <id>10595</id> - <name>enabled</name> - <override>false</override> - <stringValue>false</stringValue> - </value> - </entry> - <entry> - <key>logFilePath</key> - <value xsi:type="propertySimple"> - <id>10594</id> - <name>logFilePath</name> - <override>false</override> - <stringValue>/home/metlos/Projects/java/jon/qa/jon/jon-server-2.3.1.GA/agent/rhq-agent/logs/command-trace.log</stringValue> - </value> - </entry> - <entry> - <key>includesPattern</key> - <value xsi:type="propertySimple"> - <id>10597</id> - <name>includesPattern</name> - <override>false</override> - </value> - </entry> - <entry> - <key>minimumSeverity</key> - <value xsi:type="propertySimple"> - <id>10598</id> - <name>minimumSeverity</name> - <override>false</override> - </value> - </entry> - <entry> - <key>dateFormat</key> - <value xsi:type="propertySimple"> - <id>10596</id> - <name>dateFormat</name> - <override>false</override> - </value> - </entry> - </map> - </list> - <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="propertyMap"> - <id>10587</id> - <name>logEventSource</name> - <map> - <entry> - <key>enabled</key> - <value xsi:type="propertySimple"> - <id>10589</id> - <name>enabled</name> - <override>false</override> - <stringValue>false</stringValue> - </value> - </entry> - <entry> - <key>logFilePath</key> - <value xsi:type="propertySimple"> - <id>10588</id> - <name>logFilePath</name> - <override>false</override> - <stringValue>/home/metlos/Projects/java/jon/qa/jon/jon-server-2.3.1.GA/agent/rhq-agent/logs/agent.log</stringValue> - </value> - </entry> - <entry> - <key>includesPattern</key> - <value xsi:type="propertySimple"> - <id>10592</id> - <name>includesPattern</name> - <override>false</override> - </value> - </entry> - <entry> - <key>minimumSeverity</key> - <value xsi:type="propertySimple"> - <id>10590</id> - <name>minimumSeverity</name> - <override>false</override> - <stringValue>ERROR</stringValue> - </value> - </entry> - <entry> - <key>dateFormat</key> - <value xsi:type="propertySimple"> - <id>10591</id> - <name>dateFormat</name> - <override>false</override> - </value> - </entry> - </map> - </list> - </propertyList> - <propertySimple> - <id>10585</id> - <name>snapshotDataEnabled</name> - <override>false</override> - <stringValue>true</stringValue> - </propertySimple> - <propertySimple> - <id>10583</id> - <name>snapshotConfigEnabled</name> - <override>false</override> - <stringValue>true</stringValue> - </propertySimple> - <propertySimple> - <id>10600</id> - <name>type</name> - <override>false</override> - <stringValue>org.mc4j.ems.connection.support.metadata.InternalVMTypeDescriptor</stringValue> - </propertySimple> - <propertySimple> - <id>10599</id> - <name>connectorAddress</name> - <override>false</override> - <stringValue>Local Connection</stringValue> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability/> - <productVersion> - <id>10002</id> - </productVersion> -</resource> - -<resource> - <id>10003</id> - <uuid>76127b54-4551-48f7-9fde-5323f9ac6162</uuid> - <resourceKey>jdbc:postgresql://127.0.0.1:5432/postgres</resourceKey> - <name>Postgres [postgres]</name> - <inventoryStatus>NEW</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Postgres relational database server</description> - <ctime>1307353451270</ctime> - <mtime>1307353451270</mtime> - <itime>1307353451262</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVER</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <description>PostgreSQL Server</description> - <id>10031</id> - <name>Postgres Server</name> - <plugin>Postgres</plugin> - <singleton>false</singleton> - <supportsManualAdd>true</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10130</id> - <version>0</version> - <ctime>1307353451270</ctime> - <mtime>1307353451270</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10141</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353451271</ctime> - <mtime>1307353451271</mtime> - <propertySimple> - <id>10602</id> - <name>port</name> - <override>false</override> - <stringValue>5432</stringValue> - </propertySimple> - <propertySimple> - <id>10603</id> - <name>db</name> - <override>false</override> - <stringValue>postgres</stringValue> - </propertySimple> - <propertySimple> - <id>10601</id> - <name>host</name> - <override>false</override> - <stringValue>127.0.0.1</stringValue> - </propertySimple> - <propertySimple> - <id>10605</id> - <name>principal</name> - <override>false</override> - <stringValue>postgres</stringValue> - </propertySimple> - <propertySimple> - <id>10608</id> - <name>configFile</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10604</id> - <name>driverClass</name> - <override>false</override> - <stringValue>org.postgresql.Driver</stringValue> - </propertySimple> - <propertySimple> - <id>10606</id> - <name>credentials</name> - <override>false</override> - <stringValue>postgres</stringValue> - </propertySimple> - <propertySimple> - <id>10607</id> - <name>pgdataDir</name> - <override>false</override> - <stringValue>/var/lib/pgsql/data</stringValue> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability/> -</resource> - -<resource> - <id>10005</id> - <uuid>c83c5747-295d-4605-b24f-33aff62839ba</uuid> - <resourceKey>virbr1</resourceKey> - <name>virbr1</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>12:2F:62:56:07:92</description> - <ctime>1307353510534</ctime> - <mtime>1307353510534</mtime> - <itime>1307353510533</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10002</id> - <name>Network Adapter</name> - <plugin>Platforms</plugin> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10144</id> - <version>0</version> - <ctime>1307353510534</ctime> - <mtime>1307353510534</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10145</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353510534</ctime> - <mtime>1307353510534</mtime> - <propertySimple> - <id>10661</id> - <name>macAddress</name> - <override>false</override> - <stringValue>12:2F:62:56:07:92</stringValue> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10006</id> - <uuid>98130e3c-5cf3-4ba1-b16a-8bb247f11496</uuid> - <resourceKey>wlan0</resourceKey> - <name>wlan0</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>00:22:FA:5F:D3:80</description> - <ctime>1307353510550</ctime> - <mtime>1307353510550</mtime> - <itime>1307353510550</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10002</id> - <name>Network Adapter</name> - <plugin>Platforms</plugin> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10146</id> - <version>0</version> - <ctime>1307353510550</ctime> - <mtime>1307353510550</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10147</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353510551</ctime> - <mtime>1307353510551</mtime> - <propertySimple> - <id>10662</id> - <name>macAddress</name> - <override>false</override> - <stringValue>00:22:FA:5F:D3:80</stringValue> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10007</id> - <uuid>4cb96df3-cc42-4f57-94cd-73cc048db673</uuid> - <resourceKey>virbr0</resourceKey> - <name>virbr0</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>6E:8F:FF:79:B9:D6</description> - <ctime>1307353510557</ctime> - <mtime>1307353510557</mtime> - <itime>1307353510557</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10002</id> - <name>Network Adapter</name> - <plugin>Platforms</plugin> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10148</id> - <version>0</version> - <ctime>1307353510557</ctime> - <mtime>1307353510557</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10149</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353510557</ctime> - <mtime>1307353510557</mtime> - <propertySimple> - <id>10663</id> - <name>macAddress</name> - <override>false</override> - <stringValue>6E:8F:FF:79:B9:D6</stringValue> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10008</id> - <uuid>4e59f9ef-fd91-4ec4-8da5-e617e4abf376</uuid> - <resourceKey>tun0</resourceKey> - <name>tun0</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>00:00:00:00:00:00</description> - <ctime>1307353510566</ctime> - <mtime>1307353510566</mtime> - <itime>1307353510565</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10002</id> - <name>Network Adapter</name> - <plugin>Platforms</plugin> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10150</id> - <version>0</version> - <ctime>1307353510566</ctime> - <mtime>1307353510566</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10151</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353510566</ctime> - <mtime>1307353510566</mtime> - <propertySimple> - <id>10664</id> - <name>macAddress</name> - <override>false</override> - <stringValue>00:00:00:00:00:00</stringValue> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10009</id> - <uuid>dd39bfe4-9368-43a9-9c25-ab5e9c2cdc6a</uuid> - <resourceKey>lo</resourceKey> - <name>lo</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>00:00:00:00:00:00</description> - <ctime>1307353510572</ctime> - <mtime>1307353510572</mtime> - <itime>1307353510572</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10002</id> - <name>Network Adapter</name> - <plugin>Platforms</plugin> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10152</id> - <version>0</version> - <ctime>1307353510572</ctime> - <mtime>1307353510572</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10153</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353510573</ctime> - <mtime>1307353510573</mtime> - <propertySimple> - <id>10665</id> - <name>macAddress</name> - <override>false</override> - <stringValue>00:00:00:00:00:00</stringValue> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10010</id> - <uuid>0c86b8a7-33b0-4b67-9178-2bb6cbd4fb34</uuid> - <resourceKey>eth0</resourceKey> - <name>eth0</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>00:1C:25:A1:F6:58</description> - <ctime>1307353510580</ctime> - <mtime>1307353510580</mtime> - <itime>1307353510579</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10002</id> - <name>Network Adapter</name> - <plugin>Platforms</plugin> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10154</id> - <version>0</version> - <ctime>1307353510580</ctime> - <mtime>1307353510580</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10155</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353510580</ctime> - <mtime>1307353510580</mtime> - <propertySimple> - <id>10666</id> - <name>macAddress</name> - <override>false</override> - <stringValue>00:1C:25:A1:F6:58</stringValue> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10011</id> - <uuid>bf1e848c-88aa-4406-bf00-bf80a1825843</uuid> - <resourceKey>/boot</resourceKey> - <name>localhost.localdomain File System (local) /boot</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>/dev/sda1: /boot</description> - <ctime>1307353510586</ctime> - <mtime>1307353510586</mtime> - <itime>1307353510586</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10004</id> - <name>File System</name> - <plugin>Platforms</plugin> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10156</id> - <version>0</version> - <ctime>1307353510586</ctime> - <mtime>1307353510586</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10157</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353510587</ctime> - <mtime>1307353510587</mtime> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10012</id> - <uuid>6a12505a-c668-447b-b178-7993554ca093</uuid> - <resourceKey>/</resourceKey> - <name>localhost.localdomain File System (local) /</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>/dev/mapper/VolGroup-lv_root: /</description> - <ctime>1307353510594</ctime> - <mtime>1307353510594</mtime> - <itime>1307353510593</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10004</id> - <name>File System</name> - <plugin>Platforms</plugin> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10158</id> - <version>0</version> - <ctime>1307353510594</ctime> - <mtime>1307353510594</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10159</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353510594</ctime> - <mtime>1307353510594</mtime> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10013</id> - <uuid>983dff97-dfc4-4ec5-97c7-e2f9287399ef</uuid> - <resourceKey>1</resourceKey> - <name>CPU 1</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version>Core(TM)2 Duo CPU T9600 @ 2.80GHz</version> - <description>Intel Core(TM)2 Duo CPU T9600 @ 2.80GHz</description> - <ctime>1307353510600</ctime> - <mtime>1307353510600</mtime> - <itime>1307353510599</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10006</id> - <name>CPU</name> - <plugin>Platforms</plugin> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10160</id> - <version>0</version> - <ctime>1307353510600</ctime> - <mtime>1307353510600</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10161</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353510600</ctime> - <mtime>1307353510600</mtime> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - <productVersion> - <id>10004</id> - </productVersion> -</resource> - -<resource> - <id>10014</id> - <uuid>fb1dd111-07ab-40f4-9040-263dc0324728</uuid> - <resourceKey>0</resourceKey> - <name>CPU 0</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version>Core(TM)2 Duo CPU T9600 @ 2.80GHz</version> - <description>Intel Core(TM)2 Duo CPU T9600 @ 2.80GHz</description> - <ctime>1307353510610</ctime> - <mtime>1307353510610</mtime> - <itime>1307353510610</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10006</id> - <name>CPU</name> - <plugin>Platforms</plugin> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10162</id> - <version>0</version> - <ctime>1307353510611</ctime> - <mtime>1307353510611</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10163</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353510611</ctime> - <mtime>1307353510611</mtime> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - <productVersion> - <id>10004</id> - </productVersion> -</resource> - -<resource> - <id>10021</id> - <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> - <resourceKey>127.0.0.1:11676</resourceKey> - <name>Virtual Host 127.0.0.1:11676</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587648</ctime> - <mtime>1307353587648</mtime> - <itime>1307353587648</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10135</id> - <version>0</version> - <ctime>1307353587666</ctime> - <mtime>1307353587666</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10136</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587667</ctime> - <mtime>1307353587667</mtime> - <propertySimple> - <id>10685</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10684</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/127.0.0.111676_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10687</id> - <name>url</name> - <override>false</override> - <stringValue>http://127.0.0.1:11676/</stringValue> - </propertySimple> - <propertySimple> - <id>10688</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>4</stringValue> - </propertySimple> - <propertySimple> - <id>10686</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10022</id> - <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> - <resourceKey>localhost.localdomain:0</resourceKey> - <name>Virtual Host localhost.localdomain:0</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587727</ctime> - <mtime>1307353587727</mtime> - <itime>1307353587721</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10137</id> - <version>0</version> - <ctime>1307353587728</ctime> - <mtime>1307353587728</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10138</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587728</ctime> - <mtime>1307353587728</mtime> - <propertySimple> - <id>10690</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10689</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain0_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10692</id> - <name>url</name> - <override>false</override> - <stringValue>http://localhost.localdomain:0/</stringValue> - </propertySimple> - <propertySimple> - <id>10693</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>1</stringValue> - </propertySimple> - <propertySimple> - <id>10691</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>DOWN</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10023</id> - <uuid>c62c5d75-81dd-4b14-a768-2d8c1fca6c88</uuid> - <resourceKey>127.0.0.1:11677</resourceKey> - <name>Virtual Host 127.0.0.1:11677</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587738</ctime> - <mtime>1307353587738</mtime> - <itime>1307353587737</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10139</id> - <version>0</version> - <ctime>1307353587738</ctime> - <mtime>1307353587738</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10140</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587738</ctime> - <mtime>1307353587738</mtime> - <propertySimple> - <id>10695</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10694</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/127.0.0.111677_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10697</id> - <name>url</name> - <override>false</override> - <stringValue>http://127.0.0.1:11677/</stringValue> - </propertySimple> - <propertySimple> - <id>10698</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>3</stringValue> - </propertySimple> - <propertySimple> - <id>10696</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10024</id> - <uuid>d1b59168-8666-4bc0-957e-171bf16eec73</uuid> - <resourceKey>127.0.0.1:11675</resourceKey> - <name>Virtual Host 127.0.0.1:11675</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587751</ctime> - <mtime>1307353587751</mtime> - <itime>1307353587750</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10171</id> - <version>0</version> - <ctime>1307353587751</ctime> - <mtime>1307353587751</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10172</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587751</ctime> - <mtime>1307353587751</mtime> - <propertySimple> - <id>10700</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10699</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/127.0.0.111675_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10702</id> - <name>url</name> - <override>false</override> - <stringValue>http://127.0.0.1:11675/</stringValue> - </propertySimple> - <propertySimple> - <id>10703</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>5</stringValue> - </propertySimple> - <propertySimple> - <id>10701</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10025</id> - <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> - <resourceKey>127.0.0.1:11678</resourceKey> - <name>Virtual Host 127.0.0.1:11678</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> - <ctime>1307353587761</ctime> - <mtime>1307353587761</mtime> - <itime>1307353587760</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10014</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10173</id> - <version>0</version> - <ctime>1307353587761</ctime> - <mtime>1307353587761</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10174</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353587761</ctime> - <mtime>1307353587761</mtime> - <propertySimple> - <id>10705</id> - <name>responseTimeUrlExcludes</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10704</id> - <name>responseTimeLogFile</name> - <override>false</override> - <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/127.0.0.111678_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10707</id> - <name>url</name> - <override>false</override> - <stringValue>http://127.0.0.1:11678/</stringValue> - </propertySimple> - <propertySimple> - <id>10708</id> - <name>snmpWwwServiceIndex</name> - <override>false</override> - <stringValue>2</stringValue> - </propertySimple> - <propertySimple> - <id>10706</id> - <name>responseTimeUrlTransforms</name> - <override>false</override> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> -</resource> - -<resource> - <id>10004</id> - <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> - <resourceKey>/home/metlos/Progs/apache-2.2.17/build</resourceKey> - <name>localhost.localdomain Apache 2.2.17 (/home/metlos/Progs/apache-2.2.17/build/)</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>true</connected> - <version>2.2.17</version> - <description>Apache Web Server</description> - <ctime>1307353451273</ctime> - <mtime>1307353509168</mtime> - <itime>1307353509168</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVER</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <description>an Apache HTTP Server instance</description> - <id>10013</id> - <name>Apache HTTP Server</name> - <plugin>Apache</plugin> - <singleton>false</singleton> - <supportsManualAdd>true</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10142</id> - <version>0</version> - <ctime>1307353451273</ctime> - <mtime>1307353451273</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10073</id> - <notes>null</notes> - <version>0</version> - <ctime>1307353737118</ctime> - <mtime>1307353737118</mtime> - <propertySimple> - <id>10365</id> - <name>errorLogMinimumSeverity</name> - <override>false</override> - <stringValue>error</stringValue> - </propertySimple> - <propertySimple> - <id>10366</id> - <name>errorLogIncludesPattern</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10367</id> - <name>snmpAgentCommunity</name> - <override>false</override> - <stringValue>public</stringValue> - </propertySimple> - <propertySimple> - <id>10368</id> - <name>errorLogFilePath</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10369</id> - <name>errorLogEventsEnabled</name> - <override>false</override> - <stringValue>false</stringValue> - </propertySimple> - <propertySimple> - <id>10370</id> - <name>snmpAgentHost</name> - <override>false</override> - <stringValue>127.0.0.1</stringValue> - </propertySimple> - <propertySimple> - <id>10713</id> - <name>controlScriptPath</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10714</id> - <name>url</name> - <override>false</override> - </propertySimple> - <propertySimple> - <id>10364</id> - <name>configFile</name> - <override>false</override> - <stringValue>conf/httpd.conf</stringValue> - </propertySimple> - <propertySimple> - <id>10711</id> - <name>executablePath</name> - <override>false</override> - <stringValue>/home/metlos/Progs/apache-2.2.17/build/bin/httpd</stringValue> - </propertySimple> - <propertySimple> - <id>10712</id> - <name>snmpAgentPort</name> - <override>false</override> - <stringValue>1610</stringValue> - </propertySimple> - <propertySimple> - <id>10715</id> - <name>serverRoot</name> - <override>false</override> - <stringValue>/home/metlos/Progs/apache-2.2.17/build</stringValue> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - <productVersion> - <id>10003</id> - </productVersion> -</resource> -</objects> -</inventory-dump> diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java index 0e798b8..e539eaa 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java @@ -19,13 +19,25 @@ package org.rhq.plugins.apache; +import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; import java.net.URI; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.xml.bind.JAXBException; +import javax.xml.stream.XMLStreamException; import org.jmock.Expectations; import org.testng.annotations.AfterClass; @@ -36,22 +48,28 @@ import org.testng.annotations.Test; import org.rhq.core.clientapi.agent.metadata.PluginMetadataParser; import org.rhq.core.clientapi.descriptor.AgentPluginDescriptorUtil; import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor; +import org.rhq.core.clientapi.server.discovery.InvalidInventoryReportException; import org.rhq.core.clientapi.server.discovery.InventoryReport; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.pc.ServerServices; +import org.rhq.core.pc.upgrade.FakeServerInventory; import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.PluginContainerDeployment; import org.rhq.core.pluginapi.inventory.ResourceContext; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.core.system.SystemInfo; import org.rhq.core.system.SystemInfoFactory; import org.rhq.plugins.apache.util.ApacheDeploymentUtil; import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; import org.rhq.plugins.apache.util.HttpdAddressUtility; +import org.rhq.plugins.apache.util.TokenReplacingReader; import org.rhq.plugins.platform.PlatformComponent; +import org.rhq.test.ObjectCollectionSerializer; import org.rhq.test.pc.PluginContainerSetup; import org.rhq.test.pc.PluginContainerTest; @@ -71,6 +89,8 @@ public class UpgradeTest extends PluginContainerTest { private List<ResourceType> resourceTypesInApachePlugin; + private Resource platform; + private static class DiscoveryInput { public String serverRootPath; public String exePath; @@ -80,28 +100,174 @@ public class UpgradeTest extends PluginContainerTest { public String pingUrl; } + private class TestSetup { + private String configurationName; + private FakeServerInventory fakeInventory = new FakeServerInventory(); + private String inventoryFile; + private Resource platform; + private ApacheSetup apacheSetup = new ApacheSetup(); + + public class ApacheSetup { + private String serverRoot; + private String exePath; + private Collection<String> configurationFiles; + + private ApacheSetup() { + + } + + public ApacheSetup withServerRoot(String serverRoot) { + this.serverRoot = serverRoot; + return this; + } + + public ApacheSetup withExePath(String exePath) { + this.exePath = exePath; + return this; + } + + public ApacheSetup withConfigurationFiles(String... classPathUris) { + return withConfigurationFiles(Arrays.asList(classPathUris)); + } + + public ApacheSetup withConfigurationFiles(Collection<String> classPathUris) { + this.configurationFiles = classPathUris; + return this; + } + + private void doSetup() throws Exception { + prepareApacheForTest(TestSetup.this.configurationName, serverRoot, exePath, configurationFiles); + } + + public TestSetup setup() throws Exception { + return TestSetup.this.setup(); + } + + private void prepareApacheForTest(String configurationName, String apacheInstallationDirectory, + String apacheExePath, Collection<String> configurationFiles) throws Exception { + File apacheInstallationDir = new File(apacheInstallationDirectory); + + assertTrue(apacheInstallationDir.exists(), + "The 'apache2.install.dir' system property denotes a non-existant directory: '" + + apacheInstallationDirectory + "'."); + + File confDir = new File(apacheInstallationDir, "conf"); + + assertTrue( + confDir.exists(), + "The 'apache2.install.dir' system property denotes a directory that doesn't have a 'conf' subdirectory. This is unexpected."); + + DeploymentConfig deploymentConfig = ApacheDeploymentUtil + .getDeploymentConfigurationFromSystemProperties(configurationName); + + ApacheDeploymentUtil.deployConfiguration(confDir, configurationFiles, deploymentConfig); + + DiscoveryInput discoveryInput = new DiscoveryInput(); + discoveryInput.serverRootPath = apacheInstallationDirectory; + discoveryInput.exePath = apacheExePath; + discoveryInput.httpdConfPath = confDir.getAbsolutePath() + File.separatorChar + "httpd.conf"; + discoveryInput.snmpHost = deploymentConfig.snmpHost; + discoveryInput.snmpPort = deploymentConfig.snmpPort; + + HttpdAddressUtility.Address addr = deploymentConfig.mainServer.address1; + HttpdAddressUtility.Address addrToUse = new HttpdAddressUtility.Address(null, null, + HttpdAddressUtility.Address.NO_PORT_SPECIFIED_VALUE); + addrToUse.scheme = addr.scheme == null ? "http" : addr.scheme; + addrToUse.host = addr.host == null ? "localhost" : addr.host; + addrToUse.port = addr.port; + + discoveryInput.pingUrl = addrToUse.toString(); + + restartApache(discoveryInput); + } + + private void restartApache(DiscoveryInput discoveryInput) throws Exception { + ApacheServerComponent serverComponent = findAndStartServerComponent(discoveryInput); + + try { + serverComponent.invokeOperation("restart", null); + } catch (Exception e) { + serverComponent.invokeOperation("start", null); + } + } + } + + public TestSetup(String configurationName) { + this.configurationName = configurationName; + } + + public TestSetup withInventoryFrom(String classPathUri) { + inventoryFile = classPathUri; + return this; + } + + public TestSetup withPlatformResource(Resource platform) { + this.platform = platform; + return this; + } + + public ApacheSetup withApacheSetup() { + return apacheSetup; + } + + public TestSetup withDefaultExpectations() throws Exception { + final ServerServices ss = getCurrentPluginContainerConfiguration().getServerServices(); + + context.checking(new Expectations() { + { + allowing(ss.getDiscoveryServerService()).mergeInventoryReport(with(any(InventoryReport.class))); + will(fakeInventory.mergeInventoryReport(InventoryStatus.COMMITTED)); + + allowing(ss.getDiscoveryServerService()).upgradeResources(with(any(Set.class))); + will(fakeInventory.upgradeResources()); + } + }); + + return this; + } + + public FakeServerInventory getFakeInventory() { + return fakeInventory; + } + + public TestSetup setup() throws Exception { + Map<String, String> replacements = new HashMap<String, String>(); + replacements.put("server.root", apacheSetup.serverRoot); + replacements.put("exe.path", apacheSetup.exePath); + + InputStream dataStream = getClass().getResourceAsStream(inventoryFile); + + Reader rdr = new TokenReplacingReader(new InputStreamReader(dataStream), replacements); + + @SuppressWarnings("unchecked") + List<Resource> inventory = (List<Resource>) new ObjectCollectionSerializer().deserialize(rdr); + + fakeInventory = new FakeServerInventory(); + fakeInventory.prepopulateInventory(platform, inventory); + + apacheSetup.doSetup(); + + return this; + } + } + @BeforeClass public void parseResourceTypesFromApachePlugin() throws Exception { - PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(new URI(APACHE_PLUGIN) - .toURL()); - PluginMetadataParser parser = new PluginMetadataParser(descriptor, - Collections.<String, PluginMetadataParser> emptyMap()); - - resourceTypesInApachePlugin = parser.getAllTypes(); + resourceTypesInApachePlugin = getResourceTypesInPlugin(APACHE_PLUGIN); + platform = discoverPlatform(); } @AfterClass @Parameters({ "apache2.install.dir", "apache2.exe.path" }) - public void shutdownApache(String apacheInstallationDirectory, - String exePath) throws Exception { - + public void shutdownApache(String apacheInstallationDirectory, String exePath) throws Exception { + File apacheInstallationDir = new File(apacheInstallationDirectory); File confDir = new File(apacheInstallationDir, "conf"); - + //it really doesn't matter which configuration i use here DeploymentConfig deploymentConfig = ApacheDeploymentUtil .getDeploymentConfigurationFromSystemProperties(DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES); - + DiscoveryInput discoveryInput = new DiscoveryInput(); discoveryInput.serverRootPath = apacheInstallationDirectory; discoveryInput.exePath = exePath; @@ -122,71 +288,93 @@ public class UpgradeTest extends PluginContainerTest { serverComponent.invokeOperation("stop", null); } - + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) @Parameters({ "apache2.install.dir", "apache2.exe.path" }) - public void testSimpleConfigurationWithResolvableServerNames_Apache2_upgradeFromRHQ1_3(String apacheInstallationDirectory, - String exePath) throws Exception { - - final ServerServices ss = getCurrentPluginContainerConfiguration().getServerServices(); - - context.checking(new Expectations() { - { - allowing(ss.getDiscoveryServerService().mergeInventoryReport(with(any(InventoryReport.class)))); - //will(/* push the mocked inventory down to the agent */); - } - }); + public void testSimpleConfigurationWithResolvableServerNames_Apache2_upgradeFromRHQ1_3( + String apacheInstallationDirectory, String exePath) throws Exception { - prepareApacheForTest(DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES, apacheInstallationDirectory, exePath, - Arrays.asList("/full-configurations/simple/httpd.conf", "/snmpd.conf")); + final TestSetup setup = new TestSetup(DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES) + .withInventoryFrom("/mocked-inventories/rhq-1.3.x/includes/inventory.xml").withPlatformResource(platform) + .withDefaultExpectations().withApacheSetup() + .withConfigurationFiles("/full-configurations/simple/httpd.conf", "/snmpd.conf", "/mime.types") + .withServerRoot(apacheInstallationDirectory).withExePath(exePath).setup(); startConfiguredPluginContainer(); - - //TODO check the results of the upgrade - } - private void prepareApacheForTest(String configurationName, String apacheInstallationDirectory, - String apacheExePath, List<String> configurationFiles) throws Exception { - File apacheInstallationDir = new File(apacheInstallationDirectory); + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); - assertTrue(apacheInstallationDir.exists(), - "The 'apache2.install.dir' system property denotes a non-existant directory: '" - + apacheInstallationDirectory + "'."); + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); - File confDir = new File(apacheInstallationDir, "conf"); + assertTrue(servers.size() == 1, "There should be exactly one apache server discovered."); - assertTrue( - confDir.exists(), - "The 'apache2.install.dir' system property denotes a directory that doesn't have a 'conf' subdirectory. This is unexpected."); + Resource server = servers.iterator().next(); - DeploymentConfig deploymentConfig = ApacheDeploymentUtil - .getDeploymentConfigurationFromSystemProperties(configurationName); +// String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(apacheInstallationDirectory, +// apacheInstallationDirectory + "/conf/httpd.conf"); +// +// assertEquals(server.getResourceKey(), expectedResourceKey, +// "The server resource key doesn't seem to be upgraded."); - ApacheDeploymentUtil.deployConfiguration(confDir, configurationFiles, deploymentConfig); + //TODO test the vhosts + } - DiscoveryInput discoveryInput = new DiscoveryInput(); - discoveryInput.serverRootPath = apacheInstallationDirectory; - discoveryInput.exePath = apacheExePath; - discoveryInput.httpdConfPath = confDir.getAbsolutePath() + File.separatorChar + "httpd.conf"; - discoveryInput.snmpHost = deploymentConfig.snmpHost; - discoveryInput.snmpPort = deploymentConfig.snmpPort; + private ResourceType findApachePluginResourceTypeByName(String resourceTypeName) { + for (ResourceType rt : resourceTypesInApachePlugin) { + if (resourceTypeName.equals(rt.getName())) { + return rt; + } + } - HttpdAddressUtility.Address addr = deploymentConfig.mainServer.address1; - HttpdAddressUtility.Address addrToUse = new HttpdAddressUtility.Address(null, null, - HttpdAddressUtility.Address.NO_PORT_SPECIFIED_VALUE); - addrToUse.scheme = addr.scheme == null ? "http" : addr.scheme; - addrToUse.host = addr.host == null ? "localhost" : addr.host; - addrToUse.port = addr.port; + return null; + } - discoveryInput.pingUrl = addrToUse.toString(); + private static List<ResourceType> getResourceTypesInPlugin(String pluginUri) throws Exception { + PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(new URI(pluginUri).toURL()); + PluginMetadataParser parser = new PluginMetadataParser(descriptor, + Collections.<String, PluginMetadataParser> emptyMap()); - restartApache(discoveryInput); + return parser.getAllTypes(); } - private void restartApache(DiscoveryInput discoveryInput) throws Exception { - ApacheServerComponent serverComponent = findAndStartServerComponent(discoveryInput); + @SuppressWarnings({ "rawtypes", "unchecked" }) + private static Resource discoverPlatform() throws Exception { + PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(new URI(PLATFORM_PLUGIN) + .toURL()); + PluginMetadataParser parser = new PluginMetadataParser(descriptor, + Collections.<String, PluginMetadataParser> emptyMap()); + + List<ResourceType> platformTypes = parser.getAllTypes(); + + for (ResourceType rt : platformTypes) { + Class discoveryClass = Class.forName(parser.getDiscoveryComponentClass(rt)); + + ResourceDiscoveryComponent discoveryComponent = (ResourceDiscoveryComponent) discoveryClass.newInstance(); + + ResourceDiscoveryContext context = new ResourceDiscoveryContext(rt, null, null, + SystemInfoFactory.createSystemInfo(), null, null, PluginContainerDeployment.AGENT); + + Set<DiscoveredResourceDetails> results = discoveryComponent.discoverResources(context); + + if (!results.isEmpty()) { + DiscoveredResourceDetails details = results.iterator().next(); + + Resource platform = new Resource(); - serverComponent.invokeOperation("restart", null); + platform.setDescription(details.getResourceDescription()); + platform.setResourceKey(details.getResourceKey()); + platform.setName(details.getResourceName()); + platform.setVersion(details.getResourceVersion()); + platform.setPluginConfiguration(details.getPluginConfiguration()); + platform.setResourceType(rt); + + return platform; + } + } + + return null; } private ApacheServerComponent findAndStartServerComponent(DiscoveryInput discoveryInput) throws Exception { @@ -223,14 +411,4 @@ public class UpgradeTest extends PluginContainerTest { serverComponent.start(resourceContext); return serverComponent; } - - private ResourceType findApachePluginResourceTypeByName(String resourceTypeName) { - for (ResourceType rt : resourceTypesInApachePlugin) { - if (resourceTypeName.equals(rt.getName())) { - return rt; - } - } - - return null; - } } diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java index 0e22cd4..2a19526 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java @@ -19,16 +19,16 @@ package org.rhq.plugins.apache.util; -import java.io.BufferedReader; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; -import java.io.Writer; import java.net.URL; import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -45,6 +45,19 @@ public class ApacheDeploymentUtil { private static final Log LOG = LogFactory.getLog(ApacheDeploymentUtil.class); + private static final String VHOST = "vhost"; + private static final String SERVER_ROOT = "server.root"; + private static final String ADDITIONAL_DIRECTIVES = "additional.directives"; + private static final String SERVERNAME_DIRECTIVE = "servername.directive"; + private static final String LISTEN4 = "listen4"; + private static final String LISTEN3 = "listen3"; + private static final String LISTEN2 = "listen2"; + private static final String LISTEN1 = "listen1"; + private static final String SNMP_PORT = "snmp.port"; + private static final String SNMP_HOST = "snmp.host"; + private static final String DOCUMENT_ROOT = "document.root"; + private static final String URLS = "urls"; + private ApacheDeploymentUtil() { } @@ -57,6 +70,48 @@ public class ApacheDeploymentUtil { public Address address4 = null; public String serverNameDirective = null; public final List<String> additionalDirectives = new ArrayList<String>(); + + private void addToTokenReplacements(int ordinal, Map<String, String> tokenReplacements) { + String prefix = null; + + if (ordinal == 0) { + prefix = ""; + } else { + prefix = VHOST + ordinal + "."; + } + + tokenReplacements.put(prefix + SERVERNAME_DIRECTIVE, serverNameDirective == null ? "" : serverNameDirective); + + String dirs = ""; + if (!additionalDirectives.isEmpty()) { + String newline = System.getProperty("line.separator"); + for(String dir : additionalDirectives) { + dirs += dir + newline; + } + } + + tokenReplacements.put(prefix + ADDITIONAL_DIRECTIVES, dirs); + + if (ordinal != 0) { + String urls = address1.toString(false, false); + if (address2 != null) { + urls += " " + address2.toString(false, false); + } + if (address3 != null) { + urls += " " + address3.toString(false, false); + } + if (address4 != null) { + urls += " " + address4.toString(false, false); + } + + tokenReplacements.put(prefix + URLS, urls); + } else { + tokenReplacements.put(LISTEN1, address1 == null ? "" : address1.toString(false, false)); + tokenReplacements.put(LISTEN2, address2 == null ? "" : address2.toString(false, false)); + tokenReplacements.put(LISTEN3, address3 == null ? "" : address3.toString(false, false)); + tokenReplacements.put(LISTEN4, address4 == null ? "" : address4.toString(false, false)); + } + } } public String serverRoot = null; @@ -74,33 +129,51 @@ public class ApacheDeploymentUtil { mainServer.address3 = new Address(null, null, Address.NO_PORT_SPECIFIED_VALUE); mainServer.address4 = new Address(null, null, Address.NO_PORT_SPECIFIED_VALUE); } + + public Map<String, String> getTokenReplacements() { + HashMap<String, String> ret = new HashMap<String, String>(); + + ret.put(SERVER_ROOT, serverRoot == null ? "" : serverRoot); + ret.put(DOCUMENT_ROOT, documentRoot == null ? "" : documentRoot); + ret.put(SNMP_HOST, snmpHost == null ? "" : snmpHost); + ret.put(SNMP_PORT, Integer.toString(snmpPort)); + mainServer.addToTokenReplacements(0, ret); + vhost1.addToTokenReplacements(1, ret); + vhost2.addToTokenReplacements(2, ret); + vhost3.addToTokenReplacements(3, ret); + vhost4.addToTokenReplacements(4, ret); + + return ret; + } } public static DeploymentConfig getDeploymentConfigurationFromSystemProperties(String variablesPrefix) { DeploymentConfig ret = new DeploymentConfig(); - ret.serverRoot = System.getProperty(variablesPrefix + ".server.root"); - ret.documentRoot = System.getProperty(variablesPrefix + ".document.root", "htdocs"); - ret.snmpHost = System.getProperty(variablesPrefix + ".snmp.host", "localhost"); - ret.snmpPort = Integer.parseInt(System.getProperty(variablesPrefix + ".snmp.port", "1610")); - ret.mainServer.address1 = HttpdAddressUtility.parseListen(System.getProperty(variablesPrefix + ".listen1")); - ret.mainServer.address2 = HttpdAddressUtility.parseListen(System.getProperty(variablesPrefix + ".listen2")); - ret.mainServer.address3 = HttpdAddressUtility.parseListen(System.getProperty(variablesPrefix + ".listen3")); - ret.mainServer.address4 = HttpdAddressUtility.parseListen(System.getProperty(variablesPrefix + ".listen4")); - ret.mainServer.serverNameDirective = System.getProperty(variablesPrefix + ".servername.directive"); + variablesPrefix += "."; + + ret.serverRoot = System.getProperty(variablesPrefix + SERVER_ROOT); + ret.documentRoot = System.getProperty(variablesPrefix + DOCUMENT_ROOT, "htdocs"); + ret.snmpHost = System.getProperty(variablesPrefix + SNMP_HOST, "localhost"); + ret.snmpPort = Integer.parseInt(System.getProperty(variablesPrefix + SNMP_PORT, "1610")); + ret.mainServer.address1 = HttpdAddressUtility.parseListen(System.getProperty(variablesPrefix + LISTEN1)); + ret.mainServer.address2 = HttpdAddressUtility.parseListen(System.getProperty(variablesPrefix + LISTEN2)); + ret.mainServer.address3 = HttpdAddressUtility.parseListen(System.getProperty(variablesPrefix + LISTEN3)); + ret.mainServer.address4 = HttpdAddressUtility.parseListen(System.getProperty(variablesPrefix + LISTEN4)); + ret.mainServer.serverNameDirective = System.getProperty(variablesPrefix + SERVERNAME_DIRECTIVE); - String additionalDirectives = System.getProperty(variablesPrefix + ".additional.directives"); + String additionalDirectives = System.getProperty(variablesPrefix + ADDITIONAL_DIRECTIVES); fillAdditionalDirectives(additionalDirectives, ret.mainServer.additionalDirectives); - readVHostConfigFromSystemProperties(ret.vhost1, variablesPrefix + ".vhost1"); - readVHostConfigFromSystemProperties(ret.vhost2, variablesPrefix + ".vhost2"); - readVHostConfigFromSystemProperties(ret.vhost3, variablesPrefix + ".vhost3"); - readVHostConfigFromSystemProperties(ret.vhost4, variablesPrefix + ".vhost4"); + readVHostConfigFromSystemProperties(ret.vhost1, variablesPrefix + VHOST + 1); + readVHostConfigFromSystemProperties(ret.vhost2, variablesPrefix + VHOST + 2); + readVHostConfigFromSystemProperties(ret.vhost3, variablesPrefix + VHOST + 3); + readVHostConfigFromSystemProperties(ret.vhost4, variablesPrefix + VHOST + 4); return ret; } - public static void deployConfiguration(File targetConfDirectory, List<String> configFilesOnClasspath, DeploymentConfig config) throws IOException { + public static void deployConfiguration(File targetConfDirectory, Collection<String> configFilesOnClasspath, DeploymentConfig config) throws IOException { List<File> targetFiles = new ArrayList<File>(); for(String fileOnClassPath : configFilesOnClasspath) { String fileName = new File(fileOnClassPath).getName(); @@ -119,123 +192,42 @@ public class ApacheDeploymentUtil { private static void replaceTokensInConfigFiles(List<File> configFiles, DeploymentConfig config) { char[] buffer = new char[8192]; - StringBuilder wholeFile = new StringBuilder(); + + Map<String, String> replacements = config.getTokenReplacements(); + for(File file : configFiles) { - BufferedReader rdr = null; - boolean errorOccured = false; + TokenReplacingReader rdr = null; + FileWriter wrt = null; + try { - rdr = new BufferedReader(new FileReader(file)); - - int cnt = -1; - - while ((cnt = rdr.read(buffer)) != -1) { - wholeFile.append(buffer, 0, cnt); - } - } catch (FileNotFoundException e) { - LOG.error("File '" + file + "' not found.", e); - errorOccured = true; - } catch (IOException e) { - LOG.error("Error while reading file '" + file + "'.", e); - errorOccured = true; - } - - if (rdr != null) { - try { - rdr.close(); - } catch (IOException e) { - LOG.error("Failed to close the file '" + file + "'."); - } - } - - if (errorOccured) { - continue; + rdr = new TokenReplacingReader(new FileReader(file), replacements); + + File tmp = File.createTempFile("apache-deployment-util", null); + + wrt = new FileWriter(tmp); + + int cnt = -1; + + while ((cnt = rdr.read(buffer)) != -1) { + wrt.write(buffer, 0, cnt); } - String newFileContents = replaceTokens(wholeFile, config); + wrt.close(); - Writer wrt = null; - try { - wrt = new FileWriter(file); - - wrt.write(newFileContents); + tmp.renameTo(file); } catch (IOException e) { - LOG.error("Error while writing to the configuration file '" + file + "'.", e); - } finally { - try { - wrt.close(); - } catch (IOException e) { - LOG.error("Failed to close the file '" + file + "'.", e); - } + LOG.error("Error while replacing the tokens in file '" + file + "'.", e); } } } - private static String replaceTokens(CharSequence input, DeploymentConfig config) { - String s = input.toString(); - - s = s.replaceAll("\\$SERVER_ROOT", config.serverRoot); - s = s.replaceAll("\\$DOCUMENT_ROOT", config.documentRoot); - s = s.replaceAll("\\$SNMP_HOST", config.snmpHost); - s = s.replaceAll("\\$SNMP_PORT", Integer.toString(config.snmpPort)); - s = s.replaceAll("\\$LISTEN_1", config.mainServer.address1.toString()); - s = s.replaceAll("\\$LISTEN_2", config.mainServer.address2.toString()); - s = s.replaceAll("\\$LISTEN_3", config.mainServer.address3.toString()); - s = s.replaceAll("\\$LISTEN_4", config.mainServer.address4.toString()); - s = s.replaceAll("\\$SNMP_HOST", config.snmpHost); - - s = replaceVHostTokens(s, 0, config.mainServer); - s = replaceVHostTokens(s, 1, config.vhost1); - s = replaceVHostTokens(s, 2, config.vhost2); - s = replaceVHostTokens(s, 3, config.vhost3); - s = replaceVHostTokens(s, 4, config.vhost4); - - return s; - } - - private static String replaceVHostTokens(String input, int vhostNumber, DeploymentConfig.VHost vhost) { - String serverNameToken = getVhostOrMainServerToken(vhostNumber, "SERVER_NAME_DIRECTIVE"); - String urlsToken = getVhostOrMainServerToken(vhostNumber, "URLS"); - String additionalDirectivesToken = getVhostOrMainServerToken(vhostNumber, "ADDITIONAL_DIRECTIVES"); - - input = input.replaceAll(serverNameToken, vhost.serverNameDirective == null ? "" : vhost.serverNameDirective); - - if (vhostNumber > 0) { - String urls = vhost.address1.toString(false, false); - if (vhost.address2 != null) { - urls += " " + vhost.address2.toString(false, false); - } - if (vhost.address3 != null) { - urls += " " + vhost.address3.toString(false, false); - } - if (vhost.address4 != null) { - urls += " " + vhost.address4.toString(false, false); - } - - input = input.replaceAll(urlsToken, urls); - } - - String additionalDirectives = ""; - if (!vhost.additionalDirectives.isEmpty()) { - String newline = System.getProperty("line.separator"); - for(String dir : vhost.additionalDirectives) { - additionalDirectives += dir + newline; - } - } - - input = input.replaceAll(additionalDirectivesToken, additionalDirectives); - - return input; - } - - private static String getVhostOrMainServerToken(int vhostNumber, String tokenBody) { - return "\\$" + (vhostNumber == 0 ? "" : ("VHOST" + vhostNumber + "_")) + tokenBody; - } - private static void readVHostConfigFromSystemProperties(DeploymentConfig.VHost vhost, String prefix) { - String addrsString = System.getProperty(prefix + ".urls"); + prefix += "."; + + String addrsString = System.getProperty(prefix + URLS); if (addrsString == null) { - throw new IllegalStateException("The system property '" + prefix + ".urls' doesn't exist. It is needed to define the vhost."); + throw new IllegalStateException("The system property '" + prefix + "urls' doesn't exist. It is needed to define the vhost."); } String[] addrs = addrsString.split("[ \t]+"); @@ -252,12 +244,12 @@ public class ApacheDeploymentUtil { vhost.address1 = Address.parse(addrs[0], null); break; default: - throw new IllegalStateException("The system property '" + prefix + ".urls' specified " + addrs.length + " addresses. Only 1-4 addresses are supported."); + throw new IllegalStateException("The system property '" + prefix + "urls' specified " + addrs.length + " addresses. Only 1-4 addresses are supported."); } - vhost.serverNameDirective = System.getProperty(prefix + ".servername.directive"); + vhost.serverNameDirective = System.getProperty(prefix + SERVERNAME_DIRECTIVE); - String additionalDirectives = System.getProperty(prefix + ".additional.directives"); + String additionalDirectives = System.getProperty(prefix + ADDITIONAL_DIRECTIVES); fillAdditionalDirectives(additionalDirectives, vhost.additionalDirectives); } diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/FakeInventory.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/FakeInventory.java deleted file mode 100644 index a4d0193..0000000 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/FakeInventory.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.plugins.apache.util; - -import java.util.Collection; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Set; - -/** - * - * - * @author Lukas Krejci - */ -public class FakeInventory { - - HashMap<Class<?>, Set<Object>> database = new HashMap<Class<?>, Set<Object>>(); - - private static final Comparator<Object> EQUALS_COMPARATOR = new Comparator<Object>() { - @Override - public int compare(Object a, Object b) { - if (a == null ? b == null : a.equals(b)) { - return 0; - } - return 1; - } - }; - - public boolean insert(Object o) { - Class<?> c = o.getClass(); - - Set<Object> objects = database.get(c); - - if (objects == null) { - objects = new HashSet<Object>(); - } - - return objects.add(o); - } - - public void insertAll(Object... objects) { - for(Object o : objects) { - insert(o); - } - } - - public void insertAll(Collection<Object> objects) { - for(Object o : objects) { - insert(o); - } - } - - @SuppressWarnings("unchecked") - public <T> T get(T prototype) { - return get(prototype, (Class<T>) prototype.getClass()); - } - - public <T> T get(T prototype, Class<T> clazz) { - return get(prototype, clazz, EQUALS_COMPARATOR); - } - - public <T> T get(T prototype, Class<T> clazz, Comparator<? super T> comparator) { - Set<Object> objects = database.get(clazz); - - if (objects == null) { - return null; - } - - for (Object o : objects) { - T cast = clazz.cast(o); - if (comparator.compare(cast, prototype) == 0) { - return cast; - } - } - - return null; - } -} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/TokenReplacingReader.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/TokenReplacingReader.java new file mode 100644 index 0000000..7ebf48b --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/TokenReplacingReader.java @@ -0,0 +1,146 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.util; + +import java.io.IOException; +import java.io.PushbackReader; +import java.io.Reader; +import java.nio.CharBuffer; +import java.util.Map; + +/** + * Copied from http://tutorials.jenkov.com/java-howto/replace-strings-in-streams-arrays-fi… + * with fixes to {@link #read(char[], int, int)} and added support for escaping. + * + * @author Lukas Krejci + */ +public class TokenReplacingReader extends Reader { + + private PushbackReader pushbackReader = null; + private Map<String, String> tokens = null; + private StringBuilder tokenNameBuffer = new StringBuilder(); + private String tokenValue = null; + private int tokenValueIndex = 0; + private boolean escaping = false; + + public TokenReplacingReader(Reader source, Map<String, String> tokens) { + this.pushbackReader = new PushbackReader(source, 2); + this.tokens = tokens; + } + + public int read(CharBuffer target) throws IOException { + throw new RuntimeException("Operation Not Supported"); + } + + public int read() throws IOException { + if (this.tokenValue != null) { + if (this.tokenValueIndex < this.tokenValue.length()) { + return this.tokenValue.charAt(this.tokenValueIndex++); + } + if (this.tokenValueIndex == this.tokenValue.length()) { + this.tokenValue = null; + this.tokenValueIndex = 0; + } + } + + int data = this.pushbackReader.read(); + + if (escaping) { + escaping = false; + return data; + } + + if (data == '\\') { + escaping = true; + return data; + } + + if (data != '$') + return data; + + data = this.pushbackReader.read(); + if (data != '{') { + this.pushbackReader.unread(data); + return '$'; + } + this.tokenNameBuffer.delete(0, this.tokenNameBuffer.length()); + + data = this.pushbackReader.read(); + while (data != '}') { + this.tokenNameBuffer.append((char) data); + data = this.pushbackReader.read(); + } + + this.tokenValue = tokens.get(this.tokenNameBuffer.toString()); + + if (this.tokenValue == null) { + this.tokenValue = "${" + this.tokenNameBuffer.toString() + "}"; + } + + if (!this.tokenValue.isEmpty()) { + return this.tokenValue.charAt(this.tokenValueIndex++); + } else { + return read(); + } + } + + public int read(char cbuf[]) throws IOException { + return read(cbuf, 0, cbuf.length); + } + + public int read(char cbuf[], int off, int len) throws IOException { + int i = 0; + for (; i < len; i++) { + int nextChar = read(); + if (nextChar == -1) { + if (i == 0) { + i = -1; + } + break; + } + cbuf[off + i] = (char) nextChar; + } + return i; + } + + public void close() throws IOException { + this.pushbackReader.close(); + } + + public long skip(long n) throws IOException { + throw new RuntimeException("Operation Not Supported"); + } + + public boolean ready() throws IOException { + return this.pushbackReader.ready(); + } + + public boolean markSupported() { + return false; + } + + public void mark(int readAheadLimit) throws IOException { + throw new RuntimeException("Operation Not Supported"); + } + + public void reset() throws IOException { + throw new RuntimeException("Operation Not Supported"); + } +} diff --git a/modules/plugins/apache/src/test/resources/full-configurations/includes/1.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/includes/1.vhost.conf index 3d0cbb8..7b56cae 100644 --- a/modules/plugins/apache/src/test/resources/full-configurations/includes/1.vhost.conf +++ b/modules/plugins/apache/src/test/resources/full-configurations/includes/1.vhost.conf @@ -1,9 +1,9 @@ -<VirtualHost $VHOST1_URLS> - $VHOST1_SERVER_NAME_DIRECTIVE - $VHOST1_ADDITIONAL_DIRECTIVES +<VirtualHost ${vhost1.urls}> + ${vhost1.servername.directive} + ${vhost1.additional.directives} </VirtualHost> -<VirtualHost $VHOST2_URLS> - $VHOST2_SERVER_NAME_DIRECTIVE - $VHOST2_ADDITIONAL_DIRECTIVES +<VirtualHost ${vhost2.urls}> + ${vhost2.servername.directive} + ${vhost2.additional.directives} </VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/includes/2.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/includes/2.vhost.conf index 5a5025e..b4a7725 100644 --- a/modules/plugins/apache/src/test/resources/full-configurations/includes/2.vhost.conf +++ b/modules/plugins/apache/src/test/resources/full-configurations/includes/2.vhost.conf @@ -1,9 +1,9 @@ -<VirtualHost $VHOST3_URLS> - $VHOST3_SERVER_NAME_DIRECTIVE - $VHOST3_ADDITIONAL_DIRECTIVES +<VirtualHost ${vhost3.urls}> + ${vhost3.servername.directive} + ${vhost3.additional.directives} </VirtualHost> -<VirtualHost $VHOST4_URLS> - $VHOST4_SERVER_NAME_DIRECTIVE - $VHOST4_ADDITIONAL_DIRECTIVES +<VirtualHost ${vhost4.urls}> + ${vhost4.servername.directive} + ${vhost4.additional.directives} </VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/includes/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/includes/httpd.conf index d0cf67c..ebc07ac 100644 --- a/modules/plugins/apache/src/test/resources/full-configurations/includes/httpd.conf +++ b/modules/plugins/apache/src/test/resources/full-configurations/includes/httpd.conf @@ -1,15 +1,15 @@ -ServerRoot $SERVER_ROOT +ServerRoot ${server.root} -Listen $LISTEN_1 -Listen $LISTEN_2 -Listen $LISTEN_3 -Listen $LISTEN_4 +Listen ${listen1} +Listen ${listen2} +Listen ${listen3} +Listen ${listen4} ServerAdmin root@localhost -$SERVER_NAME_DIRECTIVE +${servername.directive} -DocumentRoot $DOCUMENT_ROOT +DocumentRoot ${document.root} DirectoryIndex index.html index.html.var @@ -35,6 +35,6 @@ SNMPConf conf SNMPVar var # End of apache SNMP -$ADDITIONAL_DIRECTIVES +${additional.directives} Include *.vhost.conf diff --git a/modules/plugins/apache/src/test/resources/full-configurations/mess/1.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/mess/1.vhost.conf index 1898969..39cf84a 100644 --- a/modules/plugins/apache/src/test/resources/full-configurations/mess/1.vhost.conf +++ b/modules/plugins/apache/src/test/resources/full-configurations/mess/1.vhost.conf @@ -1,7 +1,7 @@ <IfModule not_loaded_module> - <VirtualHost $VHOST1_URLS> - $VHOST1_SERVER_NAME_DIRECTIVE - $VHOST1_ADDITIONAL_DIRECTIVES + <VirtualHost ${vhost1.urls}> + ${vhost1.servername.directive} + ${vhost1.additional.directives} </VirtualHost> </IfModule> @@ -9,9 +9,9 @@ LoadModule proxy_module modules/mod_proxy.so <IfModule snmpcommon_module> <IfModule mod_proxy.c> - <VirtualHost $VHOST2_URLS> - $VHOST2_SERVER_NAME_DIRECTIVE - $VHOST2_ADDITIONAL_DIRECTIVES + <VirtualHost ${vhost2.urls}> + ${vhost2.servername.directive} + ${vhost2.additional.directives} </VirtualHost> </IfModule> </IfModule> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/mess/2.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/mess/2.vhost.conf index 146cea9..37854b6 100644 --- a/modules/plugins/apache/src/test/resources/full-configurations/mess/2.vhost.conf +++ b/modules/plugins/apache/src/test/resources/full-configurations/mess/2.vhost.conf @@ -1,13 +1,13 @@ <IfModule snmpcommon_module> <IfModule mod_unknown.c> - <VirtualHost $VHOST3_URLS> - $VHOST3_SERVER_NAME_DIRECTIVE - $VHOST3_ADDITIONAL_DIRECTIVES + <VirtualHost ${vhost3.urls}> + ${vhost3.servername.directive} + ${vhost3.additional.directives} </VirtualHost> </IfModule> </IfModule> -<VirtualHost $VHOST4_URLS> - $VHOST4_SERVER_NAME_DIRECTIVE - $VHOST4_ADDITIONAL_DIRECTIVES +<VirtualHost ${vhost4.urls}> + ${vhost4.servername.directive} + ${vhost4.additional.directives} </VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/mess/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/mess/httpd.conf index d0cf67c..ebc07ac 100644 --- a/modules/plugins/apache/src/test/resources/full-configurations/mess/httpd.conf +++ b/modules/plugins/apache/src/test/resources/full-configurations/mess/httpd.conf @@ -1,15 +1,15 @@ -ServerRoot $SERVER_ROOT +ServerRoot ${server.root} -Listen $LISTEN_1 -Listen $LISTEN_2 -Listen $LISTEN_3 -Listen $LISTEN_4 +Listen ${listen1} +Listen ${listen2} +Listen ${listen3} +Listen ${listen4} ServerAdmin root@localhost -$SERVER_NAME_DIRECTIVE +${servername.directive} -DocumentRoot $DOCUMENT_ROOT +DocumentRoot ${document.root} DirectoryIndex index.html index.html.var @@ -35,6 +35,6 @@ SNMPConf conf SNMPVar var # End of apache SNMP -$ADDITIONAL_DIRECTIVES +${additional.directives} Include *.vhost.conf diff --git a/modules/plugins/apache/src/test/resources/full-configurations/nested/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/nested/httpd.conf index 3882e8f..6112bdc 100644 --- a/modules/plugins/apache/src/test/resources/full-configurations/nested/httpd.conf +++ b/modules/plugins/apache/src/test/resources/full-configurations/nested/httpd.conf @@ -1,15 +1,15 @@ -ServerRoot $SERVER_ROOT +ServerRoot ${server.root} -Listen $LISTEN_1 -Listen $LISTEN_2 -Listen $LISTEN_3 -Listen $LISTEN_4 +Listen ${listen1} +Listen ${listen2} +Listen ${listen3} +Listen ${listen4} ServerAdmin root@localhost -$SERVER_NAME_DIRECTIVE +${servername.directive} -DocumentRoot $DOCUMENT_ROOT +DocumentRoot ${document.root} DirectoryIndex index.html index.html.var @@ -35,12 +35,12 @@ SNMPConf conf SNMPVar var # End of apache SNMP -$ADDITIONAL_DIRECTIVES +${additional.directives} <IfModule not_loaded_module> - <VirtualHost $VHOST1_URLS> - $VHOST1_SERVER_NAME_DIRECTIVE - $VHOST1_ADDITIONAL_DIRECTIVES + <VirtualHost ${vhost1.urls}> + ${vhost1.servername.directive} + ${vhost1.additional.directives} </VirtualHost> </IfModule> @@ -48,21 +48,21 @@ LoadModule proxy_module modules/mod_proxy.so <IfModule snmpcommon_module> <IfModule mod_proxy.c> - <VirtualHost $VHOST2_URLS> - $VHOST2_SERVER_NAME_DIRECTIVE - $VHOST2_ADDITIONAL_DIRECTIVES + <VirtualHost ${vhost2.urls}> + ${vhost2.servername.directive} + ${vhost2.additional.directives} </VirtualHost> </IfModule> <IfModule mod_unknown.c> - <VirtualHost $VHOST3_URLS> - $VHOST3_SERVER_NAME_DIRECTIVE - $VHOST3_ADDITIONAL_DIRECTIVES + <VirtualHost ${vhost3.urls}> + ${vhost3.servername.directive} + ${vhost3.additional.directives} </VirtualHost> </IfModule> </IfModule> -<VirtualHost $VHOST4_URLS> - $VHOST4_SERVER_NAME_DIRECTIVE - $VHOST4_ADDITIONAL_DIRECTIVES +<VirtualHost ${vhost4.urls}> + ${vhost4.servername.directive} + ${vhost4.additional.directives} </VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/simple/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/simple/httpd.conf index 13195ef..87142b4 100644 --- a/modules/plugins/apache/src/test/resources/full-configurations/simple/httpd.conf +++ b/modules/plugins/apache/src/test/resources/full-configurations/simple/httpd.conf @@ -1,15 +1,15 @@ -ServerRoot $SERVER_ROOT +ServerRoot ${server.root} -Listen $LISTEN_1 -Listen $LISTEN_2 -Listen $LISTEN_3 -Listen $LISTEN_4 +Listen ${listen1} +Listen ${listen2} +Listen ${listen3} +Listen ${listen4} ServerAdmin root@localhost -$SERVER_NAME_DIRECTIVE +${servername.directive} -DocumentRoot $DOCUMENT_ROOT +DocumentRoot ${document.root} DirectoryIndex index.html index.html.var @@ -35,24 +35,24 @@ SNMPConf conf SNMPVar var # End of apache SNMP -$ADDITIONAL_DIRECTIVES +${additional.directives} -<VirtualHost $VHOST1_URLS> - $VHOST1_SERVER_NAME_DIRECTIVE - $VHOST1_ADDITIONAL_DIRECTIVES +<VirtualHost ${vhost1.urls}> + ${vhost1.servername.directive} + ${vhost1.additional.directives} </VirtualHost> -<VirtualHost $VHOST2_URLS> - $VHOST2_SERVER_NAME_DIRECTIVE - $VHOST2_ADDITIONAL_DIRECTIVES +<VirtualHost ${vhost2.urls}> + ${vhost2.servername.directive} + ${vhost2.additional.directives} </VirtualHost> -<VirtualHost $VHOST3_URLS> - $VHOST3_SERVER_NAME_DIRECTIVE - $VHOST3_ADDITIONAL_DIRECTIVES +<VirtualHost ${vhost3.urls}> + ${vhost3.servername.directive} + ${vhost3.additional.directives} </VirtualHost> -<VirtualHost $VHOST4_URLS> - $VHOST4_SERVER_NAME_DIRECTIVE - $VHOST4_ADDITIONAL_DIRECTIVES +<VirtualHost ${vhost4.urls}> + ${vhost4.servername.directive} + ${vhost4.additional.directives} </VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/mime.types b/modules/plugins/apache/src/test/resources/mime.types new file mode 100644 index 0000000..1ae0097 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mime.types @@ -0,0 +1,1351 @@ +# This file maps Internet media types to unique file extension(s). +# Although created for httpd, this file is used by many software systems +# and has been placed in the public domain for unlimited redisribution. +# +# The table below contains both registered and (common) unregistered types. +# A type that has no unique extension can be ignored -- they are listed +# here to guide configurations toward known types and to make it easier to +# identify "new" types. File extensions are also commonly used to indicate +# content languages and encodings, so choose them carefully. +# +# Internet media types should be registered as described in RFC 4288. +# The registry is at <http://www.iana.org/assignments/media-types/>. +# +# MIME type Extensions +# application/3gpp-ims+xml +# application/activemessage +application/andrew-inset ez +# application/applefile +application/applixware aw +application/atom+xml atom +application/atomcat+xml atomcat +# application/atomicmail +application/atomsvc+xml atomsvc +# application/auth-policy+xml +# application/batch-smtp +# application/beep+xml +# application/cals-1840 +application/ccxml+xml ccxml +# application/cea-2018+xml +# application/cellml+xml +# application/cnrp+xml +# application/commonground +# application/conference-info+xml +# application/cpl+xml +# application/csta+xml +# application/cstadata+xml +application/cu-seeme cu +# application/cybercash +application/davmount+xml davmount +# application/dca-rft +# application/dec-dx +# application/dialog-info+xml +# application/dicom +# application/dns +application/dssc+der dssc +application/dssc+xml xdssc +# application/dvcs +application/ecmascript ecma +# application/edi-consent +# application/edi-x12 +# application/edifact +application/emma+xml emma +# application/epp+xml +application/epub+zip epub +# application/eshop +# application/example +# application/fastinfoset +# application/fastsoap +# application/fits +application/font-tdpfr pfr +# application/h224 +# application/held+xml +# application/http +application/hyperstudio stk +# application/ibe-key-request+xml +# application/ibe-pkg-reply+xml +# application/ibe-pp-data +# application/iges +# application/im-iscomposing+xml +# application/index +# application/index.cmd +# application/index.obj +# application/index.response +# application/index.vnd +# application/iotp +application/ipfix ipfix +# application/ipp +# application/isup +application/java-archive jar +application/java-serialized-object ser +application/java-vm class +application/javascript js +application/json json +# application/kpml-request+xml +# application/kpml-response+xml +application/lost+xml lostxml +application/mac-binhex40 hqx +application/mac-compactpro cpt +# application/macwriteii +application/marc mrc +application/mathematica ma nb mb +application/mathml+xml mathml +# application/mbms-associated-procedure-description+xml +# application/mbms-deregister+xml +# application/mbms-envelope+xml +# application/mbms-msk+xml +# application/mbms-msk-response+xml +# application/mbms-protection-description+xml +# application/mbms-reception-report+xml +# application/mbms-register+xml +# application/mbms-register-response+xml +# application/mbms-user-service-description+xml +application/mbox mbox +# application/media_control+xml +application/mediaservercontrol+xml mscml +# application/mikey +# application/moss-keys +# application/moss-signature +# application/mosskey-data +# application/mosskey-request +application/mp4 mp4s +# application/mpeg4-generic +# application/mpeg4-iod +# application/mpeg4-iod-xmt +application/msword doc dot +application/mxf mxf +# application/nasdata +# application/news-checkgroups +# application/news-groupinfo +# application/news-transmission +# application/nss +# application/ocsp-request +# application/ocsp-response +application/octet-stream bin dms lha lrf lzh so iso dmg dist distz pkg bpk dump elc deploy +application/oda oda +application/oebps-package+xml opf +application/ogg ogx +application/onenote onetoc onetoc2 onetmp onepkg +# application/parityfec +application/patch-ops-error+xml xer +application/pdf pdf +application/pgp-encrypted pgp +# application/pgp-keys +application/pgp-signature asc sig +application/pics-rules prf +# application/pidf+xml +# application/pidf-diff+xml +application/pkcs10 p10 +application/pkcs7-mime p7m p7c +application/pkcs7-signature p7s +application/pkix-cert cer +application/pkix-crl crl +application/pkix-pkipath pkipath +application/pkixcmp pki +application/pls+xml pls +# application/poc-settings+xml +application/postscript ai eps ps +# application/prs.alvestrand.titrax-sheet +application/prs.cww cww +# application/prs.nprend +# application/prs.plucker +# application/qsig +application/rdf+xml rdf +application/reginfo+xml rif +application/relax-ng-compact-syntax rnc +# application/remote-printing +application/resource-lists+xml rl +application/resource-lists-diff+xml rld +# application/riscos +# application/rlmi+xml +application/rls-services+xml rs +application/rsd+xml rsd +application/rss+xml rss +application/rtf rtf +# application/rtx +# application/samlassertion+xml +# application/samlmetadata+xml +application/sbml+xml sbml +application/scvp-cv-request scq +application/scvp-cv-response scs +application/scvp-vp-request spq +application/scvp-vp-response spp +application/sdp sdp +# application/set-payment +application/set-payment-initiation setpay +# application/set-registration +application/set-registration-initiation setreg +# application/sgml +# application/sgml-open-catalog +application/shf+xml shf +# application/sieve +# application/simple-filter+xml +# application/simple-message-summary +# application/simplesymbolcontainer +# application/slate +# application/smil +application/smil+xml smi smil +# application/soap+fastinfoset +# application/soap+xml +application/sparql-query rq +application/sparql-results+xml srx +# application/spirits-event+xml +application/srgs gram +application/srgs+xml grxml +application/ssml+xml ssml +# application/timestamp-query +# application/timestamp-reply +# application/tve-trigger +# application/ulpfec +# application/vemmi +# application/vividence.scriptfile +# application/vnd.3gpp.bsf+xml +application/vnd.3gpp.pic-bw-large plb +application/vnd.3gpp.pic-bw-small psb +application/vnd.3gpp.pic-bw-var pvb +# application/vnd.3gpp.sms +# application/vnd.3gpp2.bcmcsinfo+xml +# application/vnd.3gpp2.sms +application/vnd.3gpp2.tcap tcap +application/vnd.3m.post-it-notes pwn +application/vnd.accpac.simply.aso aso +application/vnd.accpac.simply.imp imp +application/vnd.acucobol acu +application/vnd.acucorp atc acutc +application/vnd.adobe.air-application-installer-package+zip air +# application/vnd.adobe.partial-upload +application/vnd.adobe.xdp+xml xdp +application/vnd.adobe.xfdf xfdf +# application/vnd.aether.imp +application/vnd.airzip.filesecure.azf azf +application/vnd.airzip.filesecure.azs azs +application/vnd.amazon.ebook azw +application/vnd.americandynamics.acc acc +application/vnd.amiga.ami ami +application/vnd.android.package-archive apk +application/vnd.anser-web-certificate-issue-initiation cii +application/vnd.anser-web-funds-transfer-initiation fti +application/vnd.antix.game-component atx +application/vnd.apple.installer+xml mpkg +application/vnd.apple.mpegurl m3u8 +# application/vnd.arastra.swi +application/vnd.aristanetworks.swi swi +application/vnd.audiograph aep +# application/vnd.autopackage +# application/vnd.avistar+xml +application/vnd.blueice.multipass mpm +# application/vnd.bluetooth.ep.oob +application/vnd.bmi bmi +application/vnd.businessobjects rep +# application/vnd.cab-jscript +# application/vnd.canon-cpdl +# application/vnd.canon-lips +# application/vnd.cendio.thinlinc.clientconf +application/vnd.chemdraw+xml cdxml +application/vnd.chipnuts.karaoke-mmd mmd +application/vnd.cinderella cdy +# application/vnd.cirpack.isdn-ext +application/vnd.claymore cla +application/vnd.cloanto.rp9 rp9 +application/vnd.clonk.c4group c4g c4d c4f c4p c4u +# application/vnd.commerce-battelle +application/vnd.commonspace csp +application/vnd.contact.cmsg cdbcmsg +application/vnd.cosmocaller cmc +application/vnd.crick.clicker clkx +application/vnd.crick.clicker.keyboard clkk +application/vnd.crick.clicker.palette clkp +application/vnd.crick.clicker.template clkt +application/vnd.crick.clicker.wordbank clkw +application/vnd.criticaltools.wbs+xml wbs +application/vnd.ctc-posml pml +# application/vnd.ctct.ws+xml +# application/vnd.cups-pdf +# application/vnd.cups-postscript +application/vnd.cups-ppd ppd +# application/vnd.cups-raster +# application/vnd.cups-raw +application/vnd.curl.car car +application/vnd.curl.pcurl pcurl +# application/vnd.cybank +application/vnd.data-vision.rdz rdz +application/vnd.denovo.fcselayout-link fe_launch +# application/vnd.dir-bi.plate-dl-nosuffix +application/vnd.dna dna +application/vnd.dolby.mlp mlp +# application/vnd.dolby.mobile.1 +# application/vnd.dolby.mobile.2 +application/vnd.dpgraph dpg +application/vnd.dreamfactory dfac +# application/vnd.dvb.esgcontainer +# application/vnd.dvb.ipdcdftnotifaccess +# application/vnd.dvb.ipdcesgaccess +# application/vnd.dvb.ipdcroaming +# application/vnd.dvb.iptv.alfec-base +# application/vnd.dvb.iptv.alfec-enhancement +# application/vnd.dvb.notif-aggregate-root+xml +# application/vnd.dvb.notif-container+xml +# application/vnd.dvb.notif-generic+xml +# application/vnd.dvb.notif-ia-msglist+xml +# application/vnd.dvb.notif-ia-registration-request+xml +# application/vnd.dvb.notif-ia-registration-response+xml +# application/vnd.dvb.notif-init+xml +# application/vnd.dxr +application/vnd.dynageo geo +# application/vnd.ecdis-update +application/vnd.ecowin.chart mag +# application/vnd.ecowin.filerequest +# application/vnd.ecowin.fileupdate +# application/vnd.ecowin.series +# application/vnd.ecowin.seriesrequest +# application/vnd.ecowin.seriesupdate +# application/vnd.emclient.accessrequest+xml +application/vnd.enliven nml +application/vnd.epson.esf esf +application/vnd.epson.msf msf +application/vnd.epson.quickanime qam +application/vnd.epson.salt slt +application/vnd.epson.ssf ssf +# application/vnd.ericsson.quickcall +application/vnd.eszigno3+xml es3 et3 +# application/vnd.etsi.aoc+xml +# application/vnd.etsi.cug+xml +# application/vnd.etsi.iptvcommand+xml +# application/vnd.etsi.iptvdiscovery+xml +# application/vnd.etsi.iptvprofile+xml +# application/vnd.etsi.iptvsad-bc+xml +# application/vnd.etsi.iptvsad-cod+xml +# application/vnd.etsi.iptvsad-npvr+xml +# application/vnd.etsi.iptvueprofile+xml +# application/vnd.etsi.mcid+xml +# application/vnd.etsi.sci+xml +# application/vnd.etsi.simservs+xml +# application/vnd.etsi.tsl+xml +# application/vnd.etsi.tsl.der +# application/vnd.eudora.data +application/vnd.ezpix-album ez2 +application/vnd.ezpix-package ez3 +# application/vnd.f-secure.mobile +application/vnd.fdf fdf +application/vnd.fdsn.mseed mseed +application/vnd.fdsn.seed seed dataless +# application/vnd.ffsns +# application/vnd.fints +application/vnd.flographit gph +application/vnd.fluxtime.clip ftc +# application/vnd.font-fontforge-sfd +application/vnd.framemaker fm frame maker book +application/vnd.frogans.fnc fnc +application/vnd.frogans.ltf ltf +application/vnd.fsc.weblaunch fsc +application/vnd.fujitsu.oasys oas +application/vnd.fujitsu.oasys2 oa2 +application/vnd.fujitsu.oasys3 oa3 +application/vnd.fujitsu.oasysgp fg5 +application/vnd.fujitsu.oasysprs bh2 +# application/vnd.fujixerox.art-ex +# application/vnd.fujixerox.art4 +# application/vnd.fujixerox.hbpl +application/vnd.fujixerox.ddd ddd +application/vnd.fujixerox.docuworks xdw +application/vnd.fujixerox.docuworks.binder xbd +# application/vnd.fut-misnet +application/vnd.fuzzysheet fzs +application/vnd.genomatix.tuxedo txd +# application/vnd.geocube+xml +application/vnd.geogebra.file ggb +application/vnd.geogebra.tool ggt +application/vnd.geometry-explorer gex gre +application/vnd.geonext gxt +application/vnd.geoplan g2w +application/vnd.geospace g3w +# application/vnd.globalplatform.card-content-mgt +# application/vnd.globalplatform.card-content-mgt-response +application/vnd.gmx gmx +application/vnd.google-earth.kml+xml kml +application/vnd.google-earth.kmz kmz +application/vnd.grafeq gqf gqs +# application/vnd.gridmp +application/vnd.groove-account gac +application/vnd.groove-help ghf +application/vnd.groove-identity-message gim +application/vnd.groove-injector grv +application/vnd.groove-tool-message gtm +application/vnd.groove-tool-template tpl +application/vnd.groove-vcard vcg +application/vnd.handheld-entertainment+xml zmm +application/vnd.hbci hbci +# application/vnd.hcl-bireports +application/vnd.hhe.lesson-player les +application/vnd.hp-hpgl hpgl +application/vnd.hp-hpid hpid +application/vnd.hp-hps hps +application/vnd.hp-jlyt jlt +application/vnd.hp-pcl pcl +application/vnd.hp-pclxl pclxl +# application/vnd.httphone +application/vnd.hydrostatix.sof-data sfd-hdstx +application/vnd.hzn-3d-crossword x3d +# application/vnd.ibm.afplinedata +# application/vnd.ibm.electronic-media +application/vnd.ibm.minipay mpy +application/vnd.ibm.modcap afp listafp list3820 +application/vnd.ibm.rights-management irm +application/vnd.ibm.secure-container sc +application/vnd.iccprofile icc icm +application/vnd.igloader igl +application/vnd.immervision-ivp ivp +application/vnd.immervision-ivu ivu +# application/vnd.informedcontrol.rms+xml +# application/vnd.informix-visionary +application/vnd.intercon.formnet xpw xpx +# application/vnd.intertrust.digibox +# application/vnd.intertrust.nncp +application/vnd.intu.qbo qbo +application/vnd.intu.qfx qfx +# application/vnd.iptc.g2.conceptitem+xml +# application/vnd.iptc.g2.knowledgeitem+xml +# application/vnd.iptc.g2.newsitem+xml +# application/vnd.iptc.g2.packageitem+xml +application/vnd.ipunplugged.rcprofile rcprofile +application/vnd.irepository.package+xml irp +application/vnd.is-xpr xpr +application/vnd.jam jam +# application/vnd.japannet-directory-service +# application/vnd.japannet-jpnstore-wakeup +# application/vnd.japannet-payment-wakeup +# application/vnd.japannet-registration +# application/vnd.japannet-registration-wakeup +# application/vnd.japannet-setstore-wakeup +# application/vnd.japannet-verification +# application/vnd.japannet-verification-wakeup +application/vnd.jcp.javame.midlet-rms rms +application/vnd.jisp jisp +application/vnd.joost.joda-archive joda +application/vnd.kahootz ktz ktr +application/vnd.kde.karbon karbon +application/vnd.kde.kchart chrt +application/vnd.kde.kformula kfo +application/vnd.kde.kivio flw +application/vnd.kde.kontour kon +application/vnd.kde.kpresenter kpr kpt +application/vnd.kde.kspread ksp +application/vnd.kde.kword kwd kwt +application/vnd.kenameaapp htke +application/vnd.kidspiration kia +application/vnd.kinar kne knp +application/vnd.koan skp skd skt skm +application/vnd.kodak-descriptor sse +# application/vnd.liberty-request+xml +application/vnd.llamagraphics.life-balance.desktop lbd +application/vnd.llamagraphics.life-balance.exchange+xml lbe +application/vnd.lotus-1-2-3 123 +application/vnd.lotus-approach apr +application/vnd.lotus-freelance pre +application/vnd.lotus-notes nsf +application/vnd.lotus-organizer org +application/vnd.lotus-screencam scm +application/vnd.lotus-wordpro lwp +application/vnd.macports.portpkg portpkg +# application/vnd.marlin.drm.actiontoken+xml +# application/vnd.marlin.drm.conftoken+xml +# application/vnd.marlin.drm.license+xml +# application/vnd.marlin.drm.mdcf +application/vnd.mcd mcd +application/vnd.medcalcdata mc1 +application/vnd.mediastation.cdkey cdkey +# application/vnd.meridian-slingshot +application/vnd.mfer mwf +application/vnd.mfmp mfm +application/vnd.micrografx.flo flo +application/vnd.micrografx.igx igx +application/vnd.mif mif +# application/vnd.minisoft-hp3000-save +# application/vnd.mitsubishi.misty-guard.trustweb +application/vnd.mobius.daf daf +application/vnd.mobius.dis dis +application/vnd.mobius.mbk mbk +application/vnd.mobius.mqy mqy +application/vnd.mobius.msl msl +application/vnd.mobius.plc plc +application/vnd.mobius.txf txf +application/vnd.mophun.application mpn +application/vnd.mophun.certificate mpc +# application/vnd.motorola.flexsuite +# application/vnd.motorola.flexsuite.adsi +# application/vnd.motorola.flexsuite.fis +# application/vnd.motorola.flexsuite.gotap +# application/vnd.motorola.flexsuite.kmr +# application/vnd.motorola.flexsuite.ttc +# application/vnd.motorola.flexsuite.wem +# application/vnd.motorola.iprm +application/vnd.mozilla.xul+xml xul +application/vnd.ms-artgalry cil +# application/vnd.ms-asf +application/vnd.ms-cab-compressed cab +application/vnd.ms-excel xls xlm xla xlc xlt xlw +application/vnd.ms-excel.addin.macroenabled.12 xlam +application/vnd.ms-excel.sheet.binary.macroenabled.12 xlsb +application/vnd.ms-excel.sheet.macroenabled.12 xlsm +application/vnd.ms-excel.template.macroenabled.12 xltm +application/vnd.ms-fontobject eot +application/vnd.ms-htmlhelp chm +application/vnd.ms-ims ims +application/vnd.ms-lrm lrm +application/vnd.ms-pki.seccat cat +application/vnd.ms-pki.stl stl +# application/vnd.ms-playready.initiator+xml +application/vnd.ms-powerpoint ppt pps pot +application/vnd.ms-powerpoint.addin.macroenabled.12 ppam +application/vnd.ms-powerpoint.presentation.macroenabled.12 pptm +application/vnd.ms-powerpoint.slide.macroenabled.12 sldm +application/vnd.ms-powerpoint.slideshow.macroenabled.12 ppsm +application/vnd.ms-powerpoint.template.macroenabled.12 potm +application/vnd.ms-project mpp mpt +# application/vnd.ms-tnef +# application/vnd.ms-wmdrm.lic-chlg-req +# application/vnd.ms-wmdrm.lic-resp +# application/vnd.ms-wmdrm.meter-chlg-req +# application/vnd.ms-wmdrm.meter-resp +application/vnd.ms-word.document.macroenabled.12 docm +application/vnd.ms-word.template.macroenabled.12 dotm +application/vnd.ms-works wps wks wcm wdb +application/vnd.ms-wpl wpl +application/vnd.ms-xpsdocument xps +application/vnd.mseq mseq +# application/vnd.msign +# application/vnd.multiad.creator +# application/vnd.multiad.creator.cif +# application/vnd.music-niff +application/vnd.musician mus +application/vnd.muvee.style msty +# application/vnd.ncd.control +# application/vnd.ncd.reference +# application/vnd.nervana +# application/vnd.netfpx +application/vnd.neurolanguage.nlu nlu +application/vnd.noblenet-directory nnd +application/vnd.noblenet-sealer nns +application/vnd.noblenet-web nnw +# application/vnd.nokia.catalogs +# application/vnd.nokia.conml+wbxml +# application/vnd.nokia.conml+xml +# application/vnd.nokia.isds-radio-presets +# application/vnd.nokia.iptv.config+xml +# application/vnd.nokia.landmark+wbxml +# application/vnd.nokia.landmark+xml +# application/vnd.nokia.landmarkcollection+xml +# application/vnd.nokia.n-gage.ac+xml +application/vnd.nokia.n-gage.data ngdat +application/vnd.nokia.n-gage.symbian.install n-gage +# application/vnd.nokia.ncd +# application/vnd.nokia.pcd+wbxml +# application/vnd.nokia.pcd+xml +application/vnd.nokia.radio-preset rpst +application/vnd.nokia.radio-presets rpss +application/vnd.novadigm.edm edm +application/vnd.novadigm.edx edx +application/vnd.novadigm.ext ext +# application/vnd.ntt-local.file-transfer +application/vnd.oasis.opendocument.chart odc +application/vnd.oasis.opendocument.chart-template otc +application/vnd.oasis.opendocument.database odb +application/vnd.oasis.opendocument.formula odf +application/vnd.oasis.opendocument.formula-template odft +application/vnd.oasis.opendocument.graphics odg +application/vnd.oasis.opendocument.graphics-template otg +application/vnd.oasis.opendocument.image odi +application/vnd.oasis.opendocument.image-template oti +application/vnd.oasis.opendocument.presentation odp +application/vnd.oasis.opendocument.presentation-template otp +application/vnd.oasis.opendocument.spreadsheet ods +application/vnd.oasis.opendocument.spreadsheet-template ots +application/vnd.oasis.opendocument.text odt +application/vnd.oasis.opendocument.text-master otm +application/vnd.oasis.opendocument.text-template ott +application/vnd.oasis.opendocument.text-web oth +# application/vnd.obn +application/vnd.olpc-sugar xo +# application/vnd.oma-scws-config +# application/vnd.oma-scws-http-request +# application/vnd.oma-scws-http-response +# application/vnd.oma.bcast.associated-procedure-parameter+xml +# application/vnd.oma.bcast.drm-trigger+xml +# application/vnd.oma.bcast.imd+xml +# application/vnd.oma.bcast.ltkm +# application/vnd.oma.bcast.notification+xml +# application/vnd.oma.bcast.provisioningtrigger +# application/vnd.oma.bcast.sgboot +# application/vnd.oma.bcast.sgdd+xml +# application/vnd.oma.bcast.sgdu +# application/vnd.oma.bcast.simple-symbol-container +# application/vnd.oma.bcast.smartcard-trigger+xml +# application/vnd.oma.bcast.sprov+xml +# application/vnd.oma.bcast.stkm +# application/vnd.oma.dcd +# application/vnd.oma.dcdc +application/vnd.oma.dd2+xml dd2 +# application/vnd.oma.drm.risd+xml +# application/vnd.oma.group-usage-list+xml +# application/vnd.oma.poc.detailed-progress-report+xml +# application/vnd.oma.poc.final-report+xml +# application/vnd.oma.poc.groups+xml +# application/vnd.oma.poc.invocation-descriptor+xml +# application/vnd.oma.poc.optimized-progress-report+xml +# application/vnd.oma.push +# application/vnd.oma.scidm.messages+xml +# application/vnd.oma.xcap-directory+xml +# application/vnd.omads-email+xml +# application/vnd.omads-file+xml +# application/vnd.omads-folder+xml +# application/vnd.omaloc-supl-init +application/vnd.openofficeorg.extension oxt +# application/vnd.openxmlformats-officedocument.custom-properties+xml +# application/vnd.openxmlformats-officedocument.customxmlproperties+xml +# application/vnd.openxmlformats-officedocument.drawing+xml +# application/vnd.openxmlformats-officedocument.drawingml.chart+xml +# application/vnd.openxmlformats-officedocument.drawingml.chartshapes+xml +# application/vnd.openxmlformats-officedocument.drawingml.diagramcolors+xml +# application/vnd.openxmlformats-officedocument.drawingml.diagramdata+xml +# application/vnd.openxmlformats-officedocument.drawingml.diagramlayout+xml +# application/vnd.openxmlformats-officedocument.drawingml.diagramstyle+xml +# application/vnd.openxmlformats-officedocument.extended-properties+xml +# application/vnd.openxmlformats-officedocument.presentationml.commentauthors+xml +# application/vnd.openxmlformats-officedocument.presentationml.comments+xml +# application/vnd.openxmlformats-officedocument.presentationml.handoutmaster+xml +# application/vnd.openxmlformats-officedocument.presentationml.notesmaster+xml +# application/vnd.openxmlformats-officedocument.presentationml.notesslide+xml +application/vnd.openxmlformats-officedocument.presentationml.presentation pptx +# application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml +# application/vnd.openxmlformats-officedocument.presentationml.presprops+xml +application/vnd.openxmlformats-officedocument.presentationml.slide sldx +# application/vnd.openxmlformats-officedocument.presentationml.slide+xml +# application/vnd.openxmlformats-officedocument.presentationml.slidelayout+xml +# application/vnd.openxmlformats-officedocument.presentationml.slidemaster+xml +application/vnd.openxmlformats-officedocument.presentationml.slideshow ppsx +# application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml +# application/vnd.openxmlformats-officedocument.presentationml.slideupdateinfo+xml +# application/vnd.openxmlformats-officedocument.presentationml.tablestyles+xml +# application/vnd.openxmlformats-officedocument.presentationml.tags+xml +application/vnd.openxmlformats-officedocument.presentationml.template potx +# application/vnd.openxmlformats-officedocument.presentationml.template.main+xml +# application/vnd.openxmlformats-officedocument.presentationml.viewprops+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.calcchain+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.connections+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.dialogsheet+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.externallink+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.pivotcachedefinition+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.pivotcacherecords+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.pivottable+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.querytable+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.revisionheaders+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.revisionlog+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.sharedstrings+xml +application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx +# application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.sheetmetadata+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.tablesinglecells+xml +application/vnd.openxmlformats-officedocument.spreadsheetml.template xltx +# application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.usernames+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.volatiledependencies+xml +# application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml +# application/vnd.openxmlformats-officedocument.theme+xml +# application/vnd.openxmlformats-officedocument.themeoverride+xml +# application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml +application/vnd.openxmlformats-officedocument.wordprocessingml.document docx +# application/vnd.openxmlformats-officedocument.wordprocessingml.document.glossary+xml +# application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml +# application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml +# application/vnd.openxmlformats-officedocument.wordprocessingml.fonttable+xml +# application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml +# application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml +# application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml +# application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml +# application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml +application/vnd.openxmlformats-officedocument.wordprocessingml.template dotx +# application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml +# application/vnd.openxmlformats-officedocument.wordprocessingml.websettings+xml +# application/vnd.openxmlformats-package.core-properties+xml +# application/vnd.openxmlformats-package.digital-signature-xmlsignature+xml +# application/vnd.osa.netdeploy +# application/vnd.osgi.bundle +application/vnd.osgi.dp dp +# application/vnd.otps.ct-kip+xml +application/vnd.palm pdb pqa oprc +# application/vnd.paos.xml +application/vnd.pawaafile paw +application/vnd.pg.format str +application/vnd.pg.osasli ei6 +# application/vnd.piaccess.application-licence +application/vnd.picsel efif +application/vnd.pmi.widget wg +# application/vnd.poc.group-advertisement+xml +application/vnd.pocketlearn plf +application/vnd.powerbuilder6 pbd +# application/vnd.powerbuilder6-s +# application/vnd.powerbuilder7 +# application/vnd.powerbuilder7-s +# application/vnd.powerbuilder75 +# application/vnd.powerbuilder75-s +# application/vnd.preminet +application/vnd.previewsystems.box box +application/vnd.proteus.magazine mgz +application/vnd.publishare-delta-tree qps +application/vnd.pvi.ptid1 ptid +# application/vnd.pwg-multiplexed +# application/vnd.pwg-xhtml-print+xml +# application/vnd.qualcomm.brew-app-res +application/vnd.quark.quarkxpress qxd qxt qwd qwt qxl qxb +# application/vnd.radisys.moml+xml +# application/vnd.radisys.msml+xml +# application/vnd.radisys.msml-audit+xml +# application/vnd.radisys.msml-audit-conf+xml +# application/vnd.radisys.msml-audit-conn+xml +# application/vnd.radisys.msml-audit-dialog+xml +# application/vnd.radisys.msml-audit-stream+xml +# application/vnd.radisys.msml-conf+xml +# application/vnd.radisys.msml-dialog+xml +# application/vnd.radisys.msml-dialog-base+xml +# application/vnd.radisys.msml-dialog-fax-detect+xml +# application/vnd.radisys.msml-dialog-fax-sendrecv+xml +# application/vnd.radisys.msml-dialog-group+xml +# application/vnd.radisys.msml-dialog-speech+xml +# application/vnd.radisys.msml-dialog-transform+xml +# application/vnd.rapid +application/vnd.realvnc.bed bed +application/vnd.recordare.musicxml mxl +application/vnd.recordare.musicxml+xml musicxml +# application/vnd.renlearn.rlprint +application/vnd.rim.cod cod +application/vnd.rn-realmedia rm +application/vnd.route66.link66+xml link66 +# application/vnd.ruckus.download +# application/vnd.s3sms +application/vnd.sailingtracker.track st +# application/vnd.sbm.cid +# application/vnd.sbm.mid2 +# application/vnd.scribus +# application/vnd.sealed.3df +# application/vnd.sealed.csf +# application/vnd.sealed.doc +# application/vnd.sealed.eml +# application/vnd.sealed.mht +# application/vnd.sealed.net +# application/vnd.sealed.ppt +# application/vnd.sealed.tiff +# application/vnd.sealed.xls +# application/vnd.sealedmedia.softseal.html +# application/vnd.sealedmedia.softseal.pdf +application/vnd.seemail see +application/vnd.sema sema +application/vnd.semd semd +application/vnd.semf semf +application/vnd.shana.informed.formdata ifm +application/vnd.shana.informed.formtemplate itp +application/vnd.shana.informed.interchange iif +application/vnd.shana.informed.package ipk +application/vnd.simtech-mindmapper twd twds +application/vnd.smaf mmf +# application/vnd.smart.notebook +application/vnd.smart.teacher teacher +# application/vnd.software602.filler.form+xml +# application/vnd.software602.filler.form-xml-zip +application/vnd.solent.sdkm+xml sdkm sdkd +application/vnd.spotfire.dxp dxp +application/vnd.spotfire.sfs sfs +# application/vnd.sss-cod +# application/vnd.sss-dtf +# application/vnd.sss-ntf +application/vnd.stardivision.calc sdc +application/vnd.stardivision.draw sda +application/vnd.stardivision.impress sdd +application/vnd.stardivision.math smf +application/vnd.stardivision.writer sdw +application/vnd.stardivision.writer vor +application/vnd.stardivision.writer-global sgl +# application/vnd.street-stream +application/vnd.sun.xml.calc sxc +application/vnd.sun.xml.calc.template stc +application/vnd.sun.xml.draw sxd +application/vnd.sun.xml.draw.template std +application/vnd.sun.xml.impress sxi +application/vnd.sun.xml.impress.template sti +application/vnd.sun.xml.math sxm +application/vnd.sun.xml.writer sxw +application/vnd.sun.xml.writer.global sxg +application/vnd.sun.xml.writer.template stw +# application/vnd.sun.wadl+xml +application/vnd.sus-calendar sus susp +application/vnd.svd svd +# application/vnd.swiftview-ics +application/vnd.symbian.install sis sisx +application/vnd.syncml+xml xsm +application/vnd.syncml.dm+wbxml bdm +application/vnd.syncml.dm+xml xdm +# application/vnd.syncml.dm.notification +# application/vnd.syncml.ds.notification +application/vnd.tao.intent-module-archive tao +application/vnd.tmobile-livetv tmo +application/vnd.trid.tpt tpt +application/vnd.triscape.mxs mxs +application/vnd.trueapp tra +# application/vnd.truedoc +application/vnd.ufdl ufd ufdl +application/vnd.uiq.theme utz +application/vnd.umajin umj +application/vnd.unity unityweb +application/vnd.uoml+xml uoml +# application/vnd.uplanet.alert +# application/vnd.uplanet.alert-wbxml +# application/vnd.uplanet.bearer-choice +# application/vnd.uplanet.bearer-choice-wbxml +# application/vnd.uplanet.cacheop +# application/vnd.uplanet.cacheop-wbxml +# application/vnd.uplanet.channel +# application/vnd.uplanet.channel-wbxml +# application/vnd.uplanet.list +# application/vnd.uplanet.list-wbxml +# application/vnd.uplanet.listcmd +# application/vnd.uplanet.listcmd-wbxml +# application/vnd.uplanet.signal +application/vnd.vcx vcx +# application/vnd.vd-study +# application/vnd.vectorworks +# application/vnd.vidsoft.vidconference +application/vnd.visio vsd vst vss vsw +application/vnd.visionary vis +# application/vnd.vividence.scriptfile +application/vnd.vsf vsf +# application/vnd.wap.sic +# application/vnd.wap.slc +application/vnd.wap.wbxml wbxml +application/vnd.wap.wmlc wmlc +application/vnd.wap.wmlscriptc wmlsc +application/vnd.webturbo wtb +# application/vnd.wfa.wsc +# application/vnd.wmc +# application/vnd.wmf.bootstrap +# application/vnd.wolfram.mathematica +# application/vnd.wolfram.mathematica.package +application/vnd.wolfram.player nbp +application/vnd.wordperfect wpd +application/vnd.wqd wqd +# application/vnd.wrq-hp3000-labelled +application/vnd.wt.stf stf +# application/vnd.wv.csp+wbxml +# application/vnd.wv.csp+xml +# application/vnd.wv.ssp+xml +application/vnd.xara xar +application/vnd.xfdl xfdl +# application/vnd.xfdl.webform +# application/vnd.xmi+xml +# application/vnd.xmpie.cpkg +# application/vnd.xmpie.dpkg +# application/vnd.xmpie.plan +# application/vnd.xmpie.ppkg +# application/vnd.xmpie.xlim +application/vnd.yamaha.hv-dic hvd +application/vnd.yamaha.hv-script hvs +application/vnd.yamaha.hv-voice hvp +application/vnd.yamaha.openscoreformat osf +application/vnd.yamaha.openscoreformat.osfpvg+xml osfpvg +application/vnd.yamaha.smaf-audio saf +application/vnd.yamaha.smaf-phrase spf +application/vnd.yellowriver-custom-menu cmp +application/vnd.zul zir zirz +application/vnd.zzazz.deck+xml zaz +application/voicexml+xml vxml +# application/watcherinfo+xml +# application/whoispp-query +# application/whoispp-response +application/winhlp hlp +# application/wita +# application/wordperfect5.1 +application/wsdl+xml wsdl +application/wspolicy+xml wspolicy +application/x-abiword abw +application/x-ace-compressed ace +application/x-authorware-bin aab x32 u32 vox +application/x-authorware-map aam +application/x-authorware-seg aas +application/x-bcpio bcpio +application/x-bittorrent torrent +application/x-bzip bz +application/x-bzip2 bz2 boz +application/x-cdlink vcd +application/x-chat chat +application/x-chess-pgn pgn +# application/x-compress +application/x-cpio cpio +application/x-csh csh +application/x-debian-package deb udeb +application/x-director dir dcr dxr cst cct cxt w3d fgd swa +application/x-doom wad +application/x-dtbncx+xml ncx +application/x-dtbook+xml dtb +application/x-dtbresource+xml res +application/x-dvi dvi +application/x-font-bdf bdf +# application/x-font-dos +# application/x-font-framemaker +application/x-font-ghostscript gsf +# application/x-font-libgrx +application/x-font-linux-psf psf +application/x-font-otf otf +application/x-font-pcf pcf +application/x-font-snf snf +# application/x-font-speedo +# application/x-font-sunos-news +application/x-font-ttf ttf ttc +application/x-font-type1 pfa pfb pfm afm +# application/x-font-vfont +application/x-futuresplash spl +application/x-gnumeric gnumeric +application/x-gtar gtar +# application/x-gzip +application/x-hdf hdf +application/x-java-jnlp-file jnlp +application/x-latex latex +application/x-mobipocket-ebook prc mobi +application/x-ms-application application +application/x-ms-wmd wmd +application/x-ms-wmz wmz +application/x-ms-xbap xbap +application/x-msaccess mdb +application/x-msbinder obd +application/x-mscardfile crd +application/x-msclip clp +application/x-msdownload exe dll com bat msi +application/x-msmediaview mvb m13 m14 +application/x-msmetafile wmf +application/x-msmoney mny +application/x-mspublisher pub +application/x-msschedule scd +application/x-msterminal trm +application/x-mswrite wri +application/x-netcdf nc cdf +application/x-pkcs12 p12 pfx +application/x-pkcs7-certificates p7b spc +application/x-pkcs7-certreqresp p7r +application/x-rar-compressed rar +application/x-sh sh +application/x-shar shar +application/x-shockwave-flash swf +application/x-silverlight-app xap +application/x-stuffit sit +application/x-stuffitx sitx +application/x-sv4cpio sv4cpio +application/x-sv4crc sv4crc +application/x-tar tar +application/x-tcl tcl +application/x-tex tex +application/x-tex-tfm tfm +application/x-texinfo texinfo texi +application/x-ustar ustar +application/x-wais-source src +application/x-x509-ca-cert der crt +application/x-xfig fig +application/x-xpinstall xpi +# application/x400-bp +# application/xcap-att+xml +# application/xcap-caps+xml +# application/xcap-el+xml +# application/xcap-error+xml +# application/xcap-ns+xml +# application/xcon-conference-info-diff+xml +# application/xcon-conference-info+xml +application/xenc+xml xenc +application/xhtml+xml xhtml xht +# application/xhtml-voice+xml +application/xml xml xsl +application/xml-dtd dtd +# application/xml-external-parsed-entity +# application/xmpp+xml +application/xop+xml xop +application/xslt+xml xslt +application/xspf+xml xspf +application/xv+xml mxml xhvml xvml xvm +application/zip zip +# audio/32kadpcm +# audio/3gpp +# audio/3gpp2 +# audio/ac3 +audio/adpcm adp +# audio/amr +# audio/amr-wb +# audio/amr-wb+ +# audio/asc +# audio/atrac-advanced-lossless +# audio/atrac-x +# audio/atrac3 +audio/basic au snd +# audio/bv16 +# audio/bv32 +# audio/clearmode +# audio/cn +# audio/dat12 +# audio/dls +# audio/dsr-es201108 +# audio/dsr-es202050 +# audio/dsr-es202211 +# audio/dsr-es202212 +# audio/dvi4 +# audio/eac3 +# audio/evrc +# audio/evrc-qcp +# audio/evrc0 +# audio/evrc1 +# audio/evrcb +# audio/evrcb0 +# audio/evrcb1 +# audio/evrcwb +# audio/evrcwb0 +# audio/evrcwb1 +# audio/example +# audio/g719 +# audio/g722 +# audio/g7221 +# audio/g723 +# audio/g726-16 +# audio/g726-24 +# audio/g726-32 +# audio/g726-40 +# audio/g728 +# audio/g729 +# audio/g7291 +# audio/g729d +# audio/g729e +# audio/gsm +# audio/gsm-efr +# audio/ilbc +# audio/l16 +# audio/l20 +# audio/l24 +# audio/l8 +# audio/lpc +audio/midi mid midi kar rmi +# audio/mobile-xmf +audio/mp4 mp4a +# audio/mp4a-latm +# audio/mpa +# audio/mpa-robust +audio/mpeg mpga mp2 mp2a mp3 m2a m3a +# audio/mpeg4-generic +audio/ogg oga ogg spx +# audio/parityfec +# audio/pcma +# audio/pcma-wb +# audio/pcmu-wb +# audio/pcmu +# audio/prs.sid +# audio/qcelp +# audio/red +# audio/rtp-enc-aescm128 +# audio/rtp-midi +# audio/rtx +# audio/smv +# audio/smv0 +# audio/smv-qcp +# audio/sp-midi +# audio/speex +# audio/t140c +# audio/t38 +# audio/telephone-event +# audio/tone +# audio/uemclip +# audio/ulpfec +# audio/vdvi +# audio/vmr-wb +# audio/vnd.3gpp.iufp +# audio/vnd.4sb +# audio/vnd.audiokoz +# audio/vnd.celp +# audio/vnd.cisco.nse +# audio/vnd.cmles.radio-events +# audio/vnd.cns.anp1 +# audio/vnd.cns.inf1 +audio/vnd.digital-winds eol +# audio/vnd.dlna.adts +# audio/vnd.dolby.heaac.1 +# audio/vnd.dolby.heaac.2 +# audio/vnd.dolby.mlp +# audio/vnd.dolby.mps +# audio/vnd.dolby.pl2 +# audio/vnd.dolby.pl2x +# audio/vnd.dolby.pl2z +# audio/vnd.dolby.pulse.1 +audio/vnd.dra dra +audio/vnd.dts dts +audio/vnd.dts.hd dtshd +# audio/vnd.everad.plj +# audio/vnd.hns.audio +audio/vnd.lucent.voice lvp +audio/vnd.ms-playready.media.pya pya +# audio/vnd.nokia.mobile-xmf +# audio/vnd.nortel.vbk +audio/vnd.nuera.ecelp4800 ecelp4800 +audio/vnd.nuera.ecelp7470 ecelp7470 +audio/vnd.nuera.ecelp9600 ecelp9600 +# audio/vnd.octel.sbc +# audio/vnd.qcelp +# audio/vnd.rhetorex.32kadpcm +# audio/vnd.sealedmedia.softseal.mpeg +# audio/vnd.vmx.cvsd +# audio/vorbis +# audio/vorbis-config +audio/x-aac aac +audio/x-aiff aif aiff aifc +audio/x-mpegurl m3u +audio/x-ms-wax wax +audio/x-ms-wma wma +audio/x-pn-realaudio ram ra +audio/x-pn-realaudio-plugin rmp +audio/x-wav wav +chemical/x-cdx cdx +chemical/x-cif cif +chemical/x-cmdf cmdf +chemical/x-cml cml +chemical/x-csml csml +# chemical/x-pdb +chemical/x-xyz xyz +image/bmp bmp +image/cgm cgm +# image/example +# image/fits +image/g3fax g3 +image/gif gif +image/ief ief +# image/jp2 +image/jpeg jpeg jpg jpe +# image/jpm +# image/jpx +# image/naplps +image/png png +image/prs.btif btif +# image/prs.pti +image/svg+xml svg svgz +# image/t38 +image/tiff tiff tif +# image/tiff-fx +image/vnd.adobe.photoshop psd +# image/vnd.cns.inf2 +image/vnd.djvu djvu djv +image/vnd.dwg dwg +image/vnd.dxf dxf +image/vnd.fastbidsheet fbs +image/vnd.fpx fpx +image/vnd.fst fst +image/vnd.fujixerox.edmics-mmr mmr +image/vnd.fujixerox.edmics-rlc rlc +# image/vnd.globalgraphics.pgb +# image/vnd.microsoft.icon +# image/vnd.mix +image/vnd.ms-modi mdi +image/vnd.net-fpx npx +# image/vnd.radiance +# image/vnd.sealed.png +# image/vnd.sealedmedia.softseal.gif +# image/vnd.sealedmedia.softseal.jpg +# image/vnd.svf +image/vnd.wap.wbmp wbmp +image/vnd.xiff xif +image/x-cmu-raster ras +image/x-cmx cmx +image/x-freehand fh fhc fh4 fh5 fh7 +image/x-icon ico +image/x-pcx pcx +image/x-pict pic pct +image/x-portable-anymap pnm +image/x-portable-bitmap pbm +image/x-portable-graymap pgm +image/x-portable-pixmap ppm +image/x-rgb rgb +image/x-xbitmap xbm +image/x-xpixmap xpm +image/x-xwindowdump xwd +# message/cpim +# message/delivery-status +# message/disposition-notification +# message/example +# message/external-body +# message/global +# message/global-delivery-status +# message/global-disposition-notification +# message/global-headers +# message/http +# message/imdn+xml +# message/news +# message/partial +message/rfc822 eml mime +# message/s-http +# message/sip +# message/sipfrag +# message/tracking-status +# message/vnd.si.simp +# model/example +model/iges igs iges +model/mesh msh mesh silo +model/vnd.dwf dwf +# model/vnd.flatland.3dml +model/vnd.gdl gdl +# model/vnd.gs-gdl +# model/vnd.gs.gdl +model/vnd.gtw gtw +# model/vnd.moml+xml +model/vnd.mts mts +# model/vnd.parasolid.transmit.binary +# model/vnd.parasolid.transmit.text +model/vnd.vtu vtu +model/vrml wrl vrml +# multipart/alternative +# multipart/appledouble +# multipart/byteranges +# multipart/digest +# multipart/encrypted +# multipart/example +# multipart/form-data +# multipart/header-set +# multipart/mixed +# multipart/parallel +# multipart/related +# multipart/report +# multipart/signed +# multipart/voice-message +text/calendar ics ifb +text/css css +text/csv csv +# text/directory +# text/dns +# text/ecmascript +# text/enriched +# text/example +text/html html htm +# text/javascript +# text/parityfec +text/plain txt text conf def list log in +# text/prs.fallenstein.rst +text/prs.lines.tag dsc +# text/vnd.radisys.msml-basic-layout +# text/red +# text/rfc822-headers +text/richtext rtx +# text/rtf +# text/rtp-enc-aescm128 +# text/rtx +text/sgml sgml sgm +# text/t140 +text/tab-separated-values tsv +text/troff t tr roff man me ms +# text/ulpfec +text/uri-list uri uris urls +# text/vnd.abc +text/vnd.curl curl +text/vnd.curl.dcurl dcurl +text/vnd.curl.scurl scurl +text/vnd.curl.mcurl mcurl +# text/vnd.dmclientscript +# text/vnd.esmertec.theme-descriptor +text/vnd.fly fly +text/vnd.fmi.flexstor flx +text/vnd.graphviz gv +text/vnd.in3d.3dml 3dml +text/vnd.in3d.spot spot +# text/vnd.iptc.newsml +# text/vnd.iptc.nitf +# text/vnd.latex-z +# text/vnd.motorola.reflex +# text/vnd.ms-mediapackage +# text/vnd.net2phone.commcenter.command +# text/vnd.si.uricatalogue +text/vnd.sun.j2me.app-descriptor jad +# text/vnd.trolltech.linguist +# text/vnd.wap.si +# text/vnd.wap.sl +text/vnd.wap.wml wml +text/vnd.wap.wmlscript wmls +text/x-asm s asm +text/x-c c cc cxx cpp h hh dic +text/x-fortran f for f77 f90 +text/x-pascal p pas +text/x-java-source java +text/x-setext etx +text/x-uuencode uu +text/x-vcalendar vcs +text/x-vcard vcf +# text/xml +# text/xml-external-parsed-entity +video/3gpp 3gp +# video/3gpp-tt +video/3gpp2 3g2 +# video/bmpeg +# video/bt656 +# video/celb +# video/dv +# video/example +video/h261 h261 +video/h263 h263 +# video/h263-1998 +# video/h263-2000 +video/h264 h264 +video/jpeg jpgv +# video/jpeg2000 +video/jpm jpm jpgm +video/mj2 mj2 mjp2 +# video/mp1s +# video/mp2p +# video/mp2t +video/mp4 mp4 mp4v mpg4 +# video/mp4v-es +video/mpeg mpeg mpg mpe m1v m2v +# video/mpeg4-generic +# video/mpv +# video/nv +video/ogg ogv +# video/parityfec +# video/pointer +video/quicktime qt mov +# video/raw +# video/rtp-enc-aescm128 +# video/rtx +# video/smpte292m +# video/ulpfec +# video/vc1 +# video/vnd.cctv +# video/vnd.dlna.mpeg-tts +video/vnd.fvt fvt +# video/vnd.hns.video +# video/vnd.iptvforum.1dparityfec-1010 +# video/vnd.iptvforum.1dparityfec-2005 +# video/vnd.iptvforum.2dparityfec-1010 +# video/vnd.iptvforum.2dparityfec-2005 +# video/vnd.iptvforum.ttsavc +# video/vnd.iptvforum.ttsmpeg2 +# video/vnd.motorola.video +# video/vnd.motorola.videop +video/vnd.mpegurl mxu m4u +video/vnd.ms-playready.media.pyv pyv +# video/vnd.nokia.interleaved-multimedia +# video/vnd.nokia.videovoip +# video/vnd.objectvideo +# video/vnd.sealed.mpeg1 +# video/vnd.sealed.mpeg4 +# video/vnd.sealed.swf +# video/vnd.sealedmedia.softseal.mov +video/vnd.vivo viv +video/x-f4v f4v +video/x-fli fli +video/x-flv flv +video/x-m4v m4v +video/x-ms-asf asf asx +video/x-ms-wm wm +video/x-ms-wmv wmv +video/x-ms-wmx wmx +video/x-ms-wvx wvx +video/x-msvideo avi +video/x-sgi-movie movie +x-conference/x-cooltalk ice diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory.xml new file mode 100644 index 0000000..1aabda1 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory.xml @@ -0,0 +1,544 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>localhost.localdomain Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>127.0.0.1</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> + +<resource> + <id>10021</id> + <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> + <resourceKey>127.0.0.1:11676</resourceKey> + <name>Virtual Host 127.0.0.1:11676</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587648</ctime> + <mtime>1307353587648</mtime> + <itime>1307353587648</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10135</id> + <version>0</version> + <ctime>1307353587666</ctime> + <mtime>1307353587666</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10136</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587667</ctime> + <mtime>1307353587667</mtime> + <propertySimple> + <id>10685</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10684</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10687</id> + <name>url</name> + <override>false</override> + <stringValue>http://127.0.0.1:11676/</stringValue> + </propertySimple> + <propertySimple> + <id>10688</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>4</stringValue> + </propertySimple> + <propertySimple> + <id>10686</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>localhost.localdomain:0</resourceKey> + <name>Virtual Host localhost.localdomain:0</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/localhost.localdomain0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://localhost.localdomain:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10023</id> + <uuid>c62c5d75-81dd-4b14-a768-2d8c1fca6c88</uuid> + <resourceKey>127.0.0.1:11677</resourceKey> + <name>Virtual Host 127.0.0.1:11677</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <itime>1307353587737</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10139</id> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10140</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <propertySimple> + <id>10695</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10694</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10697</id> + <name>url</name> + <override>false</override> + <stringValue>http://127.0.0.1:11677/</stringValue> + </propertySimple> + <propertySimple> + <id>10698</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>3</stringValue> + </propertySimple> + <propertySimple> + <id>10696</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10024</id> + <uuid>d1b59168-8666-4bc0-957e-171bf16eec73</uuid> + <resourceKey>127.0.0.1:11675</resourceKey> + <name>Virtual Host 127.0.0.1:11675</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <itime>1307353587750</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10171</id> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10172</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <propertySimple> + <id>10700</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10699</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10702</id> + <name>url</name> + <override>false</override> + <stringValue>http://127.0.0.1:11675/</stringValue> + </propertySimple> + <propertySimple> + <id>10703</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>5</stringValue> + </propertySimple> + <propertySimple> + <id>10701</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>127.0.0.1:11678</resourceKey> + <name>Virtual Host 127.0.0.1:11678</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://127.0.0.1:11678/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/snmpd.conf b/modules/plugins/apache/src/test/resources/snmpd.conf index 1cbc543..58853d1 100644 --- a/modules/plugins/apache/src/test/resources/snmpd.conf +++ b/modules/plugins/apache/src/test/resources/snmpd.conf @@ -31,7 +31,7 @@ # DEFAULT: # agentaddress 161 -agentaddress $SNMP_PORT@$SNMP_HOST +agentaddress ${snmp.port}(a)${snmp.host} ############################################################################### # View-based Access Control diff --git a/modules/test-utils/src/main/java/org/rhq/test/ObjectCollectionSerializer.java b/modules/test-utils/src/main/java/org/rhq/test/ObjectCollectionSerializer.java index d9b597f..d3a3cab 100644 --- a/modules/test-utils/src/main/java/org/rhq/test/ObjectCollectionSerializer.java +++ b/modules/test-utils/src/main/java/org/rhq/test/ObjectCollectionSerializer.java @@ -24,6 +24,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.io.PrintStream; +import java.io.Reader; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -132,6 +133,16 @@ public class ObjectCollectionSerializer { out.append("</inventory-dump>\n"); } + public List<?> deserialize(InputStream inputStream) throws IOException, XMLStreamException, ClassNotFoundException, JAXBException { + XMLStreamReader rdr = XMLInputFactory.newFactory().createXMLStreamReader(inputStream); + return deserialize(rdr); + } + + public List<?> deserialize(Reader inputReader) throws IOException, XMLStreamException, ClassNotFoundException, JAXBException { + XMLStreamReader rdr = XMLInputFactory.newFactory().createXMLStreamReader(inputReader); + return deserialize(rdr); + } + /** * This deserializes given input stream into a list of objects. * @@ -145,33 +156,31 @@ public class ObjectCollectionSerializer { * @throws ClassNotFoundException * @throws JAXBException */ - public List<Object> deserialize(InputStream inputStream) throws IOException, XMLStreamException, ClassNotFoundException, JAXBException { - XMLStreamReader rdr = XMLInputFactory.newFactory().createXMLStreamReader(inputStream); - + public List<?> deserialize(XMLStreamReader reader) throws IOException, XMLStreamException, ClassNotFoundException, JAXBException { List<Object> ret = new ArrayList<Object>(); boolean inObjects = false; Unmarshaller unmarshaller = null; - while (rdr.hasNext()) { - rdr.next(); + while (reader.hasNext()) { + reader.next(); - switch(rdr.getEventType()) { + switch(reader.getEventType()) { case XMLStreamReader.START_ELEMENT: - if ("classes-used".equals(rdr.getName().getLocalPart())) { - Set<Class<?>> classesUsed = deserializedClassesToUse(rdr); + if ("classes-used".equals(reader.getName().getLocalPart())) { + Set<Class<?>> classesUsed = deserializedClassesToUse(reader); JAXBContext context = JAXBContext.newInstance(classesUsed.toArray(new Class<?>[classesUsed.size()])); unmarshaller = context.createUnmarshaller(); - } else if ("objects".equals(rdr.getName().getLocalPart())) { + } else if ("objects".equals(reader.getName().getLocalPart())) { inObjects = true; } else if (inObjects) { - Object o = unmarshaller.unmarshal(rdr); + Object o = unmarshaller.unmarshal(reader); ret.add(o); } break; case XMLStreamReader.END_ELEMENT: - if ("objects".equals(rdr.getName().getLocalPart())) { + if ("objects".equals(reader.getName().getLocalPart())) { inObjects = false; } break; diff --git a/modules/test-utils/src/test/java/org/rhq/test/test/ObjectCollectionSerializerTest.java b/modules/test-utils/src/test/java/org/rhq/test/test/ObjectCollectionSerializerTest.java index 108e117..ed1aeb6 100644 --- a/modules/test-utils/src/test/java/org/rhq/test/test/ObjectCollectionSerializerTest.java +++ b/modules/test-utils/src/test/java/org/rhq/test/test/ObjectCollectionSerializerTest.java @@ -174,7 +174,7 @@ public class ObjectCollectionSerializerTest { ByteArrayInputStream in = new ByteArrayInputStream(getSerializedTestObjectTree()); - List<Object> objects = serializer.deserialize(in); + List<?> objects = serializer.deserialize(in); assert objects != null && objects.equals(getTestObjectTree()) : "The deserialized objects don't match the expected results"; } commit 415b30a875f4fb3e7d41c05ee208b2a83338f366 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed Jun 15 10:33:12 2011 +0200 Make the configuration object deserializable using JAXB. diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java index e2754eb..cf1ce4e 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/Configuration.java @@ -23,9 +23,11 @@ package org.rhq.core.domain.configuration; import java.io.Serializable; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; @@ -45,7 +47,9 @@ import javax.persistence.PreUpdate; import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorOrder; import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlElementRefs; import javax.xml.bind.annotation.XmlRootElement; @@ -321,7 +325,11 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM /** * Returns all the direct children of this Configuration. - * + * This collection is fully modifiable and can be added to and removed from. + * + * When adding a property to the collection returned from this method, its + * {@link Property#getConfiguration() configuration property} is set to this instance. + * * @return all child properties of this Configuration */ @NotNull @@ -329,7 +337,80 @@ public class Configuration implements Serializable, Cloneable, AbstractPropertyM @XmlElementRef(name = "PropertySimple", type = PropertySimple.class), @XmlElementRef(name = "PropertyMap", type = PropertyMap.class) }) public Collection<Property> getProperties() { - return getMap().values(); + return new Collection<Property>() { + + public int size() { + return properties.size(); + } + + public boolean isEmpty() { + return properties.isEmpty(); + } + + public boolean contains(Object o) { + return properties.containsValue(o); + } + + public Iterator<Property> iterator() { + return properties.values().iterator(); + } + + public Object[] toArray() { + return properties.values().toArray(); + } + + public <T> T[] toArray(T[] a) { + return properties.values().toArray(a); + } + + public boolean add(Property e) { + properties.put(e.getName(), e); + e.setConfiguration(Configuration.this); + return true; //we always allow adding an element even if it is already present + } + + public boolean remove(Object o) { + return properties.values().remove(o); + } + + public boolean containsAll(Collection<?> c) { + return false; + } + + public boolean addAll(Collection<? extends Property> c) { + boolean ret = false; + for(Property p : c) { + ret = ret || add(p); + } + + return ret; + } + + public boolean removeAll(Collection<?> c) { + boolean ret = false; + for(Object o : c) { + ret = ret || remove(o); + } + + return ret; + } + + public boolean retainAll(Collection<?> c) { + boolean ret = false; + ArrayList<Property> ps = new ArrayList<Property>(properties.values()); + for(Property p : ps) { + if (!c.contains(p)) { + ret = ret || remove(p); + } + } + + return ret; + } + + public void clear() { + properties.clear(); + } + }; } public void setProperties(Collection<Property> properties) { commit ce44e137767dd9d780ecb7536a0977cb614ca3a6 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jun 13 15:17:57 2011 +0200 tmp diff --git a/modules/helpers/inventory-serializer/inventory-rhq-2.3.0.xml b/modules/helpers/inventory-serializer/inventory-rhq-2.3.0.xml new file mode 100644 index 0000000..b70f83e --- /dev/null +++ b/modules/helpers/inventory-serializer/inventory-rhq-2.3.0.xml @@ -0,0 +1,1423 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10001</id> + <uuid>7e83a3c0-2b25-4631-8a69-a15fa14b5565</uuid> + <resourceKey>localhost.localdomain</resourceKey> + <name>localhost.localdomain</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>Linux 2.6.35.13-91.fc14.i686.PAE</version> + <description>Linux Operating System</description> + <ctime>1307353451263</ctime> + <mtime>1307353509094</mtime> + <itime>1307353509094</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>PLATFORM</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>Linux Operating System</description> + <id>10003</id> + <name>Linux</name> + <plugin>Platforms</plugin> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10126</id> + <version>0</version> + <ctime>1307353451263</ctime> + <mtime>1307353451263</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10127</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353451263</ctime> + <mtime>1307353451263</mtime> + <propertyList> + <id>10582</id> + <name>logs</name> + </propertyList> + <propertySimple> + <id>10581</id> + <name>metadataCacheTimeout</name> + <override>false</override> + <stringValue>1800</stringValue> + </propertySimple> + <propertySimple> + <id>10558</id> + <name>enableContentDiscovery</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10559</id> + <name>enableInternalYumServer</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10560</id> + <name>yumPort</name> + <override>false</override> + <stringValue>9080</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10001</id> + </productVersion> +</resource> + +<resource> + <id>10002</id> + <uuid>aabcc93d-29cc-48f7-bfd4-73e0c319d281</uuid> + <resourceKey>localhost.localdomain RHQ Agent</resourceKey> + <name>localhost.localdomain RHQ Agent</name> + <inventoryStatus>NEW</inventoryStatus> + <connected>false</connected> + <version>1.3.1.GA</version> + <description>RHQ Management Agent</description> + <ctime>1307353451265</ctime> + <mtime>1307353451265</mtime> + <itime>1307353451262</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>Management Agent</description> + <id>10030</id> + <name>RHQ Agent</name> + <plugin>RHQAgent</plugin> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10128</id> + <version>0</version> + <ctime>1307353451265</ctime> + <mtime>1307353451265</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10129</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353451265</ctime> + <mtime>1307353451265</mtime> + <propertySimple> + <id>10584</id> + <name>snapshotLogEnabled</name> + <override>false</override> + <stringValue>true</stringValue> + </propertySimple> + <propertyList> + <id>10586</id> + <name>logEventSources</name> + <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="propertyMap"> + <id>10593</id> + <name>logEventSource</name> + <map> + <entry> + <key>enabled</key> + <value xsi:type="propertySimple"> + <id>10595</id> + <name>enabled</name> + <override>false</override> + <stringValue>false</stringValue> + </value> + </entry> + <entry> + <key>logFilePath</key> + <value xsi:type="propertySimple"> + <id>10594</id> + <name>logFilePath</name> + <override>false</override> + <stringValue>/home/metlos/Projects/java/jon/qa/jon/jon-server-2.3.1.GA/agent/rhq-agent/logs/command-trace.log</stringValue> + </value> + </entry> + <entry> + <key>includesPattern</key> + <value xsi:type="propertySimple"> + <id>10597</id> + <name>includesPattern</name> + <override>false</override> + </value> + </entry> + <entry> + <key>minimumSeverity</key> + <value xsi:type="propertySimple"> + <id>10598</id> + <name>minimumSeverity</name> + <override>false</override> + </value> + </entry> + <entry> + <key>dateFormat</key> + <value xsi:type="propertySimple"> + <id>10596</id> + <name>dateFormat</name> + <override>false</override> + </value> + </entry> + </map> + </list> + <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="propertyMap"> + <id>10587</id> + <name>logEventSource</name> + <map> + <entry> + <key>enabled</key> + <value xsi:type="propertySimple"> + <id>10589</id> + <name>enabled</name> + <override>false</override> + <stringValue>false</stringValue> + </value> + </entry> + <entry> + <key>logFilePath</key> + <value xsi:type="propertySimple"> + <id>10588</id> + <name>logFilePath</name> + <override>false</override> + <stringValue>/home/metlos/Projects/java/jon/qa/jon/jon-server-2.3.1.GA/agent/rhq-agent/logs/agent.log</stringValue> + </value> + </entry> + <entry> + <key>includesPattern</key> + <value xsi:type="propertySimple"> + <id>10592</id> + <name>includesPattern</name> + <override>false</override> + </value> + </entry> + <entry> + <key>minimumSeverity</key> + <value xsi:type="propertySimple"> + <id>10590</id> + <name>minimumSeverity</name> + <override>false</override> + <stringValue>ERROR</stringValue> + </value> + </entry> + <entry> + <key>dateFormat</key> + <value xsi:type="propertySimple"> + <id>10591</id> + <name>dateFormat</name> + <override>false</override> + </value> + </entry> + </map> + </list> + </propertyList> + <propertySimple> + <id>10585</id> + <name>snapshotDataEnabled</name> + <override>false</override> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10583</id> + <name>snapshotConfigEnabled</name> + <override>false</override> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10600</id> + <name>type</name> + <override>false</override> + <stringValue>org.mc4j.ems.connection.support.metadata.InternalVMTypeDescriptor</stringValue> + </propertySimple> + <propertySimple> + <id>10599</id> + <name>connectorAddress</name> + <override>false</override> + <stringValue>Local Connection</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability/> + <productVersion> + <id>10002</id> + </productVersion> +</resource> + +<resource> + <id>10003</id> + <uuid>76127b54-4551-48f7-9fde-5323f9ac6162</uuid> + <resourceKey>jdbc:postgresql://127.0.0.1:5432/postgres</resourceKey> + <name>Postgres [postgres]</name> + <inventoryStatus>NEW</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Postgres relational database server</description> + <ctime>1307353451270</ctime> + <mtime>1307353451270</mtime> + <itime>1307353451262</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>PostgreSQL Server</description> + <id>10031</id> + <name>Postgres Server</name> + <plugin>Postgres</plugin> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10130</id> + <version>0</version> + <ctime>1307353451270</ctime> + <mtime>1307353451270</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10141</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353451271</ctime> + <mtime>1307353451271</mtime> + <propertySimple> + <id>10602</id> + <name>port</name> + <override>false</override> + <stringValue>5432</stringValue> + </propertySimple> + <propertySimple> + <id>10603</id> + <name>db</name> + <override>false</override> + <stringValue>postgres</stringValue> + </propertySimple> + <propertySimple> + <id>10601</id> + <name>host</name> + <override>false</override> + <stringValue>127.0.0.1</stringValue> + </propertySimple> + <propertySimple> + <id>10605</id> + <name>principal</name> + <override>false</override> + <stringValue>postgres</stringValue> + </propertySimple> + <propertySimple> + <id>10608</id> + <name>configFile</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10604</id> + <name>driverClass</name> + <override>false</override> + <stringValue>org.postgresql.Driver</stringValue> + </propertySimple> + <propertySimple> + <id>10606</id> + <name>credentials</name> + <override>false</override> + <stringValue>postgres</stringValue> + </propertySimple> + <propertySimple> + <id>10607</id> + <name>pgdataDir</name> + <override>false</override> + <stringValue>/var/lib/pgsql/data</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability/> +</resource> + +<resource> + <id>10005</id> + <uuid>c83c5747-295d-4605-b24f-33aff62839ba</uuid> + <resourceKey>virbr1</resourceKey> + <name>virbr1</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>12:2F:62:56:07:92</description> + <ctime>1307353510534</ctime> + <mtime>1307353510534</mtime> + <itime>1307353510533</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10002</id> + <name>Network Adapter</name> + <plugin>Platforms</plugin> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10144</id> + <version>0</version> + <ctime>1307353510534</ctime> + <mtime>1307353510534</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10145</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353510534</ctime> + <mtime>1307353510534</mtime> + <propertySimple> + <id>10661</id> + <name>macAddress</name> + <override>false</override> + <stringValue>12:2F:62:56:07:92</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10006</id> + <uuid>98130e3c-5cf3-4ba1-b16a-8bb247f11496</uuid> + <resourceKey>wlan0</resourceKey> + <name>wlan0</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>00:22:FA:5F:D3:80</description> + <ctime>1307353510550</ctime> + <mtime>1307353510550</mtime> + <itime>1307353510550</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10002</id> + <name>Network Adapter</name> + <plugin>Platforms</plugin> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10146</id> + <version>0</version> + <ctime>1307353510550</ctime> + <mtime>1307353510550</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10147</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353510551</ctime> + <mtime>1307353510551</mtime> + <propertySimple> + <id>10662</id> + <name>macAddress</name> + <override>false</override> + <stringValue>00:22:FA:5F:D3:80</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10007</id> + <uuid>4cb96df3-cc42-4f57-94cd-73cc048db673</uuid> + <resourceKey>virbr0</resourceKey> + <name>virbr0</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>6E:8F:FF:79:B9:D6</description> + <ctime>1307353510557</ctime> + <mtime>1307353510557</mtime> + <itime>1307353510557</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10002</id> + <name>Network Adapter</name> + <plugin>Platforms</plugin> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10148</id> + <version>0</version> + <ctime>1307353510557</ctime> + <mtime>1307353510557</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10149</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353510557</ctime> + <mtime>1307353510557</mtime> + <propertySimple> + <id>10663</id> + <name>macAddress</name> + <override>false</override> + <stringValue>6E:8F:FF:79:B9:D6</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10008</id> + <uuid>4e59f9ef-fd91-4ec4-8da5-e617e4abf376</uuid> + <resourceKey>tun0</resourceKey> + <name>tun0</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>00:00:00:00:00:00</description> + <ctime>1307353510566</ctime> + <mtime>1307353510566</mtime> + <itime>1307353510565</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10002</id> + <name>Network Adapter</name> + <plugin>Platforms</plugin> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10150</id> + <version>0</version> + <ctime>1307353510566</ctime> + <mtime>1307353510566</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10151</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353510566</ctime> + <mtime>1307353510566</mtime> + <propertySimple> + <id>10664</id> + <name>macAddress</name> + <override>false</override> + <stringValue>00:00:00:00:00:00</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10009</id> + <uuid>dd39bfe4-9368-43a9-9c25-ab5e9c2cdc6a</uuid> + <resourceKey>lo</resourceKey> + <name>lo</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>00:00:00:00:00:00</description> + <ctime>1307353510572</ctime> + <mtime>1307353510572</mtime> + <itime>1307353510572</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10002</id> + <name>Network Adapter</name> + <plugin>Platforms</plugin> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10152</id> + <version>0</version> + <ctime>1307353510572</ctime> + <mtime>1307353510572</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10153</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353510573</ctime> + <mtime>1307353510573</mtime> + <propertySimple> + <id>10665</id> + <name>macAddress</name> + <override>false</override> + <stringValue>00:00:00:00:00:00</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10010</id> + <uuid>0c86b8a7-33b0-4b67-9178-2bb6cbd4fb34</uuid> + <resourceKey>eth0</resourceKey> + <name>eth0</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>00:1C:25:A1:F6:58</description> + <ctime>1307353510580</ctime> + <mtime>1307353510580</mtime> + <itime>1307353510579</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10002</id> + <name>Network Adapter</name> + <plugin>Platforms</plugin> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10154</id> + <version>0</version> + <ctime>1307353510580</ctime> + <mtime>1307353510580</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10155</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353510580</ctime> + <mtime>1307353510580</mtime> + <propertySimple> + <id>10666</id> + <name>macAddress</name> + <override>false</override> + <stringValue>00:1C:25:A1:F6:58</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10011</id> + <uuid>bf1e848c-88aa-4406-bf00-bf80a1825843</uuid> + <resourceKey>/boot</resourceKey> + <name>localhost.localdomain File System (local) /boot</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>/dev/sda1: /boot</description> + <ctime>1307353510586</ctime> + <mtime>1307353510586</mtime> + <itime>1307353510586</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10004</id> + <name>File System</name> + <plugin>Platforms</plugin> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10156</id> + <version>0</version> + <ctime>1307353510586</ctime> + <mtime>1307353510586</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10157</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353510587</ctime> + <mtime>1307353510587</mtime> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10012</id> + <uuid>6a12505a-c668-447b-b178-7993554ca093</uuid> + <resourceKey>/</resourceKey> + <name>localhost.localdomain File System (local) /</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>/dev/mapper/VolGroup-lv_root: /</description> + <ctime>1307353510594</ctime> + <mtime>1307353510594</mtime> + <itime>1307353510593</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10004</id> + <name>File System</name> + <plugin>Platforms</plugin> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10158</id> + <version>0</version> + <ctime>1307353510594</ctime> + <mtime>1307353510594</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10159</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353510594</ctime> + <mtime>1307353510594</mtime> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10013</id> + <uuid>983dff97-dfc4-4ec5-97c7-e2f9287399ef</uuid> + <resourceKey>1</resourceKey> + <name>CPU 1</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>Core(TM)2 Duo CPU T9600 @ 2.80GHz</version> + <description>Intel Core(TM)2 Duo CPU T9600 @ 2.80GHz</description> + <ctime>1307353510600</ctime> + <mtime>1307353510600</mtime> + <itime>1307353510599</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10006</id> + <name>CPU</name> + <plugin>Platforms</plugin> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10160</id> + <version>0</version> + <ctime>1307353510600</ctime> + <mtime>1307353510600</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10161</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353510600</ctime> + <mtime>1307353510600</mtime> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> + +<resource> + <id>10014</id> + <uuid>fb1dd111-07ab-40f4-9040-263dc0324728</uuid> + <resourceKey>0</resourceKey> + <name>CPU 0</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>Core(TM)2 Duo CPU T9600 @ 2.80GHz</version> + <description>Intel Core(TM)2 Duo CPU T9600 @ 2.80GHz</description> + <ctime>1307353510610</ctime> + <mtime>1307353510610</mtime> + <itime>1307353510610</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10006</id> + <name>CPU</name> + <plugin>Platforms</plugin> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10162</id> + <version>0</version> + <ctime>1307353510611</ctime> + <mtime>1307353510611</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10163</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353510611</ctime> + <mtime>1307353510611</mtime> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> + +<resource> + <id>10021</id> + <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> + <resourceKey>127.0.0.1:11676</resourceKey> + <name>Virtual Host 127.0.0.1:11676</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587648</ctime> + <mtime>1307353587648</mtime> + <itime>1307353587648</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10135</id> + <version>0</version> + <ctime>1307353587666</ctime> + <mtime>1307353587666</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10136</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587667</ctime> + <mtime>1307353587667</mtime> + <propertySimple> + <id>10685</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10684</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/127.0.0.111676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10687</id> + <name>url</name> + <override>false</override> + <stringValue>http://127.0.0.1:11676/</stringValue> + </propertySimple> + <propertySimple> + <id>10688</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>4</stringValue> + </propertySimple> + <propertySimple> + <id>10686</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>localhost.localdomain:0</resourceKey> + <name>Virtual Host localhost.localdomain:0</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://localhost.localdomain:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10023</id> + <uuid>c62c5d75-81dd-4b14-a768-2d8c1fca6c88</uuid> + <resourceKey>127.0.0.1:11677</resourceKey> + <name>Virtual Host 127.0.0.1:11677</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <itime>1307353587737</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10139</id> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10140</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <propertySimple> + <id>10695</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10694</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/127.0.0.111677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10697</id> + <name>url</name> + <override>false</override> + <stringValue>http://127.0.0.1:11677/</stringValue> + </propertySimple> + <propertySimple> + <id>10698</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>3</stringValue> + </propertySimple> + <propertySimple> + <id>10696</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10024</id> + <uuid>d1b59168-8666-4bc0-957e-171bf16eec73</uuid> + <resourceKey>127.0.0.1:11675</resourceKey> + <name>Virtual Host 127.0.0.1:11675</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <itime>1307353587750</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10171</id> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10172</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <propertySimple> + <id>10700</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10699</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10702</id> + <name>url</name> + <override>false</override> + <stringValue>http://127.0.0.1:11675/</stringValue> + </propertySimple> + <propertySimple> + <id>10703</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>5</stringValue> + </propertySimple> + <propertySimple> + <id>10701</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>127.0.0.1:11678</resourceKey> + <name>Virtual Host 127.0.0.1:11678</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://127.0.0.1:11678/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> +</resource> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>/home/metlos/Progs/apache-2.2.17/build</resourceKey> + <name>localhost.localdomain Apache 2.2.17 (/home/metlos/Progs/apache-2.2.17/build/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>127.0.0.1</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/bin/httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>/home/metlos/Progs/apache-2.2.17/build</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/FakeInventory.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/FakeInventory.java new file mode 100644 index 0000000..a4d0193 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/FakeInventory.java @@ -0,0 +1,96 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.util; + +import java.util.Collection; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Set; + +/** + * + * + * @author Lukas Krejci + */ +public class FakeInventory { + + HashMap<Class<?>, Set<Object>> database = new HashMap<Class<?>, Set<Object>>(); + + private static final Comparator<Object> EQUALS_COMPARATOR = new Comparator<Object>() { + @Override + public int compare(Object a, Object b) { + if (a == null ? b == null : a.equals(b)) { + return 0; + } + return 1; + } + }; + + public boolean insert(Object o) { + Class<?> c = o.getClass(); + + Set<Object> objects = database.get(c); + + if (objects == null) { + objects = new HashSet<Object>(); + } + + return objects.add(o); + } + + public void insertAll(Object... objects) { + for(Object o : objects) { + insert(o); + } + } + + public void insertAll(Collection<Object> objects) { + for(Object o : objects) { + insert(o); + } + } + + @SuppressWarnings("unchecked") + public <T> T get(T prototype) { + return get(prototype, (Class<T>) prototype.getClass()); + } + + public <T> T get(T prototype, Class<T> clazz) { + return get(prototype, clazz, EQUALS_COMPARATOR); + } + + public <T> T get(T prototype, Class<T> clazz, Comparator<? super T> comparator) { + Set<Object> objects = database.get(clazz); + + if (objects == null) { + return null; + } + + for (Object o : objects) { + T cast = clazz.cast(o); + if (comparator.compare(cast, prototype) == 0) { + return cast; + } + } + + return null; + } +} commit 6cdc0c6dfd9bb175660f03a295afdd905c7599d7 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jun 13 15:17:48 2011 +0200 Created ObjectCollectionSerializer class in the test-utils so that tests can persist JAXB-enabled domain classes. Converted the Inventory Serializer utility to use that. diff --git a/modules/helpers/inventory-serializer/pom.xml b/modules/helpers/inventory-serializer/pom.xml index f08c8ce..b97f9fb 100644 --- a/modules/helpers/inventory-serializer/pom.xml +++ b/modules/helpers/inventory-serializer/pom.xml @@ -84,13 +84,17 @@ <artifactId>postgresql</artifactId> <version>9.0-801.jdbc4</version> <scope>runtime</scope> - </dependency> - + </dependency> <dependency> <groupId>org.rhq</groupId> <artifactId>safe-invoker</artifactId> <version>${project.version}</version> - </dependency> + </dependency> + <dependency> + <groupId>org.rhq</groupId> + <artifactId>test-utils</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> <build> <plugins> diff --git a/modules/helpers/inventory-serializer/src/main/java/org/rhq/helpers/inventoryserializer/Main.java b/modules/helpers/inventory-serializer/src/main/java/org/rhq/helpers/inventoryserializer/Main.java index d15451f..af67320 100644 --- a/modules/helpers/inventory-serializer/src/main/java/org/rhq/helpers/inventoryserializer/Main.java +++ b/modules/helpers/inventory-serializer/src/main/java/org/rhq/helpers/inventoryserializer/Main.java @@ -23,27 +23,23 @@ import gnu.getopt.Getopt; import gnu.getopt.LongOpt; import java.io.File; -import java.io.PrintStream; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; -import java.util.HashSet; import java.util.List; -import java.util.Set; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; import javax.persistence.Query; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; import org.apache.log4j.Logger; import org.rhq.enterprise.server.util.HibernateDetachUtility; import org.rhq.helpers.inventoryserializer.util.ChildFirstClassLoader; +import org.rhq.test.ObjectCollectionSerializer; /** * @@ -77,6 +73,8 @@ public class Main { * @throws Exception */ public static void main(String[] args) throws Exception { + + LongOpt[] longOptions = new LongOpt[7]; longOptions[0] = new LongOpt("driver-class", LongOpt.OPTIONAL_ARGUMENT, null, 'd'); @@ -133,16 +131,14 @@ public class Main { System.exit(1); } - ClassLoader classLoaderToUse = Main.class.getClassLoader(); + ClassLoader classLoaderToUse = Main.class.getClassLoader(); if (jars.size() > 0) { URL[] jarUrls = getUrls(jars); classLoaderToUse = new ChildFirstClassLoader(jarUrls, Main.class.getClassLoader()); } - //these will collect the results and classes of the results - List<Object> allResults = new ArrayList<Object>(); - Set<Class<?>> classes = new HashSet<Class<?>>(); + ObjectCollectionSerializer serializer = new ObjectCollectionSerializer(); EntityManager em = null; ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); @@ -150,6 +146,8 @@ public class Main { Thread.currentThread().setContextClassLoader(classLoaderToUse); em = getEntityManager(driverClass, dialect, connectionUrl, username, password, persistenceUnit); + em.getTransaction().begin(); + for (String query : queries) { log.info("Executing query: " + query); @@ -158,50 +156,19 @@ public class Main { @SuppressWarnings("unchecked") List<Object> results = q.getResultList(); - allResults.addAll(results); - } - - em.clear(); - - for (Object result : allResults) { - classes.add(result.getClass()); - HibernateDetachUtility.nullOutUninitializedFields(result, HibernateDetachUtility.SerializationType.JAXB); + for(Object result : results) { + HibernateDetachUtility.nullOutUninitializedFields(result, HibernateDetachUtility.SerializationType.SERIALIZATION); + } + + serializer.addObjects(results); } + + em.close(); } finally { Thread.currentThread().setContextClassLoader(contextClassLoader); } - PrintStream out = System.out; - out = new PrintStream(out, true, "UTF-8"); - - out.append("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"); - out.append("<inventory-dump>\n"); - - out.append("<classes-used>\n"); - - for (Class<?> cls : classes) { - out.append("<class>").append(cls.getName()).append("</class>\n"); - } - - out.append("</classes-used>\n"); - - out.append("<objects>\n"); - - JAXBContext context = JAXBContext.newInstance(classes.toArray(new Class<?>[classes.size()])); - - Marshaller marshaller = context.createMarshaller(); - - marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true); - marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); - marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8"); - - for (Object r : allResults) { - marshaller.marshal(r, out); - } - - out.append("</objects>\n"); - - out.append("</inventory-dump>\n"); + serializer.serialize(System.out); } /** diff --git a/modules/helpers/inventory-serializer/src/main/resources/log4j.properties b/modules/helpers/inventory-serializer/src/main/resources/log4j.properties index 82af3e5..7e6e52b 100644 --- a/modules/helpers/inventory-serializer/src/main/resources/log4j.properties +++ b/modules/helpers/inventory-serializer/src/main/resources/log4j.properties @@ -1,6 +1,8 @@ -log4j.rootCategory=FATAL, CONSOLE +log4j.rootCategory=INFO, CONSOLE +#log4j.category.org.hibernate.SQL=DEBUG, CONSOLE log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.target=System.err log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n diff --git a/modules/test-utils/src/main/java/org/rhq/test/ObjectCollectionSerializer.java b/modules/test-utils/src/main/java/org/rhq/test/ObjectCollectionSerializer.java new file mode 100644 index 0000000..d9b597f --- /dev/null +++ b/modules/test-utils/src/main/java/org/rhq/test/ObjectCollectionSerializer.java @@ -0,0 +1,224 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.test; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; +import javax.xml.bind.Unmarshaller; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamReader; + +import org.jetbrains.annotations.NotNull; + +/** + * This class produces a JAXB serialized collection of objects and can convert + * such serialized data back to a list of objects. + * + * The objects passed to this class must therefore be JAXB serializable. + * + * This class is intended to be used in tests that need to persist the state + * of some object collection. + * + * @author Lukas Krejci + */ +public class ObjectCollectionSerializer { + private List<Object> objects = new ArrayList<Object>(); + private Set<Class<?>> classes = new HashSet<Class<?>>(); + + /** + * Returns a list of objects that are added to this serializer. + * This list is NOT modifiable, use it only for inspection. + * + * @return + */ + public @NotNull List<Object> getObjects() { + return Collections.unmodifiableList(objects); + } + + public void addObject(@NotNull Object o) { + this.objects.add(o); + this.classes.add(o.getClass()); + } + + public void addObjects(@NotNull Collection<?> objects) { + for(Object o : objects) { + if (o == null) { + continue; + } + + addObject(o); + } + } + + /** + * Returns a set of classes of objects that are to be serialized. + * This set is not modifiable, use it only for informational purposes. + * @return + */ + public @NotNull Set<Class<?>> getClasses() { + return Collections.unmodifiableSet(classes); + } + + /** + * Serializes the objects added to this serialize to the given output. + * + * @param output the output stream to serialize to + * + * @throws IOException + * @throws JAXBException + */ + public void serialize(OutputStream output) throws IOException, JAXBException { + PrintStream out = new PrintStream(output); + out = new PrintStream(out, true, "UTF-8"); + + out.append("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"); + out.append("<inventory-dump>\n"); + + out.append("<classes-used>\n"); + + for (Class<?> cls : classes) { + out.append("<class>").append(cls.getName()).append("</class>\n"); + } + + out.append("</classes-used>\n"); + + out.append("<objects>\n"); + + JAXBContext context = JAXBContext.newInstance(classes.toArray(new Class<?>[classes.size()])); + + Marshaller marshaller = context.createMarshaller(); + + marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); + marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8"); + + for (Object o : objects) { + marshaller.marshal(o, out); + } + + out.append("</objects>\n"); + + out.append("</inventory-dump>\n"); + } + + /** + * This deserializes given input stream into a list of objects. + * + * This method uses the current thread's context classloader to resolve + * the classes of the objects to be deserialized if such classloader is set. + * + * @param inputStream the input stream to read the data from + * + * @return the list of deserialized objects + * @throws XMLStreamException + * @throws ClassNotFoundException + * @throws JAXBException + */ + public List<Object> deserialize(InputStream inputStream) throws IOException, XMLStreamException, ClassNotFoundException, JAXBException { + XMLStreamReader rdr = XMLInputFactory.newFactory().createXMLStreamReader(inputStream); + + List<Object> ret = new ArrayList<Object>(); + + boolean inObjects = false; + + Unmarshaller unmarshaller = null; + + while (rdr.hasNext()) { + rdr.next(); + + switch(rdr.getEventType()) { + case XMLStreamReader.START_ELEMENT: + if ("classes-used".equals(rdr.getName().getLocalPart())) { + Set<Class<?>> classesUsed = deserializedClassesToUse(rdr); + JAXBContext context = JAXBContext.newInstance(classesUsed.toArray(new Class<?>[classesUsed.size()])); + unmarshaller = context.createUnmarshaller(); + } else if ("objects".equals(rdr.getName().getLocalPart())) { + inObjects = true; + } else if (inObjects) { + Object o = unmarshaller.unmarshal(rdr); + ret.add(o); + } + break; + case XMLStreamReader.END_ELEMENT: + if ("objects".equals(rdr.getName().getLocalPart())) { + inObjects = false; + } + break; + } + } + + return ret; + } + + private Set<Class<?>> deserializedClassesToUse(XMLStreamReader rdr) throws XMLStreamException, ClassNotFoundException { + HashSet<Class<?>> ret = new HashSet<Class<?>>(); + + boolean insideClass = false; + while (rdr.hasNext()) { + rdr.next(); + + switch (rdr.getEventType()) { + case XMLStreamReader.START_ELEMENT: + if ("class".equals(rdr.getName().getLocalPart())) { + insideClass = true; + } else { + insideClass = false; + } + break; + case XMLStreamReader.END_ELEMENT: + if ("class".equals(rdr.getName().getLocalPart())) { + insideClass = false; + } else if ("classes-used".equals(rdr.getName().getLocalPart())) { + return ret; + } + break; + case XMLStreamReader.CHARACTERS: + if (insideClass) { + Class<?> c = null; + if (Thread.currentThread().getContextClassLoader() == null) { + c = Class.forName(rdr.getText()); + } else { + c = Class.forName(rdr.getText(), false, Thread.currentThread().getContextClassLoader()); + } + + ret.add(c); + } + break; + } + } + + return ret; + } + +} diff --git a/modules/test-utils/src/test/java/org/rhq/test/test/ObjectCollectionSerializerTest.java b/modules/test-utils/src/test/java/org/rhq/test/test/ObjectCollectionSerializerTest.java new file mode 100644 index 0000000..108e117 --- /dev/null +++ b/modules/test-utils/src/test/java/org/rhq/test/test/ObjectCollectionSerializerTest.java @@ -0,0 +1,181 @@ +package org.rhq.test.test; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import javax.xml.bind.JAXBException; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; + +import org.testng.annotations.Test; + +import org.rhq.test.ObjectCollectionSerializer; + +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/** + * + * + * @author Lukas Krejci + */ +@Test +public class ObjectCollectionSerializerTest { + + @XmlRootElement + @XmlAccessorType(XmlAccessType.FIELD) + public static class MyClass { + public int id; + public String name; + + public List<MyChildClass> children; + + public MyClass() { + + } + + public MyClass(int id, String name) { + this.id = id; + this.name = name; + children = new ArrayList<MyChildClass>(); + } + + public int hashCode() { + return id * (name == null ? 1 : name.hashCode()); + } + + public boolean equals(Object o) { + if (o == this) { + return true; + } + + if (!(o instanceof MyClass)) { + return false; + } + + MyClass other = (MyClass) o; + + if (id != other.id) { + return false; + } + + if (name == null) { + if (other.name != null) { + return false; + } + } else { + if (!name.equals(other.name)) { + return false; + } + } + + return children.equals(other.children); + } + } + + @XmlAccessorType(XmlAccessType.FIELD) + public static class MyChildClass { + public int id; + public String name; + + public MyChildClass() { + + } + + public MyChildClass(int id, String name, MyClass parent) { + this.id = id; + this.name = name; + parent.children.add(this); + } + + public int hashCode() { + return id * (name == null ? 1 : name.hashCode()); + } + + public boolean equals(Object o) { + if (o == this) { + return true; + } + + if (!(o instanceof MyChildClass)) { + return false; + } + + MyChildClass other = (MyChildClass) o; + + if (id != other.id) { + return false; + } + + if (name == null) { + return other.name == null; + } else { + return name.equals(other.name); + } + } + } + + private List<MyClass> getTestObjectTree() { + MyClass m1 = new MyClass(1, "m1"); + new MyChildClass(1, "m1c1", m1); + new MyChildClass(2, "m1c2", m1); + new MyChildClass(3, "m1c3", m1); + + MyClass m2 = new MyClass(2, "m2"); + new MyChildClass(1, "m2c1", m2); + new MyChildClass(2, "m2c2", m2); + new MyChildClass(3, "m2c3", m2); + + return Arrays.asList(m1, m2); + } + + private byte[] getSerializedTestObjectTree() throws IOException, JAXBException { + ObjectCollectionSerializer serializer = new ObjectCollectionSerializer(); + + serializer.addObjects(getTestObjectTree()); + + ByteArrayOutputStream out = new ByteArrayOutputStream(); + + serializer.serialize(out); + + return out.toByteArray(); + } + + @Test + public void testCanSerialize() throws Exception { + byte[] out = getSerializedTestObjectTree(); + + assert out.length > 0 : "The serialization should have produced some output"; + } + + @Test + public void testCanDeserialize() throws Exception { + ObjectCollectionSerializer serializer = new ObjectCollectionSerializer(); + + ByteArrayInputStream in = new ByteArrayInputStream(getSerializedTestObjectTree()); + + List<Object> objects = serializer.deserialize(in); + + assert objects != null && objects.equals(getTestObjectTree()) : "The deserialized objects don't match the expected results"; + } +} commit 6749b62ac9c867e302ffcd046c00992c5f6fa0e7 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jun 13 15:15:37 2011 +0200 Make HibernateDetachUtility compatible both with javassist and CGLIB based Hibernate bytecode enhancers. diff --git a/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java b/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java index 0fdb835..a496efe 100644 --- a/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java +++ b/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java @@ -251,15 +251,17 @@ public class HibernateDetachUtility { if (fieldValue instanceof HibernateProxy) { Object replacement = null; - if (fieldValue.getClass().getName().contains("javassist")) { + String assistClassName = fieldValue.getClass().getName(); + if (assistClassName.contains("javassist") || assistClassName.contains("EnhancerByCGLIB")) { Class assistClass = fieldValue.getClass(); try { Method m = assistClass.getMethod("writeReplace"); replacement = m.invoke(fieldValue); - String className = fieldValue.getClass().getName(); - className = className.substring(0, className.indexOf("_$$_")); + String assistNameDelimiter = assistClassName.contains("javassist") ? "_$$_" : "$$"; + + assistClassName = assistClassName.substring(0, assistClassName.indexOf(assistNameDelimiter)); if (!replacement.getClass().getName().contains("hibernate")) { nullOutUninitializedFields(replacement, checkedObjects, depth + 1, serializationType); commit fbc2595877303deaa918c25637be15d6212242ef Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Tue Jun 7 14:39:43 2011 +0200 tmp diff --git a/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java b/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java index d23dd0a..0fdb835 100644 --- a/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java +++ b/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java @@ -275,7 +275,11 @@ public class HibernateDetachUtility { if (replacement == null) { String className = ((HibernateProxy) fieldValue).getHibernateLazyInitializer().getEntityName(); - Class clazz = Class.forName(className); + + //see if there is a context classloader we should use instead of the current one. + ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); + + Class clazz = contextClassLoader == null ? Class.forName(className) : Class.forName(className, true, contextClassLoader); Class[] constArgs = { Integer.class }; Constructor construct = null; diff --git a/modules/helpers/inventory-serializer/inventory-serializer.sh b/modules/helpers/inventory-serializer/inventory-serializer.sh new file mode 100755 index 0000000..01c4dd0 --- /dev/null +++ b/modules/helpers/inventory-serializer/inventory-serializer.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +java -cp 'target/dependency/*':target/inventory-serializer-4.1.0-SNAPSHOT.jar org.rhq.helpers.inventoryserializer.Main "$@" + diff --git a/modules/helpers/inventory-serializer/pom.xml b/modules/helpers/inventory-serializer/pom.xml new file mode 100644 index 0000000..f08c8ce --- /dev/null +++ b/modules/helpers/inventory-serializer/pom.xml @@ -0,0 +1,123 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>rhq-helpers</artifactId> + <groupId>org.rhq.helpers</groupId> + <version>4.1.0-SNAPSHOT</version> + </parent> + <groupId>org.rhq.helpers</groupId> + <artifactId>inventory-serializer</artifactId> + <version>4.1.0-SNAPSHOT</version> + <name>Inventory Serializer</name> + <description>A helper command line app to export parts of the inventory to XML</description> + + <dependencies> + <dependency> + <groupId>hibernate-entitymanager</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <version>${hibernate-entitymanager.version}</version> + </dependency> + <dependency> + <groupId>gnu-getopt</groupId> + <artifactId>getopt</artifactId> + </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + <version>${hibernate3.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>hibernate-annotations</groupId> + <artifactId>hibernate-annotations</artifactId> + <version>${hibernate-annotations.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-archive-browsing</artifactId> + <version>5.0.0alpha-200607201-119</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1-jboss</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.12.1.GA</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + <version>2.2</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.antlr</groupId> + <artifactId>antlr-runtime</artifactId> + <version>3.3</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>9.0-801.jdbc4</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.rhq</groupId> + <artifactId>safe-invoker</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>org.rhq.helpers.inventoryserializer.Main</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>package</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file diff --git a/modules/helpers/inventory-serializer/src/main/java/org/rhq/helpers/inventoryserializer/Main.java b/modules/helpers/inventory-serializer/src/main/java/org/rhq/helpers/inventoryserializer/Main.java new file mode 100644 index 0000000..d15451f --- /dev/null +++ b/modules/helpers/inventory-serializer/src/main/java/org/rhq/helpers/inventoryserializer/Main.java @@ -0,0 +1,254 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.helpers.inventoryserializer; + +import gnu.getopt.Getopt; +import gnu.getopt.LongOpt; + +import java.io.File; +import java.io.PrintStream; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.Persistence; +import javax.persistence.Query; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.Marshaller; + +import org.apache.log4j.Logger; + +import org.rhq.enterprise.server.util.HibernateDetachUtility; +import org.rhq.helpers.inventoryserializer.util.ChildFirstClassLoader; + +/** + * + * + * @author Lukas Krejci + */ +public class Main { + + private static final Logger log = Logger.getLogger(Main.class); + + private Main() { + + } + + private static void usage() { + System.out.println("Usage: inventory-serializer.[sh|bat] -c [-diupjs] <JPQL Query> [more JPQL quries]"); + System.out.println("Required arguments:"); + System.out.println("-c --connection-url : The JDBC connection URL to the database."); + System.out.println(); + System.out.println("Optional arguments:"); + System.out.println("-d --driver-class : The class of the JDBC driver to use. The driver must be on the classpath. Defaults to org.postgresql.Driver."); + System.out.println("-i --dialect : The Hibernate dialect to use. Defaults to org.hibernate.dialect.PosgreSQLDialect."); + System.out.println("-u --username : The username to use when connecting to the database."); + System.out.println("-p --password : The database password."); + System.out.println("-j --jars : The comma-separated list of jars containing the entities. If none specified, the current classpath is used."); + System.out.println("-s --persistence-unit : The persistence unit to execute the queries with. Defaults to 'rhqpu'."); + } + + /** + * @param args + * @throws Exception + */ + public static void main(String[] args) throws Exception { + LongOpt[] longOptions = new LongOpt[7]; + + longOptions[0] = new LongOpt("driver-class", LongOpt.OPTIONAL_ARGUMENT, null, 'd'); + longOptions[1] = new LongOpt("dialect", LongOpt.OPTIONAL_ARGUMENT, null, 'i'); + longOptions[2] = new LongOpt("connection-url", LongOpt.REQUIRED_ARGUMENT, null, 'c'); + longOptions[3] = new LongOpt("username", LongOpt.OPTIONAL_ARGUMENT, null, 'u'); + longOptions[4] = new LongOpt("password", LongOpt.OPTIONAL_ARGUMENT, null, 'p'); + longOptions[5] = new LongOpt("jars", LongOpt.OPTIONAL_ARGUMENT, null, 'j'); + longOptions[6] = new LongOpt("persistence-unit", LongOpt.OPTIONAL_ARGUMENT, null, 's'); + + Getopt options = new Getopt("iventory-serializer serializer", args, "d:i:c:u:p:j:s:", longOptions); + + String driverClass = "org.postgresql.Driver"; + String dialect = "org.hibernate.dialect.PostgreSQLDialect"; + String connectionUrl = null; + String username = null; + String password = null; + String persistenceUnit = "rhqpu"; + List<String> jars = new ArrayList<String>(); + List<String> queries = new ArrayList<String>(); + + int option; + while ((option = options.getopt()) != -1) { + switch (option) { + case 'd': + driverClass = options.getOptarg(); + break; + case 'i': + dialect = options.getOptarg(); + break; + case 'c': + connectionUrl = options.getOptarg(); + break; + case 'u': + username = options.getOptarg(); + break; + case 'p': + password = options.getOptarg(); + break; + case 'j': + jars.addAll(extractCommaSeparated(options.getOptarg())); + break; + case 's': + persistenceUnit = options.getOptarg(); + } + } + + for (int i = options.getOptind(); i < args.length; i++) { + queries.add(args[i]); + } + + if (driverClass == null || dialect == null || connectionUrl == null || queries.isEmpty()) { + usage(); + System.exit(1); + } + + ClassLoader classLoaderToUse = Main.class.getClassLoader(); + + if (jars.size() > 0) { + URL[] jarUrls = getUrls(jars); + classLoaderToUse = new ChildFirstClassLoader(jarUrls, Main.class.getClassLoader()); + } + + //these will collect the results and classes of the results + List<Object> allResults = new ArrayList<Object>(); + Set<Class<?>> classes = new HashSet<Class<?>>(); + + EntityManager em = null; + ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(classLoaderToUse); + em = getEntityManager(driverClass, dialect, connectionUrl, username, password, persistenceUnit); + + for (String query : queries) { + log.info("Executing query: " + query); + + Query q = em.createQuery(query); + + @SuppressWarnings("unchecked") + List<Object> results = q.getResultList(); + + allResults.addAll(results); + } + + em.clear(); + + for (Object result : allResults) { + classes.add(result.getClass()); + HibernateDetachUtility.nullOutUninitializedFields(result, HibernateDetachUtility.SerializationType.JAXB); + } + } finally { + Thread.currentThread().setContextClassLoader(contextClassLoader); + } + + PrintStream out = System.out; + out = new PrintStream(out, true, "UTF-8"); + + out.append("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"); + out.append("<inventory-dump>\n"); + + out.append("<classes-used>\n"); + + for (Class<?> cls : classes) { + out.append("<class>").append(cls.getName()).append("</class>\n"); + } + + out.append("</classes-used>\n"); + + out.append("<objects>\n"); + + JAXBContext context = JAXBContext.newInstance(classes.toArray(new Class<?>[classes.size()])); + + Marshaller marshaller = context.createMarshaller(); + + marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); + marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8"); + + for (Object r : allResults) { + marshaller.marshal(r, out); + } + + out.append("</objects>\n"); + + out.append("</inventory-dump>\n"); + } + + /** + * @param jars + * @return + */ + private static URL[] getUrls(List<String> jars) { + URL[] ret = new URL[jars.size()]; + + int idx = 0; + for (String jar : jars) { + File f = new File(jar); + if (!f.exists()) { + throw new IllegalArgumentException("Could not find the jar '" + jar + "'."); + } + + try { + ret[idx++] = f.toURI().toURL(); + } catch (MalformedURLException e) { + //doesn't happen + } + } + + return ret; + } + + private static EntityManager getEntityManager(String driverClass, String dialect, String connectionUrl, + String username, String password, String persistenceUnit) { + + HashMap<String, String> overrides = new HashMap<String, String>(); + + overrides.put("javax.persistence.jtaDataSource", null); + overrides.put("javax.persistence.nonJtaDataSource", null); + overrides.put("hibernate.dialect", dialect); + overrides.put("hibernate.connection.driver_class", driverClass); + overrides.put("hibernate.connection.url", connectionUrl); + overrides.put("hibernate.connection.user", username); + overrides.put("hibernate.connection.password", password); + + EntityManagerFactory emf = Persistence.createEntityManagerFactory(persistenceUnit, overrides); + + return emf.createEntityManager(overrides); + } + + private static List<String> extractCommaSeparated(String arg) { + String[] vals = arg.split("\\s*,\\s*"); + + return Arrays.asList(vals); + } +} diff --git a/modules/helpers/inventory-serializer/src/main/java/org/rhq/helpers/inventoryserializer/util/ChildFirstClassLoader.java b/modules/helpers/inventory-serializer/src/main/java/org/rhq/helpers/inventoryserializer/util/ChildFirstClassLoader.java new file mode 100644 index 0000000..33ccf8b --- /dev/null +++ b/modules/helpers/inventory-serializer/src/main/java/org/rhq/helpers/inventoryserializer/util/ChildFirstClassLoader.java @@ -0,0 +1,125 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.helpers.inventoryserializer.util; + +import java.io.IOException; +import java.net.URL; +import java.net.URLClassLoader; +import java.net.URLStreamHandlerFactory; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; + +/** + * + * + * @author Lukas Krejci + */ +public class ChildFirstClassLoader extends URLClassLoader { + + /** + * @param urls + * @param parent + * @param factory + */ + public ChildFirstClassLoader(URL[] urls, ClassLoader parent, URLStreamHandlerFactory factory) { + super(urls, parent, factory); + } + + /** + * @param urls + * @param parent + */ + public ChildFirstClassLoader(URL[] urls, ClassLoader parent) { + super(urls, parent); + } + + /** + * @param urls + */ + public ChildFirstClassLoader(URL[] urls) { + super(urls); + } + + @Override + protected synchronized Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException { + + Class<?> c = findLoadedClass(name); + + //try to find the class among the child classloaders + if (c == null) { + try { + c = findClass(name); + } catch (ClassNotFoundException e) { + //ignore + } + } + + if (c == null) { + //ok, delegate to parent now + try { + if (getParent() != null) { + c = getParent().loadClass(name); + } else { + c = getSystemClassLoader().loadClass(name); + } + } catch (ClassNotFoundException e) { + throw e; + } + } + + if (resolve) { + resolveClass(c); + } + + return c; + } + + @Override + public URL getResource(String name) { + URL ret = findResource(name); + + if (ret == null) { + if (getParent() != null) { + ret = getParent().getResource(name); + } else { + ret = getSystemClassLoader().getResource(name); + } + } + + return ret; + } + + @Override + public Enumeration<URL> getResources(String name) throws IOException { + Enumeration<URL> ret = findResources(name); + + if (ret == null || !ret.hasMoreElements()) { + if (getParent() != null) { + ret = getParent().getResources(name); + } else { + ret = getSystemClassLoader().getResources(name); + } + } + + return ret; + } + +} diff --git a/modules/helpers/inventory-serializer/src/main/resources/log4j.properties b/modules/helpers/inventory-serializer/src/main/resources/log4j.properties new file mode 100644 index 0000000..82af3e5 --- /dev/null +++ b/modules/helpers/inventory-serializer/src/main/resources/log4j.properties @@ -0,0 +1,6 @@ +log4j.rootCategory=FATAL, CONSOLE + +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n + diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 8b4892a..0c73fd3 100644 --- a/modules/helpers/pom.xml +++ b/modules/helpers/pom.xml @@ -47,6 +47,8 @@ <module>bundleGen</module> <module>perftest-support</module> +  +  </modules> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index a352ae4..a7a6bf5 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -153,6 +153,12 @@ <include name="${project.artifactId}-${project.version}.jar" /> </fileset> </copy> +  + <move todir="target/itest/plugins"> + <fileset dir="target/itest/plugins" /> + <mapper type="regexp" from="^(.*)-${project.version}\.jar$$" to="\1-for-apache-test.jar" /> + </move> <unzip dest="target/itest/lib"> <fileset dir="${settings.localRepository}/org/hyperic/sigar-dist/${sigar.version}" includes="*.zip" /> <patternset> @@ -229,11 +235,39 @@  <environmentVariables> <LD_LIBRARY_PATH>${basedir}/target/itest/lib:${env.LD_LIBRARY_PATH}</LD_LIBRARY_PATH> - </environmentVariables> + </environmentVariables> <systemPropertyVariables> <org.hyperic.sigar.path>${basedir}/target/itest/lib</org.hyperic.sigar.path> <project.artifactId>${project.artifactId}</project.artifactId> <project.version>${project.version}</project.version> + + <apache2.install.dir>PASS THIS IN FROM THE COMMAND LINE</apache2.install.dir> + <apache2.exe.path>bin/httpd</apache2.exe.path> + <apache1.install.dir>PASS THIS IN FROM THE COMMAND LINE</apache1.install.dir> + <apache1.exe.path>bin/httpd</apache1.exe.path> + +  + <simpleWithResolvableServerNames.server.root>${apache2.install.dir}</simpleWithResolvableServerNames.server.root> +  + <simpleWithResolvableServerNames.document.root></simpleWithResolvableServerNames.document.root> + <simpleWithResolvableServerNames.listen1>11675</simpleWithResolvableServerNames.listen1> + <simpleWithResolvableServerNames.listen2>11676</simpleWithResolvableServerNames.listen2> + <simpleWithResolvableServerNames.listen3>11677</simpleWithResolvableServerNames.listen3> + <simpleWithResolvableServerNames.listen4>11678</simpleWithResolvableServerNames.listen4> + <simpleWithResolvableServerNames.servername.directive></simpleWithResolvableServerNames.servername.directive> + <simpleWithResolvableServerNames.additional.directives></simpleWithResolvableServerNames.additional.directives> + <simpleWithResolvableServerNames.vhost1.urls>127.0.0.1:11675</simpleWithResolvableServerNames.vhost1.urls> + <simpleWithResolvableServerNames.vhost1.servername.directive>ServerName 127.0.0.1:11675</simpleWithResolvableServerNames.vhost1.servername.directive> + <simpleWithResolvableServerNames.vhost1.additional.directives></simpleWithResolvableServerNames.vhost1.additional.directives> + <simpleWithResolvableServerNames.vhost2.urls>127.0.0.1:11676</simpleWithResolvableServerNames.vhost2.urls> + <simpleWithResolvableServerNames.vhost2.servername.directive>ServerName 127.0.0.1:11676</simpleWithResolvableServerNames.vhost2.servername.directive> + <simpleWithResolvableServerNames.vhost2.additional.directives></simpleWithResolvableServerNames.vhost2.additional.directives> + <simpleWithResolvableServerNames.vhost3.urls>127.0.0.1:11677</simpleWithResolvableServerNames.vhost3.urls> + <simpleWithResolvableServerNames.vhost3.servername.directive>ServerName 127.0.0.1:11677</simpleWithResolvableServerNames.vhost3.servername.directive> + <simpleWithResolvableServerNames.vhost3.additional.directives></simpleWithResolvableServerNames.vhost3.additional.directives> + <simpleWithResolvableServerNames.vhost4.urls>127.0.0.1:11678</simpleWithResolvableServerNames.vhost4.urls> + <simpleWithResolvableServerNames.vhost4.servername.directive>ServerName 127.0.0.1:11678</simpleWithResolvableServerNames.vhost4.servername.directive> + <simpleWithResolvableServerNames.vhost4.additional.directives></simpleWithResolvableServerNames.vhost4.additional.directives> </systemPropertyVariables> </configuration> </execution> diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java index 130acee..08ff372 100644 --- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java +++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java @@ -636,10 +636,14 @@ public class ApacheServerDiscoveryComponent implements ResourceDiscoveryComponen return null; } - private static String formatResourceKey(Configuration pluginConfiguration) { + public static String formatResourceKey(Configuration pluginConfiguration) { String serverRoot = pluginConfiguration.getSimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_SERVER_ROOT).getStringValue(); String httpdConf = pluginConfiguration.getSimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_HTTPD_CONF).getStringValue(); + return formatResourceKey(serverRoot, httpdConf); + } + + public static String formatResourceKey(String serverRoot, String httpdConf) { serverRoot = FileUtils.getCanonicalPath(serverRoot); httpdConf = FileUtils.getCanonicalPath(httpdConf); diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java index abd6dd9..45f883d 100644 --- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java +++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java @@ -149,12 +149,27 @@ public enum HttpdAddressUtility { /** * A simple parser of the provided address into host and port * sections. + * + * This is equivalent to calling {@link #parse(String, String)} with + * the default scheme "http". * * @param address the address to parse * @return an instance of Address with host and port set accordingly */ public static Address parse(String address) { - String scheme = "http"; + return parse(address, "http"); + } + + /** + * Parses given address into an Address object and assigns a default scheme if none + * is present in the address itself. + * + * @param address the address to parse + * @param defaultScheme the default scheme to apply or null if no scheme is required by default + * @return the parsed address + */ + public static Address parse(String address, String defaultScheme) { + String scheme = defaultScheme; int schemeSpecIdx = address.indexOf("://"); if (schemeSpecIdx >= 0) { scheme = address.substring(0, schemeSpecIdx); @@ -163,7 +178,7 @@ public enum HttpdAddressUtility { int lastColonIdx = address.lastIndexOf(':'); if (lastColonIdx == -1) { - return new Address(address, NO_PORT_SPECIFIED_VALUE); + return new Address(scheme, address, NO_PORT_SPECIFIED_VALUE); } else { int lastRightBracketPos = address.lastIndexOf(']'); if (lastColonIdx > lastRightBracketPos) { @@ -184,7 +199,7 @@ public enum HttpdAddressUtility { } } } - + public boolean isPortWildcard() { return port == PORT_WILDCARD_VALUE; } @@ -257,15 +272,19 @@ public enum HttpdAddressUtility { public String toString(boolean includeScheme, boolean interpretWildcardPort) { StringBuilder bld = new StringBuilder(); - if (includeScheme) { + if (includeScheme && scheme != null) { bld.append(scheme).append("://"); } - bld.append(host); + if (host != null) { + bld.append(host); + + if (port != NO_PORT_SPECIFIED_VALUE) { + bld.append(":"); + } + } if (port != NO_PORT_SPECIFIED_VALUE) { - bld.append(":"); - if (port == PORT_WILDCARD_VALUE && interpretWildcardPort) { bld.append(WILDCARD); } else { @@ -428,8 +447,8 @@ public enum HttpdAddressUtility { return ret; } - private static Address parseListen(String listenValue) { - Address ret = Address.parse(listenValue); + public static Address parseListen(String listenValue) { + Address ret = Address.parse(listenValue, null); if (!ret.isPortDefined()) { try { ret.port = Integer.parseInt(ret.host); diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java new file mode 100644 index 0000000..0e798b8 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTest.java @@ -0,0 +1,236 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache; + +import static org.testng.Assert.assertTrue; + +import java.io.File; +import java.net.URI; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.jmock.Expectations; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Parameters; +import org.testng.annotations.Test; + +import org.rhq.core.clientapi.agent.metadata.PluginMetadataParser; +import org.rhq.core.clientapi.descriptor.AgentPluginDescriptorUtil; +import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor; +import org.rhq.core.clientapi.server.discovery.InventoryReport; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pc.ServerServices; +import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; +import org.rhq.core.pluginapi.inventory.PluginContainerDeployment; +import org.rhq.core.pluginapi.inventory.ResourceContext; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.core.system.SystemInfo; +import org.rhq.core.system.SystemInfoFactory; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; +import org.rhq.plugins.apache.util.HttpdAddressUtility; +import org.rhq.plugins.platform.PlatformComponent; +import org.rhq.test.pc.PluginContainerSetup; +import org.rhq.test.pc.PluginContainerTest; + +/** + * + * + * @author Lukas Krejci + */ +@Test +public class UpgradeTest extends PluginContainerTest { + + private static final String PLATFORM_PLUGIN = "file:target/itest/plugins/rhq-platform-plugin-for-apache-test.jar"; + private static final String AUGEAS_PLUGIN = "file:target/itest/plugins/rhq-augeas-plugin-for-apache-test.jar"; + private static final String APACHE_PLUGIN = "file:target/itest/plugins/rhq-apache-plugin-for-apache-test.jar"; + + private static final String DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES = "simpleWithResolvableServerNames"; + + private List<ResourceType> resourceTypesInApachePlugin; + + private static class DiscoveryInput { + public String serverRootPath; + public String exePath; + public String httpdConfPath; + public String snmpHost; + public int snmpPort; + public String pingUrl; + } + + @BeforeClass + public void parseResourceTypesFromApachePlugin() throws Exception { + PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(new URI(APACHE_PLUGIN) + .toURL()); + PluginMetadataParser parser = new PluginMetadataParser(descriptor, + Collections.<String, PluginMetadataParser> emptyMap()); + + resourceTypesInApachePlugin = parser.getAllTypes(); + } + + @AfterClass + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void shutdownApache(String apacheInstallationDirectory, + String exePath) throws Exception { + + File apacheInstallationDir = new File(apacheInstallationDirectory); + File confDir = new File(apacheInstallationDir, "conf"); + + //it really doesn't matter which configuration i use here + DeploymentConfig deploymentConfig = ApacheDeploymentUtil + .getDeploymentConfigurationFromSystemProperties(DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES); + + DiscoveryInput discoveryInput = new DiscoveryInput(); + discoveryInput.serverRootPath = apacheInstallationDirectory; + discoveryInput.exePath = exePath; + discoveryInput.httpdConfPath = confDir.getAbsolutePath() + File.separatorChar + "httpd.conf"; + discoveryInput.snmpHost = deploymentConfig.snmpHost; + discoveryInput.snmpPort = deploymentConfig.snmpPort; + + HttpdAddressUtility.Address addr = deploymentConfig.mainServer.address1; + HttpdAddressUtility.Address addrToUse = new HttpdAddressUtility.Address(null, null, + HttpdAddressUtility.Address.NO_PORT_SPECIFIED_VALUE); + addrToUse.scheme = addr.scheme == null ? "http" : addr.scheme; + addrToUse.host = addr.host == null ? "localhost" : addr.host; + addrToUse.port = addr.port; + + discoveryInput.pingUrl = addrToUse.toString(); + + ApacheServerComponent serverComponent = findAndStartServerComponent(discoveryInput); + + serverComponent.invokeOperation("stop", null); + } + + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testSimpleConfigurationWithResolvableServerNames_Apache2_upgradeFromRHQ1_3(String apacheInstallationDirectory, + String exePath) throws Exception { + + final ServerServices ss = getCurrentPluginContainerConfiguration().getServerServices(); + + context.checking(new Expectations() { + { + allowing(ss.getDiscoveryServerService().mergeInventoryReport(with(any(InventoryReport.class)))); + //will(/* push the mocked inventory down to the agent */); + } + }); + + prepareApacheForTest(DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES, apacheInstallationDirectory, exePath, + Arrays.asList("/full-configurations/simple/httpd.conf", "/snmpd.conf")); + + startConfiguredPluginContainer(); + + //TODO check the results of the upgrade + } + + private void prepareApacheForTest(String configurationName, String apacheInstallationDirectory, + String apacheExePath, List<String> configurationFiles) throws Exception { + File apacheInstallationDir = new File(apacheInstallationDirectory); + + assertTrue(apacheInstallationDir.exists(), + "The 'apache2.install.dir' system property denotes a non-existant directory: '" + + apacheInstallationDirectory + "'."); + + File confDir = new File(apacheInstallationDir, "conf"); + + assertTrue( + confDir.exists(), + "The 'apache2.install.dir' system property denotes a directory that doesn't have a 'conf' subdirectory. This is unexpected."); + + DeploymentConfig deploymentConfig = ApacheDeploymentUtil + .getDeploymentConfigurationFromSystemProperties(configurationName); + + ApacheDeploymentUtil.deployConfiguration(confDir, configurationFiles, deploymentConfig); + + DiscoveryInput discoveryInput = new DiscoveryInput(); + discoveryInput.serverRootPath = apacheInstallationDirectory; + discoveryInput.exePath = apacheExePath; + discoveryInput.httpdConfPath = confDir.getAbsolutePath() + File.separatorChar + "httpd.conf"; + discoveryInput.snmpHost = deploymentConfig.snmpHost; + discoveryInput.snmpPort = deploymentConfig.snmpPort; + + HttpdAddressUtility.Address addr = deploymentConfig.mainServer.address1; + HttpdAddressUtility.Address addrToUse = new HttpdAddressUtility.Address(null, null, + HttpdAddressUtility.Address.NO_PORT_SPECIFIED_VALUE); + addrToUse.scheme = addr.scheme == null ? "http" : addr.scheme; + addrToUse.host = addr.host == null ? "localhost" : addr.host; + addrToUse.port = addr.port; + + discoveryInput.pingUrl = addrToUse.toString(); + + restartApache(discoveryInput); + } + + private void restartApache(DiscoveryInput discoveryInput) throws Exception { + ApacheServerComponent serverComponent = findAndStartServerComponent(discoveryInput); + + serverComponent.invokeOperation("restart", null); + } + + private ApacheServerComponent findAndStartServerComponent(DiscoveryInput discoveryInput) throws Exception { + ApacheServerDiscoveryComponent discoveryComponent = new ApacheServerDiscoveryComponent(); + + ResourceType resourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + SystemInfo systemInfo = SystemInfoFactory.createSystemInfo(); + + ResourceDiscoveryContext<PlatformComponent> discoveryContext = new ResourceDiscoveryContext<PlatformComponent>( + resourceType, null, null, systemInfo, null, null, PluginContainerDeployment.AGENT); + + Configuration config = discoveryContext.getDefaultPluginConfiguration(); + config.put(new PropertySimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_SERVER_ROOT, + discoveryInput.serverRootPath)); + config + .put(new PropertySimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_EXECUTABLE_PATH, discoveryInput.exePath)); + config + .put(new PropertySimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_HTTPD_CONF, discoveryInput.httpdConfPath)); + config + .put(new PropertySimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_SNMP_AGENT_HOST, discoveryInput.snmpHost)); + config + .put(new PropertySimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_SNMP_AGENT_PORT, discoveryInput.snmpPort)); + config.put(new PropertySimple(ApacheServerComponent.PLUGIN_CONFIG_PROP_URL, discoveryInput.pingUrl)); + + DiscoveredResourceDetails result = discoveryComponent.discoverResource(config, discoveryContext); + + ApacheServerComponent serverComponent = new ApacheServerComponent(); + + Resource resource = new Resource(result.getResourceKey(), null, resourceType); + resource.setPluginConfiguration(config); + ResourceContext<PlatformComponent> resourceContext = new ResourceContext<PlatformComponent>(resource, null, + null, systemInfo, null, null, null, null, null, null, null, null); + + serverComponent.start(resourceContext); + return serverComponent; + } + + private ResourceType findApachePluginResourceTypeByName(String resourceTypeName) { + for (ResourceType rt : resourceTypesInApachePlugin) { + if (resourceTypeName.equals(rt.getName())) { + return rt; + } + } + + return null; + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java new file mode 100644 index 0000000..0e22cd4 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java @@ -0,0 +1,271 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.util; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.unitils.thirdparty.org.apache.commons.io.FileUtils; + +import org.rhq.plugins.apache.util.HttpdAddressUtility.Address; + +/** + * + * + * @author Lukas Krejci + */ +public class ApacheDeploymentUtil { + + private static final Log LOG = LogFactory.getLog(ApacheDeploymentUtil.class); + + private ApacheDeploymentUtil() { + + } + + public static class DeploymentConfig { + public static class VHost { + public Address address1 = new Address(null, null, Address.NO_PORT_SPECIFIED_VALUE); + public Address address2 = null; + public Address address3 = null; + public Address address4 = null; + public String serverNameDirective = null; + public final List<String> additionalDirectives = new ArrayList<String>(); + } + + public String serverRoot = null; + public String documentRoot = "hdocs"; + public String snmpHost = "localhost"; + public int snmpPort = 1610; + public final VHost mainServer = new VHost(); + public final VHost vhost1 = new VHost(); + public final VHost vhost2 = new VHost(); + public final VHost vhost3 = new VHost(); + public final VHost vhost4 = new VHost(); + + { + mainServer.address2 = new Address(null, null, Address.NO_PORT_SPECIFIED_VALUE); + mainServer.address3 = new Address(null, null, Address.NO_PORT_SPECIFIED_VALUE); + mainServer.address4 = new Address(null, null, Address.NO_PORT_SPECIFIED_VALUE); + } + } + + public static DeploymentConfig getDeploymentConfigurationFromSystemProperties(String variablesPrefix) { + DeploymentConfig ret = new DeploymentConfig(); + + ret.serverRoot = System.getProperty(variablesPrefix + ".server.root"); + ret.documentRoot = System.getProperty(variablesPrefix + ".document.root", "htdocs"); + ret.snmpHost = System.getProperty(variablesPrefix + ".snmp.host", "localhost"); + ret.snmpPort = Integer.parseInt(System.getProperty(variablesPrefix + ".snmp.port", "1610")); + ret.mainServer.address1 = HttpdAddressUtility.parseListen(System.getProperty(variablesPrefix + ".listen1")); + ret.mainServer.address2 = HttpdAddressUtility.parseListen(System.getProperty(variablesPrefix + ".listen2")); + ret.mainServer.address3 = HttpdAddressUtility.parseListen(System.getProperty(variablesPrefix + ".listen3")); + ret.mainServer.address4 = HttpdAddressUtility.parseListen(System.getProperty(variablesPrefix + ".listen4")); + ret.mainServer.serverNameDirective = System.getProperty(variablesPrefix + ".servername.directive"); + + String additionalDirectives = System.getProperty(variablesPrefix + ".additional.directives"); + fillAdditionalDirectives(additionalDirectives, ret.mainServer.additionalDirectives); + + readVHostConfigFromSystemProperties(ret.vhost1, variablesPrefix + ".vhost1"); + readVHostConfigFromSystemProperties(ret.vhost2, variablesPrefix + ".vhost2"); + readVHostConfigFromSystemProperties(ret.vhost3, variablesPrefix + ".vhost3"); + readVHostConfigFromSystemProperties(ret.vhost4, variablesPrefix + ".vhost4"); + + return ret; + } + + public static void deployConfiguration(File targetConfDirectory, List<String> configFilesOnClasspath, DeploymentConfig config) throws IOException { + List<File> targetFiles = new ArrayList<File>(); + for(String fileOnClassPath : configFilesOnClasspath) { + String fileName = new File(fileOnClassPath).getName(); + + File targetFile = new File(targetConfDirectory, fileName); + + URL fileUrl = ApacheDeploymentUtil.class.getResource(fileOnClassPath); + + FileUtils.copyURLToFile(fileUrl, targetFile); + + targetFiles.add(targetFile); + } + + replaceTokensInConfigFiles(targetFiles, config); + } + + private static void replaceTokensInConfigFiles(List<File> configFiles, DeploymentConfig config) { + char[] buffer = new char[8192]; + StringBuilder wholeFile = new StringBuilder(); + for(File file : configFiles) { + BufferedReader rdr = null; + boolean errorOccured = false; + try { + rdr = new BufferedReader(new FileReader(file)); + + int cnt = -1; + + while ((cnt = rdr.read(buffer)) != -1) { + wholeFile.append(buffer, 0, cnt); + } + } catch (FileNotFoundException e) { + LOG.error("File '" + file + "' not found.", e); + errorOccured = true; + } catch (IOException e) { + LOG.error("Error while reading file '" + file + "'.", e); + errorOccured = true; + } + + if (rdr != null) { + try { + rdr.close(); + } catch (IOException e) { + LOG.error("Failed to close the file '" + file + "'."); + } + } + + if (errorOccured) { + continue; + } + + String newFileContents = replaceTokens(wholeFile, config); + + Writer wrt = null; + try { + wrt = new FileWriter(file); + + wrt.write(newFileContents); + } catch (IOException e) { + LOG.error("Error while writing to the configuration file '" + file + "'.", e); + } finally { + try { + wrt.close(); + } catch (IOException e) { + LOG.error("Failed to close the file '" + file + "'.", e); + } + } + } + } + + private static String replaceTokens(CharSequence input, DeploymentConfig config) { + String s = input.toString(); + + s = s.replaceAll("\\$SERVER_ROOT", config.serverRoot); + s = s.replaceAll("\\$DOCUMENT_ROOT", config.documentRoot); + s = s.replaceAll("\\$SNMP_HOST", config.snmpHost); + s = s.replaceAll("\\$SNMP_PORT", Integer.toString(config.snmpPort)); + s = s.replaceAll("\\$LISTEN_1", config.mainServer.address1.toString()); + s = s.replaceAll("\\$LISTEN_2", config.mainServer.address2.toString()); + s = s.replaceAll("\\$LISTEN_3", config.mainServer.address3.toString()); + s = s.replaceAll("\\$LISTEN_4", config.mainServer.address4.toString()); + s = s.replaceAll("\\$SNMP_HOST", config.snmpHost); + + s = replaceVHostTokens(s, 0, config.mainServer); + s = replaceVHostTokens(s, 1, config.vhost1); + s = replaceVHostTokens(s, 2, config.vhost2); + s = replaceVHostTokens(s, 3, config.vhost3); + s = replaceVHostTokens(s, 4, config.vhost4); + + return s; + } + + private static String replaceVHostTokens(String input, int vhostNumber, DeploymentConfig.VHost vhost) { + String serverNameToken = getVhostOrMainServerToken(vhostNumber, "SERVER_NAME_DIRECTIVE"); + String urlsToken = getVhostOrMainServerToken(vhostNumber, "URLS"); + String additionalDirectivesToken = getVhostOrMainServerToken(vhostNumber, "ADDITIONAL_DIRECTIVES"); + + input = input.replaceAll(serverNameToken, vhost.serverNameDirective == null ? "" : vhost.serverNameDirective); + + if (vhostNumber > 0) { + String urls = vhost.address1.toString(false, false); + if (vhost.address2 != null) { + urls += " " + vhost.address2.toString(false, false); + } + if (vhost.address3 != null) { + urls += " " + vhost.address3.toString(false, false); + } + if (vhost.address4 != null) { + urls += " " + vhost.address4.toString(false, false); + } + + input = input.replaceAll(urlsToken, urls); + } + + String additionalDirectives = ""; + if (!vhost.additionalDirectives.isEmpty()) { + String newline = System.getProperty("line.separator"); + for(String dir : vhost.additionalDirectives) { + additionalDirectives += dir + newline; + } + } + + input = input.replaceAll(additionalDirectivesToken, additionalDirectives); + + return input; + } + + private static String getVhostOrMainServerToken(int vhostNumber, String tokenBody) { + return "\\$" + (vhostNumber == 0 ? "" : ("VHOST" + vhostNumber + "_")) + tokenBody; + } + + private static void readVHostConfigFromSystemProperties(DeploymentConfig.VHost vhost, String prefix) { + String addrsString = System.getProperty(prefix + ".urls"); + + if (addrsString == null) { + throw new IllegalStateException("The system property '" + prefix + ".urls' doesn't exist. It is needed to define the vhost."); + } + + String[] addrs = addrsString.split("[ \t]+"); + + //the fallthroughs below are intentional + switch(addrs.length) { + case 4: + vhost.address4 = Address.parse(addrs[3], null); + case 3: + vhost.address3 = Address.parse(addrs[2], null); + case 2: + vhost.address2 = Address.parse(addrs[1], null); + case 1: + vhost.address1 = Address.parse(addrs[0], null); + break; + default: + throw new IllegalStateException("The system property '" + prefix + ".urls' specified " + addrs.length + " addresses. Only 1-4 addresses are supported."); + } + + vhost.serverNameDirective = System.getProperty(prefix + ".servername.directive"); + + String additionalDirectives = System.getProperty(prefix + ".additional.directives"); + fillAdditionalDirectives(additionalDirectives, vhost.additionalDirectives); + } + + private static void fillAdditionalDirectives(String additionalDirectivesString, List<String> additionalDirectives) { + if (additionalDirectivesString != null) { + for(String dir : additionalDirectivesString.split("\\n")) { + additionalDirectives.add(dir); + } + } + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/StandAloneContainer.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/StandAloneContainer.java deleted file mode 100644 index 0047faf..0000000 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/StandAloneContainer.java +++ /dev/null @@ -1,75 +0,0 @@ -package org.rhq.plugins.apache.util; - -import java.io.File; - -import org.rhq.augeas.tree.AugeasTree; -import org.rhq.core.clientapi.agent.PluginContainerException; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.pc.PluginContainer; -import org.rhq.core.pc.PluginContainerConfiguration; -import org.rhq.core.pc.inventory.InventoryManager; -import org.rhq.core.pc.inventory.ResourceContainer; -import org.rhq.core.pc.plugin.FileSystemPluginFinder; -import org.rhq.core.pc.util.ComponentUtil; -import org.rhq.core.pc.util.FacetLockType; - -public class StandAloneContainer { - - public PluginContainer getContainer(AugeasTree tree,String pluginPath){ - PluginContainer container=null; - try { - container = PluginContainer.getInstance(); - File pluginDir = new File(pluginPath); - PluginContainerConfiguration config = new PluginContainerConfiguration(); - config.setPluginFinder(new FileSystemPluginFinder(pluginDir)); - config.setPluginDirectory(pluginDir); - - container.setConfiguration(config); - container.initialize(); - container.getInventoryManager().executeServerScanImmediately(); - container.getInventoryManager().executeServiceScanImmediately(); - - return container; - - }catch(Exception e){ - e.printStackTrace(); - if (container!=null) - container.shutdown(); - } - return null; - } - - - - public static <T> T getComponent(int resourceId, Class<T> facetInterface, FacetLockType lockType, - long timeout, boolean daemonThread, boolean onlyIfStarted) throws PluginContainerException { - InventoryManager inventoryManager = PluginContainer.getInstance().getInventoryManager(); - ResourceContainer resourceContainer = inventoryManager.getResourceContainer(resourceId); - if (resourceContainer == null) { - throw new PluginContainerException("Resource component container could not be retrieved for resource: " - + resourceId); - } - return resourceContainer.createResourceComponentProxy(facetInterface, lockType, timeout, daemonThread, onlyIfStarted); - } - - public static <T> Object getComponentProxy(Resource res,Class<T> facetInterface) throws Exception { - ClassLoader currenContextClassLoader = Thread.currentThread() - .getContextClassLoader(); - try { - Resource asResource = res; - ClassLoader cl = PluginContainer.getInstance().getPluginComponentFactory(). - getResourceClassloader(asResource); - - Class<?> resourceSpecificFacetInterface = Class.forName( - facetInterface.getName(), true, cl); - - Thread.currentThread().setContextClassLoader(cl); - - return ComponentUtil.getComponent(asResource.getId(),resourceSpecificFacetInterface, - FacetLockType.WRITE, 30000, true, true); - } finally { - Thread.currentThread().setContextClassLoader( - currenContextClassLoader); - } - } -} diff --git a/modules/plugins/apache/src/test/resources/full-configurations/includes/1.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/includes/1.vhost.conf new file mode 100644 index 0000000..3d0cbb8 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/includes/1.vhost.conf @@ -0,0 +1,9 @@ +<VirtualHost $VHOST1_URLS> + $VHOST1_SERVER_NAME_DIRECTIVE + $VHOST1_ADDITIONAL_DIRECTIVES +</VirtualHost> + +<VirtualHost $VHOST2_URLS> + $VHOST2_SERVER_NAME_DIRECTIVE + $VHOST2_ADDITIONAL_DIRECTIVES +</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/includes/2.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/includes/2.vhost.conf new file mode 100644 index 0000000..5a5025e --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/includes/2.vhost.conf @@ -0,0 +1,9 @@ +<VirtualHost $VHOST3_URLS> + $VHOST3_SERVER_NAME_DIRECTIVE + $VHOST3_ADDITIONAL_DIRECTIVES +</VirtualHost> + +<VirtualHost $VHOST4_URLS> + $VHOST4_SERVER_NAME_DIRECTIVE + $VHOST4_ADDITIONAL_DIRECTIVES +</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/includes/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/includes/httpd.conf new file mode 100644 index 0000000..d0cf67c --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/includes/httpd.conf @@ -0,0 +1,40 @@ +ServerRoot $SERVER_ROOT + +Listen $LISTEN_1 +Listen $LISTEN_2 +Listen $LISTEN_3 +Listen $LISTEN_4 + +ServerAdmin root@localhost + +$SERVER_NAME_DIRECTIVE + +DocumentRoot $DOCUMENT_ROOT + +DirectoryIndex index.html index.html.var + +TypesConfig conf/mime.types + +DefaultType text/plain + +ErrorLog logs/error_log + +LogLevel debug + +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent + +CustomLog logs/access_log combined + +# Apache SNMP +LoadModule snmpcommon_module modules/libsnmpcommon.so +LoadModule snmpagt_module modules/libsnmpmonagt.so +SNMPConf conf +SNMPVar var +# End of apache SNMP + +$ADDITIONAL_DIRECTIVES + +Include *.vhost.conf diff --git a/modules/plugins/apache/src/test/resources/full-configurations/mess/1.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/mess/1.vhost.conf new file mode 100644 index 0000000..1898969 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/mess/1.vhost.conf @@ -0,0 +1,17 @@ +<IfModule not_loaded_module> + <VirtualHost $VHOST1_URLS> + $VHOST1_SERVER_NAME_DIRECTIVE + $VHOST1_ADDITIONAL_DIRECTIVES + </VirtualHost> +</IfModule> + +LoadModule proxy_module modules/mod_proxy.so + +<IfModule snmpcommon_module> +<IfModule mod_proxy.c> + <VirtualHost $VHOST2_URLS> + $VHOST2_SERVER_NAME_DIRECTIVE + $VHOST2_ADDITIONAL_DIRECTIVES + </VirtualHost> +</IfModule> +</IfModule> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/mess/2.vhost.conf b/modules/plugins/apache/src/test/resources/full-configurations/mess/2.vhost.conf new file mode 100644 index 0000000..146cea9 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/mess/2.vhost.conf @@ -0,0 +1,13 @@ +<IfModule snmpcommon_module> +<IfModule mod_unknown.c> + <VirtualHost $VHOST3_URLS> + $VHOST3_SERVER_NAME_DIRECTIVE + $VHOST3_ADDITIONAL_DIRECTIVES + </VirtualHost> +</IfModule> +</IfModule> + +<VirtualHost $VHOST4_URLS> + $VHOST4_SERVER_NAME_DIRECTIVE + $VHOST4_ADDITIONAL_DIRECTIVES +</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/mess/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/mess/httpd.conf new file mode 100644 index 0000000..d0cf67c --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/mess/httpd.conf @@ -0,0 +1,40 @@ +ServerRoot $SERVER_ROOT + +Listen $LISTEN_1 +Listen $LISTEN_2 +Listen $LISTEN_3 +Listen $LISTEN_4 + +ServerAdmin root@localhost + +$SERVER_NAME_DIRECTIVE + +DocumentRoot $DOCUMENT_ROOT + +DirectoryIndex index.html index.html.var + +TypesConfig conf/mime.types + +DefaultType text/plain + +ErrorLog logs/error_log + +LogLevel debug + +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent + +CustomLog logs/access_log combined + +# Apache SNMP +LoadModule snmpcommon_module modules/libsnmpcommon.so +LoadModule snmpagt_module modules/libsnmpmonagt.so +SNMPConf conf +SNMPVar var +# End of apache SNMP + +$ADDITIONAL_DIRECTIVES + +Include *.vhost.conf diff --git a/modules/plugins/apache/src/test/resources/full-configurations/nested/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/nested/httpd.conf new file mode 100644 index 0000000..3882e8f --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/nested/httpd.conf @@ -0,0 +1,68 @@ +ServerRoot $SERVER_ROOT + +Listen $LISTEN_1 +Listen $LISTEN_2 +Listen $LISTEN_3 +Listen $LISTEN_4 + +ServerAdmin root@localhost + +$SERVER_NAME_DIRECTIVE + +DocumentRoot $DOCUMENT_ROOT + +DirectoryIndex index.html index.html.var + +TypesConfig conf/mime.types + +DefaultType text/plain + +ErrorLog logs/error_log + +LogLevel debug + +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent + +CustomLog logs/access_log combined + +# Apache SNMP +LoadModule snmpcommon_module modules/libsnmpcommon.so +LoadModule snmpagt_module modules/libsnmpmonagt.so +SNMPConf conf +SNMPVar var +# End of apache SNMP + +$ADDITIONAL_DIRECTIVES + +<IfModule not_loaded_module> + <VirtualHost $VHOST1_URLS> + $VHOST1_SERVER_NAME_DIRECTIVE + $VHOST1_ADDITIONAL_DIRECTIVES + </VirtualHost> +</IfModule> + +LoadModule proxy_module modules/mod_proxy.so + +<IfModule snmpcommon_module> +<IfModule mod_proxy.c> + <VirtualHost $VHOST2_URLS> + $VHOST2_SERVER_NAME_DIRECTIVE + $VHOST2_ADDITIONAL_DIRECTIVES + </VirtualHost> +</IfModule> + +<IfModule mod_unknown.c> + <VirtualHost $VHOST3_URLS> + $VHOST3_SERVER_NAME_DIRECTIVE + $VHOST3_ADDITIONAL_DIRECTIVES + </VirtualHost> +</IfModule> +</IfModule> + +<VirtualHost $VHOST4_URLS> + $VHOST4_SERVER_NAME_DIRECTIVE + $VHOST4_ADDITIONAL_DIRECTIVES +</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/full-configurations/simple/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/simple/httpd.conf new file mode 100644 index 0000000..13195ef --- /dev/null +++ b/modules/plugins/apache/src/test/resources/full-configurations/simple/httpd.conf @@ -0,0 +1,58 @@ +ServerRoot $SERVER_ROOT + +Listen $LISTEN_1 +Listen $LISTEN_2 +Listen $LISTEN_3 +Listen $LISTEN_4 + +ServerAdmin root@localhost + +$SERVER_NAME_DIRECTIVE + +DocumentRoot $DOCUMENT_ROOT + +DirectoryIndex index.html index.html.var + +TypesConfig conf/mime.types + +DefaultType text/plain + +ErrorLog logs/error_log + +LogLevel debug + +LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %b" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent + +CustomLog logs/access_log combined + +# Apache SNMP +LoadModule snmpcommon_module modules/libsnmpcommon.so +LoadModule snmpagt_module modules/libsnmpmonagt.so +SNMPConf conf +SNMPVar var +# End of apache SNMP + +$ADDITIONAL_DIRECTIVES + +<VirtualHost $VHOST1_URLS> + $VHOST1_SERVER_NAME_DIRECTIVE + $VHOST1_ADDITIONAL_DIRECTIVES +</VirtualHost> + +<VirtualHost $VHOST2_URLS> + $VHOST2_SERVER_NAME_DIRECTIVE + $VHOST2_ADDITIONAL_DIRECTIVES +</VirtualHost> + +<VirtualHost $VHOST3_URLS> + $VHOST3_SERVER_NAME_DIRECTIVE + $VHOST3_ADDITIONAL_DIRECTIVES +</VirtualHost> + +<VirtualHost $VHOST4_URLS> + $VHOST4_SERVER_NAME_DIRECTIVE + $VHOST4_ADDITIONAL_DIRECTIVES +</VirtualHost> diff --git a/modules/plugins/apache/src/test/resources/snmpd.conf b/modules/plugins/apache/src/test/resources/snmpd.conf new file mode 100644 index 0000000..1cbc543 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/snmpd.conf @@ -0,0 +1,141 @@ +############################################################################### +# +# Conductor SNMP configuration file. +# +# This file is used to configure the Covalent SNMP Conductor agent. +# +# All lines beginning with a '#' are comments and are intended for you +# to read. All other lines are configuration commands for the agent. +# +# For more information, please refer to: +# http://www.covalent.net/resource/documentation/ers/2.2.0/HTML/ProductGuide/… +# +############################################################################### +# Network Setup +############################################################################### +# agentaddress +# +# SYNTAX: +# agentaddress [(udp|tcp):]port[@address][,...] +# DESCRIPTION: +# This directive specifies the port(s) and optional address the SNMP agent +# will listen on. Multiple ports can be separated by commas. Transports can +# be specified by prepending the port number with the transport name ("udp" +# or "tcp") followed by a colon. To bind to a particular interface, you can +# specify the address (@address) you want it to bind with. +# EXAMPLE: +# agentaddress 8161,tcp:8161,9161@localhost +# Directs the agent to listen on udp port 8161 for any address, tcp port +# 8161 for any address, and udp port 9161 on only the interface associated +# with the localhost address. +# DEFAULT: +# agentaddress 161 + +agentaddress $SNMP_PORT@$SNMP_HOST + +############################################################################### +# View-based Access Control +############################################################################### +# This section explains on how to configure the View Based Access Control. +# +# If you want SNMPv1 and/or SNMPv2c access, you need to map +# the community name into a security name. +# SYNTAX: +# com2sec <SECNAME> <NETWORK> <COMMUNITY> +# <SECNAME> is used as user within the SNMP agent. +# <NETWORK> is used to defined from which hosts or networks +# the SNMP agent can be accessed by using the associated +# community string. +# <COMMUNITY> is the community string as used in SNMPv1 and SNMPv2c +# for authentication. + +com2sec local localhost public +#@@ENABLESNMPV12@@com2sec mynetwork @@SNMPNETWORK@@ public + +#### +# You need to map the <SECNAME>'s into one or muliple groups +# and assicate a security model to it. +# SYNTAX: +# group <GROUPNAME> <SECMODEL> <SECNAME> +# <GROUPNAME> is the idenitfication of the group. +# <SECMODEL> is the security model used. The agent +# uses: 'v1', 'v2c', 'usm' or 'any' +# <SECNAME> is the name via which SNMPv1 and SNMPv2c +# have access or the 'username' of SNMPv3 + +group MyRWGroup v1 local +group MyRWGroup v2c local +#@@ENABLESNMPV12@@group MyROGroup v1 mynetwork +#@@ENABLESNMPV12@@group MyROGroup v2c mynetwork + +#### +# You need to create a view of the MIB that can either be a +# complete or partial view. +# SYNTAX: +# view <VIEWNAME> <TYPE> <SUBTREE> <MASK> +# <VIEWNAME> identification for a MIB view. +# <TYPE> is either 'included' or 'excluded' and perform +# the associated action on the <SUBTREE> +# <SUBTREE> the MIB subtree to which the view applies. +# <MASK> is on the places in the OID-string for the accessed objects that +# must be match to included in this view. + +view all included .1 80 + +#### +# Grant each group access and define its permissions. +# SYNTAX: access <GROUPNAME> <CONTEXT> <SECMODEL> <SECLEVEL> <MATCH> <READ> <WRITE> <NOTIFY> +# <GROUPNAME> the group identification as defined with 'group'. +# <CONTEXT> the context in which access is granted. Default "" +# <SECMODEL> the security model required to be used for access +# The agent uses: 'v1', 'v2c', 'usm' or 'any' +# <SECLEVEL> The security level used for access to the MIB. The agent +# uses: 'noauth', 'auth' or 'priv' +# <MATCH> specifies how CONTEXT should be matched against the +# context of the incoming pdu, either exact or prefix. +# <READ> specificies the view for corresponding access. +# <WRITE> specificies the view for corresponding access. +# <NOTIFY> specificies the view for corresponding access. +access MyROGroup "" any noauth exact all none none +access MyRWGroup "" any noauth exact all all none + +############################################################################### +# User-based Security +############################################################################### +# For SNMPv3 you need to create users. However, after starting and stopping +# you would like to delete the 'createuser' line. The SNMP agent will store +# this information encrypted, in a persistent configuration file. +# +# We first want to create or map the SNMPv3 user into a group and provide +# access with the above view-based access control. +# Forinstance, group MyRWGroup usm covalent + +#group MyRWGroup usm covalent + +# For SNMPv3 (User-based Security) we need create a user. +# SYNTAX: CreateUser <USERNAME> <MD5/SHA> <MD5PASSPHRASE> [DES] <PASSPHRASE> +# <USERNAME> the SNMPv3 user name. Maps in to view-based access +# control on the <SECNAME> +# <MD5/SHA> type of authentication +# <MD5PASSPHRASE> the MD5 or SHA passphrase. +# <DES> the privacy protocol +# <DESPASSPHRASE> the privacy passphrase. +# Your passphrases must be at least 8 characters long! + +#@@ENABLESNMPV3@@createUser covalent MD5 @@SNMPV3PASSWORD@@ DES @@SNMPV3PASSWORD@@ + +# NOTE: If you have used the installer that was provided with Conductor +# You probably have already created the user 'covalent'. +# This was done if you were asked for an SNMPv3 password. +############################################################################### +# System information +# +# One can define some values to be returned for the system group. +# 'sysLocation' where the system is located. +# SYNTAX: syslocation <STRING> +# 'sysContact' for this system. +# SYNTAX: syscontact <STRING> + +syscontact Covalent SNMP Conductor <webmaster(a)your.domain> +syslocation Apache Server with Covalent SNMP Conductor + diff --git a/pom.xml b/pom.xml index 98dfb0c..1ccfc93 100644 --- a/pom.xml +++ b/pom.xml @@ -509,6 +509,12 @@ <artifactId>cobertura</artifactId> <version>${cobertura.version}</version> </dependency> +  + <dependency> + <groupId>ant</groupId> + <artifactId>ant-nodeps</artifactId> + <version>1.6.5</version> + </dependency> </dependencies> </plugin> <plugin> commit ce1acd9e6cb798a29aa6d68a6cdb51ff7b119909 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Tue May 31 14:19:19 2011 +0200 Fix the NPE if the plugin URL specified in the PluginContainerSetup was defined using the schema-specific part as with the relative paths to the current directory: file:relative/path diff --git a/modules/core/plugin-container/src/test/java/org/rhq/test/pc/PluginContainerSetup.java b/modules/core/plugin-container/src/test/java/org/rhq/test/pc/PluginContainerSetup.java index a6baff0..df4ca05 100644 --- a/modules/core/plugin-container/src/test/java/org/rhq/test/pc/PluginContainerSetup.java +++ b/modules/core/plugin-container/src/test/java/org/rhq/test/pc/PluginContainerSetup.java @@ -44,7 +44,8 @@ public @interface PluginContainerSetup { * Examples of URIs: * <ul> * <li> classpath:///test-plugin.jar - * <li> file:///some/location/on/the/filesystem.jar + * <li> file:///some/absolute/location/on/the/filesystem.jar + * <li> file:relative/path/to/current/directory/blah.jar * <li> http://www.rhq-project.org/tests/test-plugin.jar */ String[] plugins(); diff --git a/modules/core/plugin-container/src/test/java/org/rhq/test/pc/PluginContainerTest.java b/modules/core/plugin-container/src/test/java/org/rhq/test/pc/PluginContainerTest.java index 7e91ede..07a8ea3 100644 --- a/modules/core/plugin-container/src/test/java/org/rhq/test/pc/PluginContainerTest.java +++ b/modules/core/plugin-container/src/test/java/org/rhq/test/pc/PluginContainerTest.java @@ -387,7 +387,7 @@ public class PluginContainerTest extends JMockTest { } - String pluginFileName = pluginUri.getPath().substring(pluginUri.getPath().lastIndexOf('/') + 1); + String pluginFileName = pluginUrl.getPath().substring(pluginUrl.getPath().lastIndexOf('/') + 1); File pluginJar = new File(destination, pluginFileName); FileUtils.copyURLToFile(pluginUrl, pluginJar); commit 80dc1b2ae792d617a8b7e8aac200f63bef038fed Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Tue May 31 11:41:14 2011 +0200 Set up the main server vhost URL and response time log file location even if the parent apache server component doesn't have the URL property set. In that case, the main server sample address is detected and used. diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java index 28f68da..8efac1d 100644 --- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java +++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java @@ -86,7 +86,7 @@ public class ApacheVirtualHostServiceDiscoveryComponent implements ResourceDisco tree = RuntimeApacheConfiguration.extract(tree, serverComponent.getCurrentProcessInfo(), serverComponent.getCurrentBinaryInfo(), serverComponent.getModuleNames(), false); //first define the root server as one virtual host - discoverMainServer(context, discoveredResources); + discoverMainServer(context, tree, discoveredResources); ResourceType resourceType = context.getResourceType(); @@ -273,7 +273,7 @@ public class ApacheVirtualHostServiceDiscoveryComponent implements ResourceDisco } private void discoverMainServer(ResourceDiscoveryContext<ApacheServerComponent> context, - Set<DiscoveredResourceDetails> discoveredResources) throws Exception { + ApacheDirectiveTree runtimeConfig, Set<DiscoveredResourceDetails> discoveredResources) throws Exception { ResourceType resourceType = context.getResourceType(); Configuration mainServerPluginConfig = context.getDefaultPluginConfiguration(); @@ -284,25 +284,28 @@ public class ApacheVirtualHostServiceDiscoveryComponent implements ResourceDisco String mainServerUrl = context.getParentResourceContext().getPluginConfiguration().getSimple( ApacheServerComponent.PLUGIN_CONFIG_PROP_URL).getStringValue(); - if (mainServerUrl != null && !"null".equals(mainServerUrl)) { - PropertySimple mainServerUrlProp = new PropertySimple(ApacheVirtualHostServiceComponent.URL_CONFIG_PROP, - mainServerUrl); + if (mainServerUrl == null || mainServerUrl.trim().isEmpty()) { + HttpdAddressUtility.Address addr = context.getParentResourceComponent().getAddressUtility().getMainServerSampleAddress(runtimeConfig, null, 0); + mainServerUrl = addr.toString(); + } + + PropertySimple mainServerUrlProp = new PropertySimple(ApacheVirtualHostServiceComponent.URL_CONFIG_PROP, + mainServerUrl); - mainServerPluginConfig.put(mainServerUrlProp); + mainServerPluginConfig.put(mainServerUrlProp); - URI mainServerUri = new URI(mainServerUrl); - String host = mainServerUri.getHost(); - int port = mainServerUri.getPort(); - if (port == -1) { - port = 80; - } + URI mainServerUri = new URI(mainServerUrl); + String host = mainServerUri.getHost(); + int port = mainServerUri.getPort(); + if (port == -1) { + port = 80; + } - File rtLogFile = new File(logsDir, host + port + RT_LOG_FILE_NAME_SUFFIX); + File rtLogFile = new File(logsDir, host + port + RT_LOG_FILE_NAME_SUFFIX); - PropertySimple rtLogProp = new PropertySimple( - ApacheVirtualHostServiceComponent.RESPONSE_TIME_LOG_FILE_CONFIG_PROP, rtLogFile.toString()); - mainServerPluginConfig.put(rtLogProp); - } + PropertySimple rtLogProp = new PropertySimple( + ApacheVirtualHostServiceComponent.RESPONSE_TIME_LOG_FILE_CONFIG_PROP, rtLogFile.toString()); + mainServerPluginConfig.put(rtLogProp); String key = ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY;

1 0

[rhq] Branch 'apache-integration-tests' - 21 commits - modules/core modules/plugins modules/test-utils
by lkrejci 11 Jul '11

11 Jul '11

modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java | 3 modules/core/plugin-container/src/test/java/org/rhq/test/pc/PluginContainerTest.java | 2 modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java | 72 modules/plugins/apache/pom.xml | 82 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VHostSpec.java | 4 modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VirtualHostLegacyResourceKeyUtil.java | 90 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java | 235 - modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java | 431 --- modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java | 776 +++++ modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeConfigurationWithIncludesFromRHQ1_3Test.java | 36 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeMessyConfigurationFromRHQ1_3Test.java | 35 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeNestedConfigurationFromRHQ1_3Test.java | 171 + modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeSimpleConfigurationFromRHQ1_3Test.java | 153 + modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeConfigurationWithIncludesFromRHQ3_0_0Test.java | 36 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeMessyConfigurationFromRHQ3_0_0Test.java | 34 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeNestedConfigurationFromRHQ3_0_0Test.java | 378 ++ modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java | 332 ++ modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeConfigurationWithIncludesFromRHQ3_0_1Test.java | 38 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeMessyConfigurationFromRHQ3_0_1Test.java | 38 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeNestedConfigurationFromRHQ3_0_1Test.java | 479 +++ modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java | 467 +++ modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeConfigurationWithIncludesFromRHQ3_0_2Test.java | 34 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeMessyConfigurationFromRHQ3_0_2Test.java | 36 modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeNestedConfigurationFromRHQ3_0_2Test.java | 206 + modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeSimpleConfigurationFromRHQ3_0_2Test.java | 180 + modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java | 93 modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/httpd.conf | 13 modules/plugins/apache/src/test/resources/full-configurations/2.2.x/mess/1.vhost.conf | 4 modules/plugins/apache/src/test/resources/full-configurations/2.2.x/mess/httpd.conf | 13 modules/plugins/apache/src/test/resources/full-configurations/2.2.x/nested/httpd.conf | 15 modules/plugins/apache/src/test/resources/full-configurations/2.2.x/simple/httpd.conf | 11 modules/plugins/apache/src/test/resources/log4j.xml | 2 modules/plugins/apache/src/test/resources/mime.types | 1351 ---------- modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory-single-vhost.xml | 215 + modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory.xml | 539 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/mess/inventory-single-vhost.xml | 215 + modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/mess/inventory.xml | 543 ++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/nested/inventory-single-vhost.xml | 215 + modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/nested/inventory.xml | 543 ++++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory-single-vhost.xml | 215 + modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory.xml | 4 modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp-anyaddr.xml | 538 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp.xml | 462 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-without-snmp.xml | 538 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/mess/inventory-with-snmp.xml | 313 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/mess/inventory-without-snmp.xml | 310 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/nested/inventory-with-snmp.xml | 313 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/nested/inventory-without-snmp.xml | 310 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp-anyaddr.xml | 538 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml | 462 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml | 538 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-duplicate-main.xml | 538 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp-anyaddr.xml | 538 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp.xml | 462 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-without-snmp.xml | 538 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-duplicate-main.xml | 386 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-snmp-anyaddr.xml | 310 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-snmp.xml | 310 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-without-snmp.xml | 310 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-duplicate-main.xml | 386 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-snmp-anyaddr.xml | 310 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-snmp.xml | 310 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-without-snmp.xml | 310 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml | 538 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml | 538 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml | 462 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml | 538 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/includes/inventory-single-vhost.xml | 215 + modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/includes/inventory.xml | 539 +++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/mess/inventory-single-vhost.xml | 215 + modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/mess/inventory.xml | 377 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/nested/inventory-single-vhost.xml | 215 + modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/nested/inventory.xml | 377 ++ modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/simple/inventory-single-vhost.xml | 215 + modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/simple/inventory.xml | 539 +++ modules/test-utils/src/main/java/org/rhq/test/TokenReplacingProperties.java | 11 modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java | 69 77 files changed, 20084 insertions(+), 2133 deletions(-) New commits: commit c2e13e2556bf584d352314be028333328569502b Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jul 11 19:34:24 2011 +0200 Apache integration tests now only explicitly executed by passing -Dapache.integration.tests, the httpd binary now downloaded as a maven dependency so that we don't require some complicated setup outside of the build process. diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 65d1bb2..41625fb 100644 --- a/modules/plugins/apache/pom.xml +++ b/modules/plugins/apache/pom.xml @@ -119,11 +119,57 @@ <activation> <property> - <name>maven.test.skip</name> - <value>!true</value> + <name>apache.integration.tests</name> </property> </activation> + <properties> + <httpd.version>2.2.17</httpd.version> + <httpd.install.dir>${basedir}/target/itest/httpd</httpd.install.dir> + </properties> + + <repositories> + <repository> + <id>Httpd binary repo</id> + <name>Repository containing a binaries of httpd to be used with the tests</name> + <url>http://jon01.mw.lab.eng.bos.redhat.com:8042/m2-repo</url> + </repository> + </repositories> + + <dependencies> +  + <dependency> + <groupId>org.apache</groupId> + <artifactId>httpd</artifactId> + <version>${httpd.version}</version> + <scope>test</scope> + <type>zip</type> + </dependency> + </dependencies> + <build> <plugins>  @@ -144,6 +190,7 @@ <mkdir dir="target/itest" /> <mkdir dir="target/itest/plugins" /> <mkdir dir="target/itest/lib" /> + <mkdir dir="target/itest/httpd" /> <copy toDir="target/itest/plugins" flatten="true"> <fileset dir="${settings.localRepository}/"> <include name="org/rhq/rhq-platform-plugin/${project.version}/rhq-platform-plugin-${project.version}.jar" /> @@ -206,7 +253,30 @@ </move> </then> </if> - <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> + <delete dir="target/itest/lib/augeas-native-${augeas.zip.version}" /> + +  + <unzip dest="target/itest/httpd"> + <fileset dir="${settings.localRepository}/org/apache/httpd/${httpd.version}" includes="*.zip" /> + </unzip> + <move todir="target/itest/httpd"> + <fileset dir="target/itest/httpd/httpd-${httpd.version}/x86" /> + </move> + <if> + <or> + <os family="unix" arch="x86_64" /> + <os family="unix" arch="amd64" /> + </or> + <then> + <move todir="target/itest/httpd"> + <fileset dir="target/itest/httpd/httpd-${httpd.version}/x86_64" /> + </move> + </then> + </if> + <delete dir="target/itest/httpd/httpd-${httpd.version}" /> + <chmod perm="ugo+rx"> + <fileset dir="target/itest/httpd/bin" /> + </chmod> </tasks> </configuration> <goals> @@ -241,10 +311,8 @@ <project.artifactId>${project.artifactId}</project.artifactId> <project.version>${project.version}</project.version> - <apache2.install.dir>PASS THIS IN FROM THE COMMAND LINE</apache2.install.dir> - <apache2.exe.path>bin/httpd</apache2.exe.path> - <apache1.install.dir>PASS THIS IN FROM THE COMMAND LINE</apache1.install.dir> - <apache1.exe.path>bin/httpd</apache1.exe.path> + <apache2.install.dir>${httpd.install.dir}</apache2.install.dir> + <apache2.exe.path>${httpd.install.dir}/bin/httpd</apache2.exe.path>   +  + <childResources> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>${vhost4.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/nested/inventory-single-vhost.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/nested/inventory-single-vhost.xml new file mode 100644 index 0000000..00ac425 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/nested/inventory-single-vhost.xml @@ -0,0 +1,215 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/nested/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/nested/inventory.xml new file mode 100644 index 0000000..2804e4a --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/nested/inventory.xml @@ -0,0 +1,543 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10021</id> + <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> + <resourceKey>${vhost2.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587648</ctime> + <mtime>1307353587648</mtime> + <itime>1307353587648</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10135</id> + <version>0</version> + <ctime>1307353587666</ctime> + <mtime>1307353587666</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10136</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587667</ctime> + <mtime>1307353587667</mtime> + <propertySimple> + <id>10685</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10684</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10687</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10688</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>4</stringValue> + </propertySimple> + <propertySimple> + <id>10686</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + +  + <childResources> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>${vhost4.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory-single-vhost.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory-single-vhost.xml new file mode 100644 index 0000000..00ac425 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory-single-vhost.xml @@ -0,0 +1,215 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp.xml index ff9d715..8b3e0ff 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp.xml @@ -398,7 +398,7 @@ <propertySimple> <id>10795</id> <name>url</name> - <stringValue>http://${localhost}:${port1}/</stringValue> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10709</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/mess/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/mess/inventory-with-snmp.xml new file mode 100644 index 0000000..89bfa5a --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/mess/inventory-with-snmp.xml @@ -0,0 +1,313 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> +  + <resourceKey>${main.rhq4.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/mess/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/mess/inventory-without-snmp.xml new file mode 100644 index 0000000..b054c63 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/mess/inventory-without-snmp.xml @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10041</id> + <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1309116183350</ctime> + <mtime>1309116225316</mtime> + <itime>1309116225316</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10046</id> + <uuid>908ea047-889e-4978-a61f-d96e8b1c6d17</uuid> + <resourceKey>${vhost4.rhq4.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + <itime>1309117635788</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10241</id> + <version>0</version> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10242</id> + <version>0</version> + <ctime>1309117635790</ctime> + <mtime>1309117635790</mtime> + <propertySimple> + <id>10858</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10857</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10860</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10859</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10048</id> + <uuid>704a31f3-7f5f-46c1-9bda-70f2645c9604</uuid> + <resourceKey>${main.rhq4.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635810</ctime> + <mtime>1309117635810</mtime> + <itime>1309117635810</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10245</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10246</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + <propertySimple> + <id>10926</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10925</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10928</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10927</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10201</id> + <version>0</version> + <ctime>1309116183368</ctime> + <mtime>1309116183368</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10211</id> + <version>0</version> + <ctime>1309117523737</ctime> + <mtime>1309117523737</mtime> + <propertySimple> + <id>10863</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10862</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10861</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10865</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10864</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10867</id> + <name>snmpAgentHost</name> + <stringValue>${unresolvable.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10866</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10869</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10868</id> + <name>url</name> + <stringValue>http://${servername}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10870</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10871</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10872</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10873</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10874</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10875</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10876</id> + <name>snmpAgentPort</name> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10877</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + <propertySimple> + <id>10878</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/nested/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/nested/inventory-with-snmp.xml new file mode 100644 index 0000000..89bfa5a --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/nested/inventory-with-snmp.xml @@ -0,0 +1,313 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> +  + <resourceKey>${main.rhq4.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/nested/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/nested/inventory-without-snmp.xml new file mode 100644 index 0000000..b054c63 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/nested/inventory-without-snmp.xml @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10041</id> + <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1309116183350</ctime> + <mtime>1309116225316</mtime> + <itime>1309116225316</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10046</id> + <uuid>908ea047-889e-4978-a61f-d96e8b1c6d17</uuid> + <resourceKey>${vhost4.rhq4.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + <itime>1309117635788</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10241</id> + <version>0</version> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10242</id> + <version>0</version> + <ctime>1309117635790</ctime> + <mtime>1309117635790</mtime> + <propertySimple> + <id>10858</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10857</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10860</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10859</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10048</id> + <uuid>704a31f3-7f5f-46c1-9bda-70f2645c9604</uuid> + <resourceKey>${main.rhq4.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635810</ctime> + <mtime>1309117635810</mtime> + <itime>1309117635810</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10245</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10246</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + <propertySimple> + <id>10926</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10925</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10928</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10927</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10201</id> + <version>0</version> + <ctime>1309116183368</ctime> + <mtime>1309116183368</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10211</id> + <version>0</version> + <ctime>1309117523737</ctime> + <mtime>1309117523737</mtime> + <propertySimple> + <id>10863</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10862</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10861</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10865</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10864</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10867</id> + <name>snmpAgentHost</name> + <stringValue>${unresolvable.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10866</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10869</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10868</id> + <name>url</name> + <stringValue>http://${servername}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10870</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10871</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10872</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10873</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10874</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10875</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10876</id> + <name>snmpAgentPort</name> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10877</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + <propertySimple> + <id>10878</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml index ff9d715..8b3e0ff 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml @@ -398,7 +398,7 @@ <propertySimple> <id>10795</id> <name>url</name> - <stringValue>http://${localhost}:${port1}/</stringValue> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10709</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp.xml index ff9d715..8b3e0ff 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp.xml @@ -398,7 +398,7 @@ <propertySimple> <id>10795</id> <name>url</name> - <stringValue>http://${localhost}:${port1}/</stringValue> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10709</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-duplicate-main.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-duplicate-main.xml new file mode 100644 index 0000000..19e4531 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-duplicate-main.xml @@ -0,0 +1,386 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>100371</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac90</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-snmp-anyaddr.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-snmp-anyaddr.xml new file mode 100644 index 0000000..2a09b04 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-snmp-anyaddr.xml @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>20037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>0.0.0.0:${port1}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://0.0.0.0:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-snmp.xml new file mode 100644 index 0000000..95f21d0 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-with-snmp.xml @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-without-snmp.xml new file mode 100644 index 0000000..b3d2dea --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/mess/inventory-without-snmp.xml @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10041</id> + <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1309116183350</ctime> + <mtime>1309116225316</mtime> + <itime>1309116225316</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10046</id> + <uuid>908ea047-889e-4978-a61f-d96e8b1c6d17</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + <itime>1309117635788</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10241</id> + <version>0</version> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10242</id> + <version>0</version> + <ctime>1309117635790</ctime> + <mtime>1309117635790</mtime> + <propertySimple> + <id>10858</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10857</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10860</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10859</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10048</id> + <uuid>704a31f3-7f5f-46c1-9bda-70f2645c9604</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635810</ctime> + <mtime>1309117635810</mtime> + <itime>1309117635810</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10245</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10246</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + <propertySimple> + <id>10926</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10925</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10928</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10927</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10201</id> + <version>0</version> + <ctime>1309116183368</ctime> + <mtime>1309116183368</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10211</id> + <version>0</version> + <ctime>1309117523737</ctime> + <mtime>1309117523737</mtime> + <propertySimple> + <id>10863</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10862</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10861</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10865</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10864</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10867</id> + <name>snmpAgentHost</name> + <stringValue>${unresolvable.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10866</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10869</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10868</id> + <name>url</name> + <stringValue>http://${servername}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10870</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10871</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10872</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10873</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10874</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10875</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10876</id> + <name>snmpAgentPort</name> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10877</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + <propertySimple> + <id>10878</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-duplicate-main.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-duplicate-main.xml new file mode 100644 index 0000000..19e4531 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-duplicate-main.xml @@ -0,0 +1,386 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>100371</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac90</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-snmp-anyaddr.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-snmp-anyaddr.xml new file mode 100644 index 0000000..2a09b04 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-snmp-anyaddr.xml @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>20037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>0.0.0.0:${port1}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://0.0.0.0:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-snmp.xml new file mode 100644 index 0000000..95f21d0 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-with-snmp.xml @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-without-snmp.xml new file mode 100644 index 0000000..b3d2dea --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/nested/inventory-without-snmp.xml @@ -0,0 +1,310 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10041</id> + <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1309116183350</ctime> + <mtime>1309116225316</mtime> + <itime>1309116225316</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10046</id> + <uuid>908ea047-889e-4978-a61f-d96e8b1c6d17</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + <itime>1309117635788</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10241</id> + <version>0</version> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10242</id> + <version>0</version> + <ctime>1309117635790</ctime> + <mtime>1309117635790</mtime> + <propertySimple> + <id>10858</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10857</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10860</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10859</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10048</id> + <uuid>704a31f3-7f5f-46c1-9bda-70f2645c9604</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635810</ctime> + <mtime>1309117635810</mtime> + <itime>1309117635810</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10245</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10246</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + <propertySimple> + <id>10926</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10925</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10928</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10927</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10201</id> + <version>0</version> + <ctime>1309116183368</ctime> + <mtime>1309116183368</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10211</id> + <version>0</version> + <ctime>1309117523737</ctime> + <mtime>1309117523737</mtime> + <propertySimple> + <id>10863</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10862</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10861</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10865</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10864</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10867</id> + <name>snmpAgentHost</name> + <stringValue>${unresolvable.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10866</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10869</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10868</id> + <name>url</name> + <stringValue>http://${servername}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10870</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10871</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10872</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10873</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10874</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10875</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10876</id> + <name>snmpAgentPort</name> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10877</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + <propertySimple> + <id>10878</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml index ff9d715..8b3e0ff 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml @@ -398,7 +398,7 @@ <propertySimple> <id>10795</id> <name>url</name> - <stringValue>http://${localhost}:${port1}/</stringValue> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10709</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/includes/inventory-single-vhost.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/includes/inventory-single-vhost.xml new file mode 100644 index 0000000..00ac425 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/includes/inventory-single-vhost.xml @@ -0,0 +1,215 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/mess/inventory-single-vhost.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/mess/inventory-single-vhost.xml new file mode 100644 index 0000000..00ac425 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/mess/inventory-single-vhost.xml @@ -0,0 +1,215 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/mess/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/mess/inventory.xml new file mode 100644 index 0000000..b6a4bc9 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/mess/inventory.xml @@ -0,0 +1,377 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10021</id> + <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> + <resourceKey>${vhost2.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587648</ctime> + <mtime>1307353587648</mtime> + <itime>1307353587648</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10135</id> + <version>0</version> + <ctime>1307353587666</ctime> + <mtime>1307353587666</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10136</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587667</ctime> + <mtime>1307353587667</mtime> + <propertySimple> + <id>10685</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10684</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10687</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10688</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>4</stringValue> + </propertySimple> + <propertySimple> + <id>10686</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>${vhost4.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/nested/inventory-single-vhost.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/nested/inventory-single-vhost.xml new file mode 100644 index 0000000..00ac425 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/nested/inventory-single-vhost.xml @@ -0,0 +1,215 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/nested/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/nested/inventory.xml new file mode 100644 index 0000000..b6a4bc9 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/nested/inventory.xml @@ -0,0 +1,377 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10021</id> + <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> + <resourceKey>${vhost2.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587648</ctime> + <mtime>1307353587648</mtime> + <itime>1307353587648</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10135</id> + <version>0</version> + <ctime>1307353587666</ctime> + <mtime>1307353587666</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10136</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587667</ctime> + <mtime>1307353587667</mtime> + <propertySimple> + <id>10685</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10684</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10687</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10688</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>4</stringValue> + </propertySimple> + <propertySimple> + <id>10686</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>${vhost4.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/simple/inventory-single-vhost.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/simple/inventory-single-vhost.xml new file mode 100644 index 0000000..00ac425 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/simple/inventory-single-vhost.xml @@ -0,0 +1,215 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> commit 2b8e69408d537ffa7d05c877c20bc5d5d416d2b1 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Jun 30 15:24:37 2011 +0200 adding tests for configuration files with includes. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeConfigurationWithIncludesFromRHQ1_3Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeConfigurationWithIncludesFromRHQ1_3Test.java new file mode 100644 index 0000000..95ea298 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeConfigurationWithIncludesFromRHQ1_3Test.java @@ -0,0 +1,33 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.upgrade.rhq1_3_x; + +/** + * + * + * @author Lukas Krejci + */ +public class UpgradeConfigurationWithIncludesFromRHQ1_3Test extends UpgradeSimpleConfigurationFromRHQ1_3Test { + + public UpgradeConfigurationWithIncludesFromRHQ1_3Test() { + super("/mocked-inventories/rhq-1.3.x/includes/inventory.xml", "/full-configurations/2.2.x/includes/httpd.conf", "/full-configurations/2.2.x/includes/1.vhost.conf", "/full-configurations/2.2.x/includes/2.vhost.conf"); + } + +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeSimpleConfigurationFromRHQ1_3Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeSimpleConfigurationFromRHQ1_3Test.java index 1fd44ba..752c845 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeSimpleConfigurationFromRHQ1_3Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeSimpleConfigurationFromRHQ1_3Test.java @@ -29,8 +29,6 @@ import org.testng.annotations.Test; import org.rhq.core.domain.resource.Resource; import org.rhq.plugins.apache.upgrade.UpgradeTestBase; -import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestConfiguration; -import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestSetup; import org.rhq.test.pc.PluginContainerSetup; /** @@ -41,6 +39,19 @@ import org.rhq.test.pc.PluginContainerSetup; @Test(groups = "apache-integration-tests") public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { + String[] configuredApacheConfigurationFiles; + String configuredInventoryFile; + + public UpgradeSimpleConfigurationFromRHQ1_3Test() { + configuredApacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + configuredInventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + } + + protected UpgradeSimpleConfigurationFromRHQ1_3Test(String defaultInventoryFile, String... defaultApacheConfigurationFiles) { + this.configuredApacheConfigurationFiles = defaultApacheConfigurationFiles; + this.configuredInventoryFile = defaultInventoryFile; + } + @Test @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) @Parameters({ "apache2.install.dir", "apache2.exe.path" }) @@ -52,8 +63,8 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { serverRoot = installPath; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; } }); } @@ -69,8 +80,8 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { serverRoot = installPath; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - apacheConfigurationFiles = new String[] { "/full-configurations/1.3.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; }}); } @@ -81,8 +92,8 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { testUpgrade(new TestConfiguration() { { configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; serverRoot = installPath; binPath = exePath; @@ -128,8 +139,8 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; serverRoot = installPath; binPath = exePath; @@ -151,8 +162,8 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; serverRoot = installPath; binPath = exePath; diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeConfigurationWithIncludesFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeConfigurationWithIncludesFromRHQ3_0_0Test.java new file mode 100644 index 0000000..7fbe709 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeConfigurationWithIncludesFromRHQ3_0_0Test.java @@ -0,0 +1,36 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.upgrade.rhq3_0_0; + +/** + * + * + * @author Lukas Krejci + */ +public class UpgradeConfigurationWithIncludesFromRHQ3_0_0Test extends UpgradeSimpleConfigurationFromRHQ3_0_0Test { + + public UpgradeConfigurationWithIncludesFromRHQ3_0_0Test() { + super("/mocked-inventories/rhq-3.0.0/includes/inventory-without-snmp.xml", + "/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp.xml", + "/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp-anyaddr.xml", + "/full-configurations/2.2.x/includes/httpd.conf", "/full-configurations/2.2.x/includes/1.vhost.conf", + "/full-configurations/2.2.x/includes/2.vhost.conf"); + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java index fb2e360..c4399d9 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java @@ -38,8 +38,6 @@ import org.rhq.plugins.apache.ApacheServerComponent; import org.rhq.plugins.apache.ApacheServerDiscoveryComponent; import org.rhq.plugins.apache.parser.ApacheDirectiveTree; import org.rhq.plugins.apache.upgrade.UpgradeTestBase; -import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestConfiguration; -import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestSetup; import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; import org.rhq.plugins.apache.util.RuntimeApacheConfiguration; import org.rhq.plugins.apache.util.VirtualHostLegacyResourceKeyUtil; @@ -52,6 +50,34 @@ import org.rhq.test.pc.PluginContainerSetup; */ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase { + private String[] configuredApacheConfigurationFiles; + private String configuredInventoryFileWithoutSNMP; + private String configuredInventoryFileWithSNMP; + private String configuredInventoryFileWithSNMPWithAnyAddress; + + public UpgradeSimpleConfigurationFromRHQ3_0_0Test() { + configuredInventoryFileWithoutSNMP = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + configuredInventoryFileWithSNMP = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + configuredInventoryFileWithSNMPWithAnyAddress = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp-anyaddr.xml"; + configuredApacheConfigurationFiles = new String[] {"/full-configurations/2.2.x/simple/httpd.conf"}; + } + + + /** + * @param configuredApacheConfigurationFiles + * @param configuredInventoryFileWithoutSNMP + * @param configuredInventoryFileWithSNMP + * @param configuredInventoryFileWithSNMPWithAnyAddress + */ + public UpgradeSimpleConfigurationFromRHQ3_0_0Test(String configuredInventoryFileWithoutSNMP, + String configuredInventoryFileWithSNMP, String configuredInventoryFileWithSNMPWithAnyAddress, + String... configuredApacheConfigurationFiles) { + this.configuredApacheConfigurationFiles = configuredApacheConfigurationFiles; + this.configuredInventoryFileWithoutSNMP = configuredInventoryFileWithoutSNMP; + this.configuredInventoryFileWithSNMP = configuredInventoryFileWithSNMP; + this.configuredInventoryFileWithSNMPWithAnyAddress = configuredInventoryFileWithSNMPWithAnyAddress; + } + /** * This tests the upgrade from RHQ 3.0.0 where the apache server was discovered without SNMP support. * The Main Server URL must have been set in this case, otherwise the component would fail to start @@ -63,8 +89,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithoutSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -83,8 +109,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase public void testWithUnresolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithoutSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; @@ -104,8 +130,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase public void testWithNonUniqueNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithoutSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; @@ -136,8 +162,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -166,8 +192,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase public void testWithUnresolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -202,8 +228,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase public void testWithNonUniqueNamesWithSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -240,8 +266,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithoutSNMP; serverRoot = installPath; binPath = exePath; @@ -279,8 +305,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp-anyaddr.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMPWithAnyAddress; serverRoot = installPath; binPath = exePath; @@ -306,8 +332,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithoutSNMP; serverRoot = installPath; binPath = exePath; @@ -332,8 +358,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMP; serverRoot = installPath; binPath = exePath; upgradeShouldSucceed = false; diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeConfigurationWithIncludesFromRHQ3_0_1Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeConfigurationWithIncludesFromRHQ3_0_1Test.java new file mode 100644 index 0000000..41e7252 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeConfigurationWithIncludesFromRHQ3_0_1Test.java @@ -0,0 +1,38 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.upgrade.rhq3_0_1; + +/** + * + * + * @author Lukas Krejci + */ +public class UpgradeConfigurationWithIncludesFromRHQ3_0_1Test extends UpgradeSimpleConfigurationFromRHQ3_0_1Test { + + + public UpgradeConfigurationWithIncludesFromRHQ3_0_1Test() { + super("/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp.xml", + "/mocked-inventories/rhq-3.0.1/includes/inventory-without-snmp.xml", + "/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp-anyaddr.xml", + "/mocked-inventories/rhq-3.0.1/includes/inventory-with-duplicate-main.xml", + "/full-configurations/2.2.x/includes/httpd.conf", "/full-configurations/2.2.x/includes/1.vhost.conf", + "/full-configurations/2.2.x/includes/2.vhost.conf"); + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java index cbd4826..fa88f8d 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java @@ -55,14 +55,47 @@ import org.rhq.test.pc.PluginContainerSetup; */ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase { + private String[] configuredApacheConfigurationFiles; + private String configuredInventoryFileWithSNMP; + private String configuredInventoryFileWithoutSNMP; + private String configuredInventoryFileWithSNMPWithAnyAddress; + private String configuredInventoryFileWithDuplicateMain; + + + public UpgradeSimpleConfigurationFromRHQ3_0_1Test() { + configuredApacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + configuredInventoryFileWithSNMP = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + configuredInventoryFileWithoutSNMP = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + configuredInventoryFileWithSNMPWithAnyAddress = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml"; + configuredInventoryFileWithDuplicateMain = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml"; + } + + /** + * @param configuredApacheConfigurationFiles + * @param configuredInventoryFileWithSNMP + * @param configuredInventoryFileWithoutSNMP + * @param configuredInventoryFileWithSNMPWithAnyAddress + * @param configuredInventoryFileWithDuplicateMain + */ + protected UpgradeSimpleConfigurationFromRHQ3_0_1Test(String configuredInventoryFileWithSNMP, + String configuredInventoryFileWithoutSNMP, String configuredInventoryFileWithSNMPWithAnyAddress, + String configuredInventoryFileWithDuplicateMain, String... configuredApacheConfigurationFiles) { + + this.configuredApacheConfigurationFiles = configuredApacheConfigurationFiles; + this.configuredInventoryFileWithSNMP = configuredInventoryFileWithSNMP; + this.configuredInventoryFileWithoutSNMP = configuredInventoryFileWithoutSNMP; + this.configuredInventoryFileWithSNMPWithAnyAddress = configuredInventoryFileWithSNMPWithAnyAddress; + this.configuredInventoryFileWithDuplicateMain = configuredInventoryFileWithDuplicateMain; + } + @Test @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) @Parameters({"apache2.install.dir", "apache2.exe.path"}) public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -92,8 +125,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithoutSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -124,8 +157,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase public void testWithUnresolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -161,8 +194,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase public void testWithUnresolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithoutSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -190,8 +223,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase public void testWithNonUniqueNamesWithSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -227,8 +260,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase public void testWithNonUniqueNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithoutSNMP; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -279,8 +312,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase public void testDuplicateMainVhostsMarkedAsFailedUpgrade(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithDuplicateMain; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -314,10 +347,10 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + apacheConfigurationFiles = configuredApacheConfigurationFiles; //yes, the inventory file can be the same for both the with and without snmp tests because //they both yield the same inventory in this case. - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml"; + inventoryFile = configuredInventoryFileWithSNMPWithAnyAddress; serverRoot = installPath; binPath = exePath; @@ -360,8 +393,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMPWithAnyAddress; serverRoot = installPath; binPath = exePath; @@ -391,8 +424,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithoutSNMP; serverRoot = installPath; binPath = exePath; upgradeShouldSucceed = false; @@ -429,8 +462,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFileWithSNMP; serverRoot = installPath; binPath = exePath; upgradeShouldSucceed = false; diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeConfigurationWithIncludesFromRHQ3_0_2Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeConfigurationWithIncludesFromRHQ3_0_2Test.java new file mode 100644 index 0000000..0795ecc --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeConfigurationWithIncludesFromRHQ3_0_2Test.java @@ -0,0 +1,33 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.upgrade.rhq3_0_2; + +/** + * + * + * @author Lukas Krejci + */ +public class UpgradeConfigurationWithIncludesFromRHQ3_0_2Test extends UpgradeSimpleConfigurationFromRHQ3_0_2Test { + + public UpgradeConfigurationWithIncludesFromRHQ3_0_2Test() { + super("/mocked-inventories/rhq-3.0.2/includes/inventory.xml", "/full-configurations/2.2.x/includes/httpd.conf", + "/full-configurations/2.2.x/includes/1.vhost.conf", "/full-configurations/2.2.x/includes/2.vhost.conf"); + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeSimpleConfigurationFromRHQ3_0_2Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeSimpleConfigurationFromRHQ3_0_2Test.java index 2e85a4b..2c3de84 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeSimpleConfigurationFromRHQ3_0_2Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeSimpleConfigurationFromRHQ3_0_2Test.java @@ -32,14 +32,33 @@ import org.rhq.test.pc.PluginContainerSetup; */ public class UpgradeSimpleConfigurationFromRHQ3_0_2Test extends UpgradeTestBase { + private String[] configuredApacheConfigurationFiles; + private String configuredInventoryFile; + + public UpgradeSimpleConfigurationFromRHQ3_0_2Test() { + configuredApacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + configuredInventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + } + + /** + * @param configuredApacheConfigurationFiles + * @param configuredInventoryFile + */ + protected UpgradeSimpleConfigurationFromRHQ3_0_2Test(String configuredInventoryFile, + String... configuredApacheConfigurationFiles) { + + this.configuredApacheConfigurationFiles = configuredApacheConfigurationFiles; + this.configuredInventoryFile = configuredInventoryFile; + } + @Test @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) @Parameters({ "apache2.install.dir", "apache2.exe.path" }) public void testWithResolvableNames(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -53,8 +72,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_2Test extends UpgradeTestBase public void testWithUnresolvableNames(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -79,8 +98,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_2Test extends UpgradeTestBase public void testWithNonUniqueNames(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -107,8 +126,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_2Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; serverRoot = installPath; binPath = exePath; @@ -137,8 +156,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_2Test extends UpgradeTestBase { configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + apacheConfigurationFiles = configuredApacheConfigurationFiles; + inventoryFile = configuredInventoryFile; serverRoot = installPath; binPath = exePath; diff --git a/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/httpd.conf b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/httpd.conf index ebc07ac..22f6dac 100644 --- a/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/httpd.conf +++ b/modules/plugins/apache/src/test/resources/full-configurations/2.2.x/includes/httpd.conf @@ -37,4 +37,4 @@ SNMPVar var ${additional.directives} -Include *.vhost.conf +Include conf/*.vhost.conf diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory.xml new file mode 100644 index 0000000..f8d181d --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/includes/inventory.xml @@ -0,0 +1,539 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10021</id> + <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> + <resourceKey>${vhost2.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587648</ctime> + <mtime>1307353587648</mtime> + <itime>1307353587648</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10135</id> + <version>0</version> + <ctime>1307353587666</ctime> + <mtime>1307353587666</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10136</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587667</ctime> + <mtime>1307353587667</mtime> + <propertySimple> + <id>10685</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10684</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10687</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10688</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>4</stringValue> + </propertySimple> + <propertySimple> + <id>10686</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10023</id> + <uuid>c62c5d75-81dd-4b14-a768-2d8c1fca6c88</uuid> + <resourceKey>${vhost3.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <itime>1307353587737</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10139</id> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10140</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <propertySimple> + <id>10695</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10694</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10697</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10698</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>3</stringValue> + </propertySimple> + <propertySimple> + <id>10696</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10024</id> + <uuid>d1b59168-8666-4bc0-957e-171bf16eec73</uuid> + <resourceKey>${vhost1.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost1.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <itime>1307353587750</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10171</id> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10172</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <propertySimple> + <id>10700</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10699</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10702</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost1.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10703</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>5</stringValue> + </propertySimple> + <propertySimple> + <id>10701</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>${vhost4.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp-anyaddr.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp-anyaddr.xml new file mode 100644 index 0000000..fc34748 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp-anyaddr.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>20037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq4.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp.xml new file mode 100644 index 0000000..ff9d715 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-with-snmp.xml @@ -0,0 +1,462 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-without-snmp.xml new file mode 100644 index 0000000..590b10f --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/includes/inventory-without-snmp.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10041</id> + <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1309116183350</ctime> + <mtime>1309116225316</mtime> + <itime>1309116225316</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10046</id> + <uuid>908ea047-889e-4978-a61f-d96e8b1c6d17</uuid> + <resourceKey>${vhost4.rhq4.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + <itime>1309117635788</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10241</id> + <version>0</version> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10242</id> + <version>0</version> + <ctime>1309117635790</ctime> + <mtime>1309117635790</mtime> + <propertySimple> + <id>10858</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10857</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10860</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10859</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10047</id> + <uuid>5fccc52b-8003-42ed-aa69-0b146c783e91</uuid> + <resourceKey>${vhost3.rhq4.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + <itime>1309117635802</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10243</id> + <version>0</version> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10244</id> + <version>0</version> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + <propertySimple> + <id>10922</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10921</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10924</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10923</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10048</id> + <uuid>704a31f3-7f5f-46c1-9bda-70f2645c9604</uuid> + <resourceKey>${main.rhq4.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635810</ctime> + <mtime>1309117635810</mtime> + <itime>1309117635810</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10245</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10246</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + <propertySimple> + <id>10926</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10925</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10928</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10927</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10049</id> + <uuid>03638606-623b-4218-bd23-42e04db0e296</uuid> + <resourceKey>${vhost2.rhq4.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + <itime>1309117635818</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10247</id> + <version>0</version> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10248</id> + <version>0</version> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + <propertySimple> + <id>10930</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10929</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10932</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10931</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10050</id> + <uuid>ae880c2d-747d-492d-8586-a47ab5791b0e</uuid> + <resourceKey>${vhost1.rhq4.resource.key}</resourceKey> + <name>${vhost1.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + <itime>1309117635829</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10249</id> + <version>0</version> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10250</id> + <version>0</version> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + <propertySimple> + <id>10934</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10933</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10936</id> + <name>url</name> + <stringValue>http://${vhost1.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10935</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10201</id> + <version>0</version> + <ctime>1309116183368</ctime> + <mtime>1309116183368</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10211</id> + <version>0</version> + <ctime>1309117523737</ctime> + <mtime>1309117523737</mtime> + <propertySimple> + <id>10863</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10862</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10861</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10865</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10864</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10867</id> + <name>snmpAgentHost</name> + <stringValue>${unresolvable.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10866</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10869</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10868</id> + <name>url</name> + <stringValue>http://${servername}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10870</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10871</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10872</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10873</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10874</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10875</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10876</id> + <name>snmpAgentPort</name> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10877</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + <propertySimple> + <id>10878</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-duplicate-main.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-duplicate-main.xml new file mode 100644 index 0000000..78fc9dd --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-duplicate-main.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>100371</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac90</uuid> + <resourceKey>${localhost}:${port1}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp-anyaddr.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp-anyaddr.xml new file mode 100644 index 0000000..47d502d --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp-anyaddr.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>20037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>0.0.0.0:${port1}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://0.0.0.0:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp.xml new file mode 100644 index 0000000..ff9d715 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-with-snmp.xml @@ -0,0 +1,462 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-without-snmp.xml new file mode 100644 index 0000000..44ea502 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/includes/inventory-without-snmp.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10041</id> + <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1309116183350</ctime> + <mtime>1309116225316</mtime> + <itime>1309116225316</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10046</id> + <uuid>908ea047-889e-4978-a61f-d96e8b1c6d17</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + <itime>1309117635788</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10241</id> + <version>0</version> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10242</id> + <version>0</version> + <ctime>1309117635790</ctime> + <mtime>1309117635790</mtime> + <propertySimple> + <id>10858</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10857</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10860</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10859</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10047</id> + <uuid>5fccc52b-8003-42ed-aa69-0b146c783e91</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + <itime>1309117635802</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10243</id> + <version>0</version> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10244</id> + <version>0</version> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + <propertySimple> + <id>10922</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10921</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10924</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10923</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10048</id> + <uuid>704a31f3-7f5f-46c1-9bda-70f2645c9604</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635810</ctime> + <mtime>1309117635810</mtime> + <itime>1309117635810</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10245</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10246</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + <propertySimple> + <id>10926</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10925</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10928</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10927</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10049</id> + <uuid>03638606-623b-4218-bd23-42e04db0e296</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + <itime>1309117635818</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10247</id> + <version>0</version> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10248</id> + <version>0</version> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + <propertySimple> + <id>10930</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10929</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10932</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10931</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10050</id> + <uuid>ae880c2d-747d-492d-8586-a47ab5791b0e</uuid> + <resourceKey>${vhost1.rhq3.resource.key}</resourceKey> + <name>${vhost1.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + <itime>1309117635829</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10249</id> + <version>0</version> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10250</id> + <version>0</version> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + <propertySimple> + <id>10934</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10933</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10936</id> + <name>url</name> + <stringValue>http://${vhost1.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10935</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10201</id> + <version>0</version> + <ctime>1309116183368</ctime> + <mtime>1309116183368</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10211</id> + <version>0</version> + <ctime>1309117523737</ctime> + <mtime>1309117523737</mtime> + <propertySimple> + <id>10863</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10862</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10861</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10865</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10864</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10867</id> + <name>snmpAgentHost</name> + <stringValue>${unresolvable.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10866</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10869</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10868</id> + <name>url</name> + <stringValue>http://${servername}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10870</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10871</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10872</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10873</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10874</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10875</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10876</id> + <name>snmpAgentPort</name> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10877</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + <propertySimple> + <id>10878</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/includes/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/includes/inventory.xml new file mode 100644 index 0000000..f8d181d --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/includes/inventory.xml @@ -0,0 +1,539 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10021</id> + <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> + <resourceKey>${vhost2.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587648</ctime> + <mtime>1307353587648</mtime> + <itime>1307353587648</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10135</id> + <version>0</version> + <ctime>1307353587666</ctime> + <mtime>1307353587666</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10136</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587667</ctime> + <mtime>1307353587667</mtime> + <propertySimple> + <id>10685</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10684</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10687</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10688</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>4</stringValue> + </propertySimple> + <propertySimple> + <id>10686</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10023</id> + <uuid>c62c5d75-81dd-4b14-a768-2d8c1fca6c88</uuid> + <resourceKey>${vhost3.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <itime>1307353587737</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10139</id> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10140</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <propertySimple> + <id>10695</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10694</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10697</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10698</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>3</stringValue> + </propertySimple> + <propertySimple> + <id>10696</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10024</id> + <uuid>d1b59168-8666-4bc0-957e-171bf16eec73</uuid> + <resourceKey>${vhost1.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost1.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <itime>1307353587750</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10171</id> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10172</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <propertySimple> + <id>10700</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10699</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10702</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost1.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10703</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>5</stringValue> + </propertySimple> + <propertySimple> + <id>10701</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>${vhost4.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> commit 9841eb6d2e0561a66183415a9db24bf8219d1bd1 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Jun 30 10:58:26 2011 +0200 added upgrade tests for RHQ 3.0.2 diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeSimpleConfigurationFromRHQ3_0_2Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeSimpleConfigurationFromRHQ3_0_2Test.java new file mode 100644 index 0000000..2e85a4b --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_2/UpgradeSimpleConfigurationFromRHQ3_0_2Test.java @@ -0,0 +1,157 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.upgrade.rhq3_0_2; + +import org.testng.annotations.Parameters; +import org.testng.annotations.Test; + +import org.rhq.plugins.apache.upgrade.UpgradeTestBase; +import org.rhq.test.pc.PluginContainerSetup; + +/** + * + * + * @author Lukas Krejci + */ +public class UpgradeSimpleConfigurationFromRHQ3_0_2Test extends UpgradeTestBase { + + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithResolvableNames(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + } + }); + } + + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithUnresolvableNames(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), + "ServerName ${unresolvable.host}:${listen1}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), + "ServerName ${unresolvable.host}:${listen2}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), + "ServerName ${unresolvable.host}:${listen3}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), + "ServerName ${unresolvable.host}:${listen4}"); + } + }); + } + + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithNonUniqueNames(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), + "ServerName ${unresolvable.host}"); + } + }); + } + + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddress(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + serverRoot = installPath; + binPath = exePath; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + }); + } + + /** + * This configuration will fail to upgrade the first vhost, because it doesn't uniquely match to new-style + * vhosts - it could be either a main vhost or vhost1. + */ + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddress(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.2/simple/inventory.xml"; + serverRoot = installPath; + binPath = exePath; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + }); + } +} diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/simple/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/simple/inventory.xml new file mode 100644 index 0000000..f8d181d --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.2/simple/inventory.xml @@ -0,0 +1,539 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10004</id> + <uuid>ae8a7a3e-256e-4c0a-9a65-33d534523d92</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost} Apache 2.2.17 (${server.root}/)</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1307353451273</ctime> + <mtime>1307353509168</mtime> + <itime>1307353509168</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10013</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10012</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10022</id> + <uuid>08290193-c716-4363-b841-8a1d9d83f580</uuid> + <resourceKey>${snmp.identifier}</resourceKey> + <name>Virtual Host ${snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587727</ctime> + <mtime>1307353587727</mtime> + <itime>1307353587721</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10137</id> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10138</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587728</ctime> + <mtime>1307353587728</mtime> + <propertySimple> + <id>10690</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10689</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/${localhost}0_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10692</id> + <name>url</name> + <override>false</override> + <stringValue>http://${localhost}:0/</stringValue> + </propertySimple> + <propertySimple> + <id>10693</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>1</stringValue> + </propertySimple> + <propertySimple> + <id>10691</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>DOWN</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10021</id> + <uuid>3a20d809-7eba-422c-a3ef-baf65804498d</uuid> + <resourceKey>${vhost2.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587648</ctime> + <mtime>1307353587648</mtime> + <itime>1307353587648</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10135</id> + <version>0</version> + <ctime>1307353587666</ctime> + <mtime>1307353587666</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10136</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587667</ctime> + <mtime>1307353587667</mtime> + <propertySimple> + <id>10685</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10684</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10687</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10688</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>4</stringValue> + </propertySimple> + <propertySimple> + <id>10686</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10023</id> + <uuid>c62c5d75-81dd-4b14-a768-2d8c1fca6c88</uuid> + <resourceKey>${vhost3.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <itime>1307353587737</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10139</id> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10140</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587738</ctime> + <mtime>1307353587738</mtime> + <propertySimple> + <id>10695</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10694</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10697</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10698</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>3</stringValue> + </propertySimple> + <propertySimple> + <id>10696</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10024</id> + <uuid>d1b59168-8666-4bc0-957e-171bf16eec73</uuid> + <resourceKey>${vhost1.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost1.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <itime>1307353587750</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10171</id> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10172</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587751</ctime> + <mtime>1307353587751</mtime> + <propertySimple> + <id>10700</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10699</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10702</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost1.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10703</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>5</stringValue> + </propertySimple> + <propertySimple> + <id>10701</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10025</id> + <uuid>310281d2-60c6-4d7d-bcdc-c51d7969c906</uuid> + <resourceKey>${vhost4.snmp.identifier}</resourceKey> + <name>Virtual Host ${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description>Apache/2.2.17 (Unix) CovalentSNMP/2.3.0</description> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <itime>1307353587760</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10014</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <id>10013</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10173</id> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10174</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353587761</ctime> + <mtime>1307353587761</mtime> + <propertySimple> + <id>10705</id> + <name>responseTimeUrlExcludes</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10704</id> + <name>responseTimeLogFile</name> + <override>false</override> + <stringValue>${server.root}/logs/127.0.0.111678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10707</id> + <name>url</name> + <override>false</override> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>snmpWwwServiceIndex</name> + <override>false</override> + <stringValue>2</stringValue> + </propertySimple> + <propertySimple> + <id>10706</id> + <name>responseTimeUrlTransforms</name> + <override>false</override> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10142</id> + <version>0</version> + <ctime>1307353451273</ctime> + <mtime>1307353451273</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10073</id> + <notes>null</notes> + <version>0</version> + <ctime>1307353737118</ctime> + <mtime>1307353737118</mtime> + <propertySimple> + <id>10365</id> + <name>errorLogMinimumSeverity</name> + <override>false</override> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10366</id> + <name>errorLogIncludesPattern</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10367</id> + <name>snmpAgentCommunity</name> + <override>false</override> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10368</id> + <name>errorLogFilePath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10369</id> + <name>errorLogEventsEnabled</name> + <override>false</override> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10370</id> + <name>snmpAgentHost</name> + <override>false</override> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10713</id> + <name>controlScriptPath</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10714</id> + <name>url</name> + <override>false</override> + </propertySimple> + <propertySimple> + <id>10364</id> + <name>configFile</name> + <override>false</override> + <stringValue>conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10711</id> + <name>executablePath</name> + <override>false</override> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10712</id> + <name>snmpAgentPort</name> + <override>false</override> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10715</id> + <name>serverRoot</name> + <override>false</override> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10003</id> + </productVersion> +</resource> +</objects> +</inventory-dump> commit 6c2b6624c0d2e9a8ff64f6cc74264696580d5b2a Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Jun 30 10:58:05 2011 +0200 make the tests compile again. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java index 358df93..9d7e632 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java @@ -86,7 +86,7 @@ public class UpgradeTestBase extends PluginContainerTest { private static final Log LOG = LogFactory.getLog(UpgradeTestBase.class); - protected class TestSetup { + public class TestSetup { private String configurationName; private FakeServerInventory fakeInventory = new FakeServerInventory(); private String inventoryFile; @@ -387,7 +387,7 @@ public class UpgradeTestBase extends PluginContainerTest { } } - protected static class TestConfiguration { + public static class TestConfiguration { public String[] apacheConfigurationFiles; public String inventoryFile; public String configurationName; commit 10e1e2d205a9ad5f13c2e541f92e678eb059d819 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed Jun 29 17:11:43 2011 +0200 moved upgrade test classes to new packages so that we won't have a gazillion test classes in the root package. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java deleted file mode 100644 index 8d1fe22..0000000 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java +++ /dev/null @@ -1,165 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.plugins.apache; - -import java.util.Comparator; -import java.util.HashMap; -import java.util.Set; -import java.util.TreeSet; - -import org.testng.annotations.Parameters; -import org.testng.annotations.Test; - -import org.rhq.core.domain.resource.Resource; -import org.rhq.test.pc.PluginContainerSetup; - -/** - * - * - * @author Lukas Krejci - */ -@Test(groups = "apache-integration-tests") -public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { - - @Test - @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) - @Parameters({ "apache2.install.dir", "apache2.exe.path" }) - public void testWithResolvableServerNames_Apache2(final String installPath, final String exePath) - throws Throwable { - - testUpgrade(new TestConfiguration() { - { - serverRoot = installPath; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; - } - }); - } - - @Test(enabled = false) - //ApacheServerOperationsDelegate doesn't work with apache 1.3 - @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) - @Parameters({ "apache1.install.dir", "apache1.exe.path" }) - public void testWithResolvableServerNames_Apache1(final String installPath, final String exePath) - throws Throwable { - - testUpgrade(new TestConfiguration() {{ - serverRoot = installPath; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - apacheConfigurationFiles = new String[] { "/full-configurations/1.3.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; - }}); - } - - @Test - @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) - @Parameters({ "apache2.install.dir", "apache2.exe.path" }) - public void testWithNonUniqueServerNames_Apache2(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; - serverRoot = installPath; - binPath = exePath; - - - defaultOverrides = new HashMap<String, String>(); - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); - } - - @Override - public void beforePluginContainerStart(TestSetup setup) { - //in this scenario, the RHQ 1.3 would only discover 1 vhost (and the main vhost), because they would have the same resource key - //due to the same ServerName. I need to process the default inventory to reflect that otherwise I would get upgrade - //failures. - - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(findApachePluginResourceTypeByName("Apache Virtual Host")); - Set<Resource> uniques = new TreeSet<Resource>(new Comparator<Resource>() { - public int compare(Resource a, Resource b) { - return a.getResourceKey().compareTo(b.getResourceKey()); - } - }); - - for(Resource vhost : vhosts) { - if (uniques.contains(vhost)) { - //remove the vhost from the server's inventory - setup.getFakeInventory().removeResource(vhost); - } else { - uniques.add(vhost); - } - } - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithAnyAddress(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; - serverRoot = installPath; - binPath = exePath; - - defaultOverrides = new HashMap<String, String>(); - defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithWildcardAddress(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; - serverRoot = installPath; - binPath = exePath; - - defaultOverrides = new HashMap<String, String>(); - defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); - } - }); - } -} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java deleted file mode 100644 index d3e5c86..0000000 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java +++ /dev/null @@ -1,444 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.plugins.apache; - - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.testng.annotations.Parameters; -import org.testng.annotations.Test; - -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceError; -import org.rhq.core.domain.resource.ResourceErrorType; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.plugins.apache.parser.ApacheDirectiveTree; -import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; -import org.rhq.plugins.apache.util.RuntimeApacheConfiguration; -import org.rhq.plugins.apache.util.VirtualHostLegacyResourceKeyUtil; -import org.rhq.test.pc.PluginContainerSetup; - -/** - * - * - * @author Lukas Krejci - */ -public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase { - - /** - * This tests the upgrade from RHQ 3.0.0 where the apache server was discovered without SNMP support. - * The Main Server URL must have been set in this case, otherwise the component would fail to start - * and therefore the vhost discovery wouldn't even take place. - */ - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - - //just define the servername value without actually setting the ${servername.directive} so that - //we don't define a servername directive itself but do have a value for the actual server name. - //this is deduced by apache and the plugin but tests aren't that clever. - defaultOverrides.put("servername", "${localhost}"); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithUnresolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; - - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${listen3}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${listen4}"); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithNonUniqueNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; - - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); - } - }); - } - - /** - * This tests the upgrade from RHQ 3.0.0 where the Apache server was discovered with the following: - * - * <ol> - * <li> SNMP enabled - * <li> Main URL set or unset (it doesn't make a difference here) - * </ol> - * @param installDir - * @param exePath - * @throws Throwable - */ - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - upgradeShouldSucceed = false; - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - beforeTestSetupWithSNMP(this, testSetup); - } - - /** - * Do our own tests here, because the generic test method won't do much, since - * we told it that the upgrade won't succeed. - */ - @Override - public void beforeTests(TestSetup setup) throws Throwable { - testWithSNMP(this, setup); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithUnresolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - upgradeShouldSucceed = false; - - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${listen3}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${listen4}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - beforeTestSetupWithSNMP(this, testSetup); - } - - /** - * Do our own tests here, because the generic test method won't do much, since - * we told it that the upgrade won't succeed. - */ - @Override - public void beforeTests(TestSetup setup) throws Throwable { - testWithSNMP(this, setup); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithNonUniqueNamesWithSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - upgradeShouldSucceed = false; - - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - beforeTestSetupWithSNMP(this, testSetup); - } - - /** - * Do our own tests here, because the generic test method won't do much, since - * we told it that the upgrade won't succeed. - */ - @Override - public void beforeTests(TestSetup setup) throws Throwable { - testWithSNMP(this, setup); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithAnyAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; - serverRoot = installPath; - binPath = exePath; - - //just define the servername value without actually setting the ${servername.directive} so that - //we don't define a servername directive itself but do have a value for the actual server name. - //this is deduced by apache and the plugin but tests aren't that clever. - defaultOverrides.put("servername", "${localhost}"); - defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); - } - }); - } - - /** - * Unlike other SNMP tests this one actually succeeds to upgrade because of the messed up discovery that - * RHQ 3.0.0 would perform. In case of any-address (0.0.0.0), the main vhost would get the MainServer - * resource key even with SNMP, because RHQ 3 codebase wouldn't be able to match what it think should - * have been the SNMP record with the actual results from SNMP module. - * - * Because of this, RHQ 3 discovers all 5 vhosts and the upgrade code is therefore able to successfully - * upgrade all of them. - * - * @param installPath - * @param exePath - * @throws Throwable - */ - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithAnyAddressWithSNMP(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp-anyaddr.xml"; - serverRoot = installPath; - binPath = exePath; - - defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - beforeTestSetupWithSNMP(this, testSetup); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithWildcardAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; - serverRoot = installPath; - binPath = exePath; - - //just define the servername value without actually setting the ${servername.directive} so that - //we don't define a servername directive itself but do have a value for the actual server name. - //this is deduced by apache and the plugin but tests aren't that clever. - defaultOverrides.put("servername", "${localhost}"); - defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithWildcardAddressWithSNMP(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; - serverRoot = installPath; - binPath = exePath; - upgradeShouldSucceed = false; - - defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - beforeTestSetupWithSNMP(this, testSetup); - } - - /** - * Do our own tests here, because the generic test method won't do much, since - * we told it that the upgrade won't succeed. - */ - @Override - public void beforeTests(TestSetup setup) throws Throwable { - testWithSNMP(this, setup); - } - }); - } - - private void beforeTestSetupWithSNMP(TestConfiguration testConfig, TestSetup setup) throws Exception { - setup.withApacheSetup().init(); - ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); - ApacheDirectiveTree config = component.loadParser(); - config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); - - DeploymentConfig deployConfig = setup.getDeploymentConfig(); - - VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); - - Map<String, String> replacements = deployConfig.getTokenReplacements(); - - testConfig.defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey()); - - if (deployConfig.vhost1 != null) { - testConfig.defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec(replacements))); - } - - if (deployConfig.vhost2 != null) { - testConfig.defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec(replacements))); - } - - if (deployConfig.vhost3 != null) { - testConfig.defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec(replacements))); - } - - if (deployConfig.vhost4 != null) { - testConfig.defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec(replacements))); - } - - setup.withDefaultOverrides(testConfig.defaultOverrides); - } - - private void testWithSNMP(TestConfiguration testConfig, TestSetup setup) { - //ok, now we should see the resources upgraded in the fake server inventory. - ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); - ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); - - Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); - - assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); - - Resource server = servers.iterator().next(); - - String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfig.serverRoot, testConfig.serverRoot - + "/conf/httpd.conf"); - - assertEquals(server.getResourceKey(), expectedResourceKey, - "The server resource key doesn't seem to be upgraded."); - - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); - - assertEquals(vhosts.size(), 4, "Unexpected number of vhosts discovered found"); - - //let's check that the main vhost has a an upgrade error attached to it - ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); - ApacheDirectiveTree config = component.loadParser(); - config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); - VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); - - String mainVhostRK = keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey(); - - Resource mainVhost = null; - for(Resource r : vhosts) { - if (mainVhostRK.equals(r.getResourceKey())) { - mainVhost = r; - break; - } - } - - assertNotNull(mainVhost, "Couldn't find the main vhost with the expected resource key '" + mainVhostRK + "'."); - - List<ResourceError> errors = mainVhost.getResourceErrors(ResourceErrorType.UPGRADE); - assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); - assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); - - //check that all other vhosts were not upgraded but have no errors - for(Resource r : vhosts) { - if (r.equals(mainVhost)) { - continue; - } - - assertEquals(r.getResourceErrors(ResourceErrorType.UPGRADE).size(), 0, "Unexpected number of resource upgrade errors on non-main vhost " + r); - } - } -} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java deleted file mode 100644 index b43d3f3..0000000 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java +++ /dev/null @@ -1,549 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.plugins.apache; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; - -import java.io.StringReader; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.testng.annotations.Parameters; -import org.testng.annotations.Test; - -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceError; -import org.rhq.core.domain.resource.ResourceErrorType; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.util.stream.StreamUtil; -import org.rhq.plugins.apache.parser.ApacheDirectiveTree; -import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; -import org.rhq.plugins.apache.util.RuntimeApacheConfiguration; -import org.rhq.plugins.apache.util.VirtualHostLegacyResourceKeyUtil; -import org.rhq.test.TokenReplacingReader; -import org.rhq.test.pc.PluginContainerSetup; - -/** - * - * - * @author Lukas Krejci - */ -public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase { - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - upgradeShouldSucceed = false; - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - - /** - * Do our own tests here, because the generic test method won't do much, since - * we told it that the upgrade won't succeed. - */ - @Override - public void beforeTests(TestSetup setup) throws Throwable { - String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); - testExpectedFailures(this, setup, 4, failingRK); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - upgradeShouldSucceed = false; - - //just define the servername value without actually setting the ${servername.directive} so that - //we don't define a servername directive itself but do have a value for the actual server name. - //this is deduced by apache and the plugin but tests aren't that clever. - defaultOverrides.put("servername", "${localhost.ip}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - - @Override - public void beforeTests(TestSetup setup) throws Throwable { - String vhost1RK = interpret("${vhost1.rhq3.resource.key}", setup.getInventoryFileReplacements()); - testExpectedFailures(this, setup, 5, vhost1RK); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithUnresolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - upgradeShouldSucceed = false; - - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${listen3}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${listen4}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - - /** - * Do our own tests here, because the generic test method won't do much, since - * we told it that the upgrade won't succeed. - */ - @Override - public void beforeTests(TestSetup setup) throws Throwable { - String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); - testExpectedFailures(this, setup, 4, failingRK); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithUnresolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - //we use this in the serialized inventory to init the URL of the main server. The localhost.ip is actually what - //the RHQ 301 discovers even though unresolvable.host is specified in the ServerName directive. - defaultOverrides.put("servername", "${localhost.ip}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${port1}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${port2}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${port3}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${port4}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithNonUniqueNamesWithSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - upgradeShouldSucceed = false; - - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - - /** - * Do our own tests here, because the generic test method won't do much, since - * we told it that the upgrade won't succeed. - */ - @Override - public void beforeTests(TestSetup setup) throws Throwable { - String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); - testExpectedFailures(this, setup, 4, failingRK); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithNonUniqueNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - - //we use this in the serialized inventory to init the URL of the main server. The localhost.ip is actually what - //the RHQ 301 discovers even though unresolvable.host is specified in the ServerName directive. - defaultOverrides.put("servername", "${localhost.ip}"); - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), - "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), - "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), - "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), - "ServerName ${unresolvable.host}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - }); - } - - /** - * The duplicate Main vhosts "condition" was triggered by: - * <ol> - * <li>Disabling SNMP by putting in an invalid hostname - * <li>Changing the URL of the apache server to some "other" value - * <li>Running discovery - * </ol> - * From that point on, 2 Main vhosts live in the inventory and the inventory has the "rest" - * of the resource keys coming from the SNMP based discovery. - * - * It is not possible to recover from such condition automatically during - * the resource upgrade, so the only thing we need to check here is that - * the two main vhosts are marked as failed upgrade and that the rest of the vhosts - * are not upgraded and have no upgrade errors attached. - * - * @param installDir - * @param exePath - * @throws Throwable - */ - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testDuplicateMainVhostsMarkedAsFailedUpgrade(final String installDir, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml"; - serverRoot = installDir; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - upgradeShouldSucceed = false; - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - - /** - * Do our own tests here, because the generic test method won't do much, since - * we told it that the upgrade won't succeed. - */ - @Override - public void beforeTests(TestSetup setup) throws Throwable { - String mainVHost1RK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); - String mainVhost2RK = interpret("${localhost}:${port1}", setup.getInventoryFileReplacements()); - - testExpectedFailures(this, setup, 5, mainVHost1RK, mainVhost2RK); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithAnyAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - //yes, the inventory file can be the same for both the with and without snmp tests because - //they both yield the same inventory in this case. - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml"; - serverRoot = installPath; - binPath = exePath; - - //just define the servername value without actually setting the ${servername.directive} so that - //we don't define a servername directive itself but do have a value for the actual server name. - //this is deduced by apache and the plugin but tests aren't that clever. - defaultOverrides.put("servername", "${localhost.ip}"); - defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - }); - } - - /** - * Unlike other SNMP tests this one actually succeeds to upgrade because of the messed up discovery that - * RHQ 3.0.0 would perform. In case of any-address (0.0.0.0), the main vhost would get the MainServer - * resource key even with SNMP, because RHQ 3 codebase wouldn't be able to match what it think should - * have been the SNMP record with the actual results from SNMP module. - * - * Because of this, RHQ 3 discovers all 5 vhosts and the upgrade code is therefore able to successfully - * upgrade all of them. - * - * @param installPath - * @param exePath - * @throws Throwable - */ - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithAnyAddressWithSNMP(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml"; - serverRoot = installPath; - binPath = exePath; - - defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - }); - } - - /** - * This configuration will fail to upgrade the first vhost, because it doesn't uniquely match to new-style - * vhosts - it could be either a main vhost or vhost1. - */ - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithWildcardAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; - serverRoot = installPath; - binPath = exePath; - upgradeShouldSucceed = false; - - //just define the servername value without actually setting the ${servername.directive} so that - //we don't define a servername directive itself but do have a value for the actual server name. - //this is deduced by apache and the plugin but tests aren't that clever. - defaultOverrides.put("servername", "${localhost.ip}"); - defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - - @Override - public void beforeTests(TestSetup setup) throws Throwable { - String failingRK = interpret("${vhost1.rhq3.resource.key}", setup.getInventoryFileReplacements()); - testExpectedFailures(this, setup, 5, failingRK); - } - }); - } - - @Test - @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) - @Parameters({"apache2.install.dir", "apache2.exe.path" }) - public void testWithWildcardAddressWithSNMP(final String installPath, final String exePath) throws Throwable { - testUpgrade(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - - apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; - inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; - serverRoot = installPath; - binPath = exePath; - upgradeShouldSucceed = false; - - defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); - defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); - defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); - defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); - defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); - } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - defineRHQ3ResourceKeys(this, testSetup); - } - - /** - * Do our own tests here, because the generic test method won't do much, since - * we told it that the upgrade won't succeed. - */ - @Override - public void beforeTests(TestSetup setup) throws Throwable { - String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); - testExpectedFailures(this, setup, 4, failingRK); - } - }); - } - - private void defineRHQ3ResourceKeys(TestConfiguration testConfig, TestSetup setup) throws Exception { - setup.withApacheSetup().init(); - ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); - ApacheDirectiveTree config = component.loadParser(); - config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); - - DeploymentConfig deployConfig = setup.getDeploymentConfig(); - - VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); - - Map<String, String> replacements = deployConfig.getTokenReplacements(); - - testConfig.defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey()); - - if (deployConfig.vhost1 != null) { - testConfig.defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec(replacements))); - } - - if (deployConfig.vhost2 != null) { - testConfig.defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec(replacements))); - } - - if (deployConfig.vhost3 != null) { - testConfig.defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec(replacements))); - } - - if (deployConfig.vhost4 != null) { - testConfig.defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec(replacements))); - } - - setup.withDefaultOverrides(testConfig.defaultOverrides); - } - - private void testExpectedFailures(TestConfiguration testConfig, TestSetup setup, int numberOfVhosts, String... failingRKs) { - //ok, now we should see the resources upgraded in the fake server inventory. - ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); - ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); - - Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); - - assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); - - Resource server = servers.iterator().next(); - - String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfig.serverRoot, testConfig.serverRoot - + "/conf/httpd.conf"); - - assertEquals(server.getResourceKey(), expectedResourceKey, - "The server resource key doesn't seem to be upgraded."); - - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); - - assertEquals(vhosts.size(), numberOfVhosts, "Unexpected number of vhosts discovered found"); - - //let's check that the main vhost has a an upgrade error attached to it - ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); - ApacheDirectiveTree config = component.loadParser(); - config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); - VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); - - Set<Resource> failingResources = new HashSet<Resource>(); - - for(String rk : failingRKs) { - for(Resource r : vhosts) { - if (rk.equals(r.getResourceKey())) { - failingResources.add(r); - break; - } - } - } - - assertEquals(failingResources.size(), failingRKs.length, "Couldn't find all the resources that should have failed."); - - for(Resource failingResource : failingResources) { - List<ResourceError> errors = failingResource.getResourceErrors(ResourceErrorType.UPGRADE); - assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); - assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); - } - - //check that all other vhosts were not upgraded but have no errors - for(Resource r : vhosts) { - if (failingResources.contains(r)) { - continue; - } - - assertEquals(r.getResourceErrors(ResourceErrorType.UPGRADE).size(), 0, "Unexpected number of resource upgrade errors on non-main vhost " + r); - } - } - - private String interpret(String string, Map<String, String> variables) { - return StreamUtil.slurp(new TokenReplacingReader(new StringReader(string), variables)); - } -} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java deleted file mode 100644 index 831b2d8..0000000 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java +++ /dev/null @@ -1,596 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.plugins.apache; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - -import java.io.File; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.net.InetAddress; -import java.net.URI; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jmock.Expectations; -import org.testng.annotations.BeforeClass; - -import org.rhq.core.clientapi.agent.metadata.PluginMetadataParser; -import org.rhq.core.clientapi.descriptor.AgentPluginDescriptorUtil; -import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor; -import org.rhq.core.clientapi.server.discovery.InventoryReport; -import org.rhq.core.domain.discovery.AvailabilityReport; -import org.rhq.core.domain.resource.InventoryStatus; -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceError; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.core.pc.ServerServices; -import org.rhq.core.pc.upgrade.FakeServerInventory; -import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; -import org.rhq.core.pluginapi.inventory.PluginContainerDeployment; -import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; -import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; -import org.rhq.core.system.SystemInfoFactory; -import org.rhq.plugins.apache.parser.ApacheConfigReader; -import org.rhq.plugins.apache.parser.ApacheDirectiveTree; -import org.rhq.plugins.apache.parser.ApacheParser; -import org.rhq.plugins.apache.parser.ApacheParserImpl; -import org.rhq.plugins.apache.util.ApacheDeploymentUtil; -import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; -import org.rhq.plugins.apache.util.ApacheExecutionUtil; -import org.rhq.plugins.apache.util.HttpdAddressUtility; -import org.rhq.plugins.apache.util.VHostSpec; -import org.rhq.test.ObjectCollectionSerializer; -import org.rhq.test.TokenReplacingReader; -import org.rhq.test.pc.PluginContainerTest; - - -/** - * Base class for the upgrade test classes. - * - * @author Lukas Krejci - */ -public class UpgradeTestBase extends PluginContainerTest { - - private static final Log LOG = LogFactory.getLog(UpgradeTestBase.class); - - protected class TestSetup { - private String configurationName; - private FakeServerInventory fakeInventory = new FakeServerInventory(); - private String inventoryFile; - private Resource platform; - private ApacheSetup apacheSetup = new ApacheSetup(); - private DeploymentConfig deploymentConfig; - private Map<String, String> defaultOverrides = new HashMap<String, String>(); - private Map<String, String> inventoryFileReplacements; - - public class ApacheSetup { - private String serverRoot; - private String exePath; - private Collection<String> configurationFiles; - private ApacheExecutionUtil execution; - private boolean deploy = true; - - private ApacheSetup() { - - } - - public ApacheSetup withServerRoot(String serverRoot) { - this.serverRoot = serverRoot; - //auto-define the server root property as if it was passed on the commandline - System.getProperties().put(configurationName + ".server.root", serverRoot); - deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName, defaultOverrides); - return this; - } - - public ApacheSetup withExePath(String exePath) { - this.exePath = exePath; - return this; - } - - public ApacheSetup withConfigurationFiles(String... classPathUris) { - return withConfigurationFiles(Arrays.asList(classPathUris)); - } - - public ApacheSetup withConfigurationFiles(Collection<String> classPathUris) { - this.configurationFiles = classPathUris; - return this; - } - - public ApacheSetup withDeploymentOnSetup() { - this.deploy = true; - return this; - } - - public ApacheSetup withNoDeploymentOnSetup() { - this.deploy = false; - return this; - } - - public ApacheExecutionUtil getExecutionUtil() { - return execution; - } - - public void init() throws Exception { - File serverRootDir = new File(serverRoot); - - assertTrue(serverRootDir.exists(), "The configured server root denotes a non-existant directory: '" - + serverRootDir + "'."); - - File confDir = new File(serverRootDir, "conf"); - - assertTrue(confDir.exists(), - "The configured server root denotes a directory that doesn't have a 'conf' subdirectory. This is unexpected."); - - String confFilePath = confDir.getAbsolutePath() + File.separatorChar + "httpd.conf"; - - String snmpHost = null; - int snmpPort = 0; - String pingUrl = null; - - if (configurationName != null) { - if (deploy) { - ApacheDeploymentUtil.deployConfiguration(confDir, configurationFiles, deploymentConfig); - } - - //ok, now try to find the ping URL. The best thing is to actually invoke - //the same code the apache server discovery does. - ApacheDirectiveTree tree = new ApacheDirectiveTree(); - ApacheParser parser = new ApacheParserImpl(tree, serverRootDir.getAbsolutePath()); - ApacheConfigReader.buildTree(confFilePath, parser); - - //XXX this hardcodes apache2 as the only option we have... - HttpdAddressUtility.Address addrToUse = HttpdAddressUtility.APACHE_2_x.getMainServerSampleAddress(tree, null, -1); - pingUrl = addrToUse.toString(); - - snmpHost = deploymentConfig.snmpHost; - snmpPort = deploymentConfig.snmpPort; - } - - execution = new ApacheExecutionUtil(findApachePluginResourceTypeByName("Apache HTTP Server"), - serverRoot, exePath, confFilePath, pingUrl, - snmpHost, snmpPort); - execution.init(); - } - - private void doSetup() throws Exception { - init(); - execution.invokeOperation("start"); - } - - public TestSetup setup() throws Exception { - return TestSetup.this.setup(); - } - } - - public TestSetup(String configurationName) { - this.configurationName = configurationName; - deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName, defaultOverrides); - } - - public TestSetup withInventoryFrom(String classPathUri) { - inventoryFile = classPathUri; - return this; - } - - public TestSetup withDefaultOverrides(Map<String, String> defaultOverrides) { - this.defaultOverrides = defaultOverrides == null ? new HashMap<String, String>() : defaultOverrides; - deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName, this.defaultOverrides); - return this; - } - - public TestSetup withPlatformResource(Resource platform) { - this.platform = platform; - return this; - } - - public ApacheSetup withApacheSetup() { - return apacheSetup; - } - - public TestSetup withDefaultExpectations() throws Exception { - context.checking(new Expectations() { - { - addDefaultExceptations(this); - } - }); - - return this; - } - - @SuppressWarnings("unchecked") - public void addDefaultExceptations(Expectations expectations) throws Exception { - ServerServices ss = getCurrentPluginContainerConfiguration().getServerServices(); - - expectations.allowing(ss.getDiscoveryServerService()).mergeInventoryReport( - expectations.with(Expectations.any(InventoryReport.class))); - expectations.will(fakeInventory.mergeInventoryReport(InventoryStatus.COMMITTED)); - - expectations.allowing(ss.getDiscoveryServerService()).upgradeResources( - expectations.with(Expectations.any(Set.class))); - expectations.will(fakeInventory.upgradeResources()); - - expectations.allowing(ss.getDiscoveryServerService()).getResources( - expectations.with(Expectations.any(Set.class)), expectations.with(Expectations.any(boolean.class))); - expectations.will(fakeInventory.getResources()); - - expectations.allowing(ss.getDiscoveryServerService()).setResourceError(expectations.with(Expectations.any(ResourceError.class))); - expectations.will(fakeInventory.setResourceError()); - - expectations.allowing(ss.getDiscoveryServerService()).mergeAvailabilityReport( - expectations.with(Expectations.any(AvailabilityReport.class))); - - expectations.allowing(ss.getDiscoveryServerService()).postProcessNewlyCommittedResources( - expectations.with(Expectations.any(Set.class))); - - expectations.allowing(ss.getDiscoveryServerService()).clearResourceConfigError( - expectations.with(Expectations.any(int.class))); - - expectations.ignoring(ss.getBundleServerService()); - expectations.ignoring(ss.getConfigurationServerService()); - expectations.ignoring(ss.getContentServerService()); - expectations.ignoring(ss.getCoreServerService()); - expectations.ignoring(ss.getEventServerService()); - expectations.ignoring(ss.getMeasurementServerService()); - expectations.ignoring(ss.getOperationServerService()); - expectations.ignoring(ss.getResourceFactoryServerService()); - } - - public FakeServerInventory getFakeInventory() { - return fakeInventory; - } - - public DeploymentConfig getDeploymentConfig() { - return deploymentConfig; - } - - public TestSetup setup() throws Exception { - apacheSetup.doSetup(); - - Map<String, String> replacements = deploymentConfig.getTokenReplacements(); - replacements.put("server.root", apacheSetup.serverRoot); - replacements.put("exe.path", apacheSetup.exePath); - - ApacheDeploymentUtil.addDefaultVariables(replacements, null); - - HttpdAddressUtility addressUtility = apacheSetup.getExecutionUtil().getServerComponent() - .getAddressUtility(); - ApacheDirectiveTree runtimeConfig = apacheSetup.getExecutionUtil().getRuntimeConfiguration(); - - replacements.put("snmp.identifier", - addressUtility.getHttpdInternalMainServerAddressRepresentation(runtimeConfig).toString(false, false)); - - replacements.put("main.rhq4.resource.key", ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); - - VHostSpec vhost1 = deploymentConfig.vhost1 == null ? null : deploymentConfig.vhost1.getVHostSpec(replacements); - VHostSpec vhost2 = deploymentConfig.vhost2 == null ? null : deploymentConfig.vhost2.getVHostSpec(replacements); - VHostSpec vhost3 = deploymentConfig.vhost3 == null ? null : deploymentConfig.vhost3.getVHostSpec(replacements); - VHostSpec vhost4 = deploymentConfig.vhost4 == null ? null : deploymentConfig.vhost4.getVHostSpec(replacements); - - if (vhost1 != null) { - replacements.put( - "vhost1.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost1.hosts.get(0), - vhost1.serverName).toString(false, false)); - - replacements.put( - "vhost1.rhq4.resource.key", - ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - vhost1.serverName, vhost1.hosts)); - } - - if (vhost2 != null) { - replacements.put( - "vhost2.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost2.hosts.get(0), - vhost2.serverName).toString(false, false)); - - replacements.put( - "vhost2.rhq4.resource.key", - ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - vhost2.serverName, vhost2.hosts)); - } - - if (vhost3 != null) { - replacements.put( - "vhost3.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost3.hosts.get(0), - vhost3.serverName).toString(false, false)); - - replacements.put( - "vhost3.rhq4.resource.key", - ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - vhost3.serverName, vhost3.hosts)); - } - - if (vhost4 != null) { - replacements.put( - "vhost4.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost4.hosts.get(0), - vhost4.serverName).toString(false, false)); - - replacements.put( - "vhost4.rhq4.resource.key", - ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - vhost4.serverName, vhost4.hosts)); - } - - //let the user override everything we just did - replacements.putAll(defaultOverrides); - - inventoryFileReplacements = replacements; - - InputStream dataStream = getClass().getResourceAsStream(inventoryFile); - - Reader rdr = new TokenReplacingReader(new InputStreamReader(dataStream), replacements); - - @SuppressWarnings("unchecked") - List<Resource> inventory = (List<Resource>) new ObjectCollectionSerializer().deserialize(rdr); - - //fix up the parent relationships, because they might not be reconstructed correctly by - //JAXB - we're missing XmlID and XmlIDRef annotations in our model - fixupParent(null, inventory); - - fakeInventory.prepopulateInventory(platform, inventory); - - return this; - } - - /** - * After the setup, this returns all the variables used to update the tokens in the inventory file. - * - * @return - */ - public Map<String, String> getInventoryFileReplacements() { - return inventoryFileReplacements; - } - - private void fixupParent(Resource parent, Collection<Resource> children) { - for (Resource child : children) { - child.setParentResource(parent); - if (child.getChildResources() != null) { - fixupParent(child, child.getChildResources()); - } - } - } - } - - protected static class TestConfiguration { - public String[] apacheConfigurationFiles; - public String inventoryFile; - public String configurationName; - public String serverRoot; - public String binPath; - public Map<String, String> defaultOverrides = new HashMap<String, String>(); - public boolean upgradeShouldSucceed = true; - - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - - } - - public void beforePluginContainerStart(TestSetup setup) throws Throwable { - - } - - public void beforeTests(TestSetup setup) throws Throwable { - - } - } - - protected static final String PLATFORM_PLUGIN = "file:target/itest/plugins/rhq-platform-plugin-for-apache-test.jar"; - protected static final String AUGEAS_PLUGIN = "file:target/itest/plugins/rhq-augeas-plugin-for-apache-test.jar"; - protected static final String APACHE_PLUGIN = "file:target/itest/plugins/rhq-apache-plugin-for-apache-test.jar"; - - protected static final String DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES = "simpleWithResolvableServerNames"; - protected static final String DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES = "simpleWithUnresolvableServerNames"; - protected static final String DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS = "simpleWithWildcardListens"; - - private List<ResourceType> resourceTypesInApachePlugin; - protected Resource platform; - - @BeforeClass - public void parseResourceTypesFromApachePlugin() throws Exception { - resourceTypesInApachePlugin = getResourceTypesInPlugin(APACHE_PLUGIN); - platform = discoverPlatform(); - } - - protected ResourceType findApachePluginResourceTypeByName(String resourceTypeName) { - for (ResourceType rt : resourceTypesInApachePlugin) { - if (resourceTypeName.equals(rt.getName())) { - return rt; - } - } - - return null; - } - - protected void testUpgrade(TestConfiguration testConfiguration) throws Throwable { - final TestSetup setup = new TestSetup(testConfiguration.configurationName); - boolean testFailed = false; - try { - - String[] configFiles = Arrays.copyOf(testConfiguration.apacheConfigurationFiles, testConfiguration.apacheConfigurationFiles.length + 2); - configFiles[testConfiguration.apacheConfigurationFiles.length] = "/snmpd.conf"; - configFiles[testConfiguration.apacheConfigurationFiles.length + 1] = "/mime.types"; - - setup.withInventoryFrom(testConfiguration.inventoryFile) - .withPlatformResource(platform).withDefaultExpectations().withDefaultOverrides(testConfiguration.defaultOverrides) - .withApacheSetup().withConfigurationFiles(configFiles) - .withServerRoot(testConfiguration.serverRoot).withExePath(testConfiguration.binPath); - - testConfiguration.beforeTestSetup(setup); - - setup.setup(); - - testConfiguration.beforePluginContainerStart(setup); - - startConfiguredPluginContainer(); - - testConfiguration.beforeTests(setup); - - if (!testConfiguration.upgradeShouldSucceed) { - return; - } - - //ok, now we should see the resources upgraded in the fake server inventory. - ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); - ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); - - Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); - - assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); - - Resource server = servers.iterator().next(); - - String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfiguration.serverRoot, testConfiguration.serverRoot - + "/conf/httpd.conf"); - - assertEquals(server.getResourceKey(), expectedResourceKey, - "The server resource key doesn't seem to be upgraded."); - - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); - - assertEquals(vhosts.size(), 5, "Unexpected number of vhosts discovered found"); - - List<String> expectedResourceKeys = new ArrayList<String>(5); - - DeploymentConfig dc = setup.getDeploymentConfig(); - Map<String, String> replacements = dc.getTokenReplacements(); - - VHostSpec vh1 = dc.vhost1.getVHostSpec(replacements); - VHostSpec vh2 = dc.vhost2.getVHostSpec(replacements); - VHostSpec vh3 = dc.vhost3.getVHostSpec(replacements); - VHostSpec vh4 = dc.vhost4.getVHostSpec(replacements); - - expectedResourceKeys.add(ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - vh1.serverName, vh1.hosts)); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - vh2.serverName, vh2.hosts)); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - vh3.serverName, vh3.hosts)); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - vh4.serverName, vh4.hosts)); - - for (Resource vhost : vhosts) { - assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), - "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'. Only expecting " + expectedResourceKeys); - } - } catch (Throwable t) { - testFailed = true; - LOG.error("Error during test upgrade execution.", t); - throw t; - } finally { - try { - setup.withApacheSetup().getExecutionUtil().invokeOperation("stop"); - } catch (Exception e) { - if (testFailed) { - LOG.error("Failed to stop apache.", e); - } else { - throw e; - } - } - } - } - - private static List<ResourceType> getResourceTypesInPlugin(String pluginUri) throws Exception { - PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(new URI(pluginUri).toURL()); - PluginMetadataParser parser = new PluginMetadataParser(descriptor, - Collections.<String, PluginMetadataParser> emptyMap()); - - return parser.getAllTypes(); - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - private static Resource discoverPlatform() throws Exception { - PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(new URI(PLATFORM_PLUGIN) - .toURL()); - PluginMetadataParser parser = new PluginMetadataParser(descriptor, - Collections.<String, PluginMetadataParser> emptyMap()); - - List<ResourceType> platformTypes = parser.getAllTypes(); - - for (ResourceType rt : platformTypes) { - Class discoveryClass = Class.forName(parser.getDiscoveryComponentClass(rt)); - - ResourceDiscoveryComponent discoveryComponent = (ResourceDiscoveryComponent) discoveryClass.newInstance(); - - ResourceDiscoveryContext context = new ResourceDiscoveryContext(rt, null, null, - SystemInfoFactory.createSystemInfo(), null, null, PluginContainerDeployment.AGENT); - - Set<DiscoveredResourceDetails> results = discoveryComponent.discoverResources(context); - - if (!results.isEmpty()) { - DiscoveredResourceDetails details = results.iterator().next(); - - Resource platform = new Resource(); - - platform.setDescription(details.getResourceDescription()); - platform.setResourceKey(details.getResourceKey()); - platform.setName(details.getResourceName()); - platform.setVersion(details.getResourceVersion()); - platform.setPluginConfiguration(details.getPluginConfiguration()); - platform.setResourceType(rt); - platform.setUuid(UUID.randomUUID().toString()); - platform.setId(1); - - return platform; - } - } - - return null; - } - - protected static String variableName(String prefix, String name) { - StringBuilder bld = new StringBuilder(); - if (prefix != null && !prefix.isEmpty()) { - bld.append(prefix).append("."); - } - - bld.append(name); - - return bld.toString(); - } - - protected static InetAddress determineLocalhost() { - try { - return InetAddress.getLocalHost(); - } catch (UnknownHostException e) { - try { - return InetAddress.getByName("127.0.0.1"); - } catch (UnknownHostException ee) { - //doesn't happen - return null; - } - } - } -} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java new file mode 100644 index 0000000..358df93 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/UpgradeTestBase.java @@ -0,0 +1,599 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.upgrade; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.io.File; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.net.InetAddress; +import java.net.URI; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jmock.Expectations; +import org.testng.annotations.BeforeClass; + +import org.rhq.core.clientapi.agent.metadata.PluginMetadataParser; +import org.rhq.core.clientapi.descriptor.AgentPluginDescriptorUtil; +import org.rhq.core.clientapi.descriptor.plugin.PluginDescriptor; +import org.rhq.core.clientapi.server.discovery.InventoryReport; +import org.rhq.core.domain.discovery.AvailabilityReport; +import org.rhq.core.domain.resource.InventoryStatus; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceError; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.pc.ServerServices; +import org.rhq.core.pc.upgrade.FakeServerInventory; +import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; +import org.rhq.core.pluginapi.inventory.PluginContainerDeployment; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; +import org.rhq.core.system.SystemInfoFactory; +import org.rhq.plugins.apache.ApacheServerDiscoveryComponent; +import org.rhq.plugins.apache.ApacheVirtualHostServiceComponent; +import org.rhq.plugins.apache.ApacheVirtualHostServiceDiscoveryComponent; +import org.rhq.plugins.apache.parser.ApacheConfigReader; +import org.rhq.plugins.apache.parser.ApacheDirectiveTree; +import org.rhq.plugins.apache.parser.ApacheParser; +import org.rhq.plugins.apache.parser.ApacheParserImpl; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; +import org.rhq.plugins.apache.util.ApacheExecutionUtil; +import org.rhq.plugins.apache.util.HttpdAddressUtility; +import org.rhq.plugins.apache.util.VHostSpec; +import org.rhq.test.ObjectCollectionSerializer; +import org.rhq.test.TokenReplacingReader; +import org.rhq.test.pc.PluginContainerTest; + + +/** + * Base class for the upgrade test classes. + * + * @author Lukas Krejci + */ +public class UpgradeTestBase extends PluginContainerTest { + + private static final Log LOG = LogFactory.getLog(UpgradeTestBase.class); + + protected class TestSetup { + private String configurationName; + private FakeServerInventory fakeInventory = new FakeServerInventory(); + private String inventoryFile; + private Resource platform; + private ApacheSetup apacheSetup = new ApacheSetup(); + private DeploymentConfig deploymentConfig; + private Map<String, String> defaultOverrides = new HashMap<String, String>(); + private Map<String, String> inventoryFileReplacements; + + public class ApacheSetup { + private String serverRoot; + private String exePath; + private Collection<String> configurationFiles; + private ApacheExecutionUtil execution; + private boolean deploy = true; + + private ApacheSetup() { + + } + + public ApacheSetup withServerRoot(String serverRoot) { + this.serverRoot = serverRoot; + //auto-define the server root property as if it was passed on the commandline + System.getProperties().put(configurationName + ".server.root", serverRoot); + deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName, defaultOverrides); + return this; + } + + public ApacheSetup withExePath(String exePath) { + this.exePath = exePath; + return this; + } + + public ApacheSetup withConfigurationFiles(String... classPathUris) { + return withConfigurationFiles(Arrays.asList(classPathUris)); + } + + public ApacheSetup withConfigurationFiles(Collection<String> classPathUris) { + this.configurationFiles = classPathUris; + return this; + } + + public ApacheSetup withDeploymentOnSetup() { + this.deploy = true; + return this; + } + + public ApacheSetup withNoDeploymentOnSetup() { + this.deploy = false; + return this; + } + + public ApacheExecutionUtil getExecutionUtil() { + return execution; + } + + public void init() throws Exception { + File serverRootDir = new File(serverRoot); + + assertTrue(serverRootDir.exists(), "The configured server root denotes a non-existant directory: '" + + serverRootDir + "'."); + + File confDir = new File(serverRootDir, "conf"); + + assertTrue(confDir.exists(), + "The configured server root denotes a directory that doesn't have a 'conf' subdirectory. This is unexpected."); + + String confFilePath = confDir.getAbsolutePath() + File.separatorChar + "httpd.conf"; + + String snmpHost = null; + int snmpPort = 0; + String pingUrl = null; + + if (configurationName != null) { + if (deploy) { + ApacheDeploymentUtil.deployConfiguration(confDir, configurationFiles, deploymentConfig); + } + + //ok, now try to find the ping URL. The best thing is to actually invoke + //the same code the apache server discovery does. + ApacheDirectiveTree tree = new ApacheDirectiveTree(); + ApacheParser parser = new ApacheParserImpl(tree, serverRootDir.getAbsolutePath()); + ApacheConfigReader.buildTree(confFilePath, parser); + + //XXX this hardcodes apache2 as the only option we have... + HttpdAddressUtility.Address addrToUse = HttpdAddressUtility.APACHE_2_x.getMainServerSampleAddress(tree, null, -1); + pingUrl = addrToUse.toString(); + + snmpHost = deploymentConfig.snmpHost; + snmpPort = deploymentConfig.snmpPort; + } + + execution = new ApacheExecutionUtil(findApachePluginResourceTypeByName("Apache HTTP Server"), + serverRoot, exePath, confFilePath, pingUrl, + snmpHost, snmpPort); + execution.init(); + } + + private void doSetup() throws Exception { + init(); + execution.invokeOperation("start"); + } + + public TestSetup setup() throws Exception { + return TestSetup.this.setup(); + } + } + + public TestSetup(String configurationName) { + this.configurationName = configurationName; + deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName, defaultOverrides); + } + + public TestSetup withInventoryFrom(String classPathUri) { + inventoryFile = classPathUri; + return this; + } + + public TestSetup withDefaultOverrides(Map<String, String> defaultOverrides) { + this.defaultOverrides = defaultOverrides == null ? new HashMap<String, String>() : defaultOverrides; + deploymentConfig = ApacheDeploymentUtil.getDeploymentConfigurationFromSystemProperties(configurationName, this.defaultOverrides); + return this; + } + + public TestSetup withPlatformResource(Resource platform) { + this.platform = platform; + return this; + } + + public ApacheSetup withApacheSetup() { + return apacheSetup; + } + + public TestSetup withDefaultExpectations() throws Exception { + context.checking(new Expectations() { + { + addDefaultExceptations(this); + } + }); + + return this; + } + + @SuppressWarnings("unchecked") + public void addDefaultExceptations(Expectations expectations) throws Exception { + ServerServices ss = getCurrentPluginContainerConfiguration().getServerServices(); + + expectations.allowing(ss.getDiscoveryServerService()).mergeInventoryReport( + expectations.with(Expectations.any(InventoryReport.class))); + expectations.will(fakeInventory.mergeInventoryReport(InventoryStatus.COMMITTED)); + + expectations.allowing(ss.getDiscoveryServerService()).upgradeResources( + expectations.with(Expectations.any(Set.class))); + expectations.will(fakeInventory.upgradeResources()); + + expectations.allowing(ss.getDiscoveryServerService()).getResources( + expectations.with(Expectations.any(Set.class)), expectations.with(Expectations.any(boolean.class))); + expectations.will(fakeInventory.getResources()); + + expectations.allowing(ss.getDiscoveryServerService()).setResourceError(expectations.with(Expectations.any(ResourceError.class))); + expectations.will(fakeInventory.setResourceError()); + + expectations.allowing(ss.getDiscoveryServerService()).mergeAvailabilityReport( + expectations.with(Expectations.any(AvailabilityReport.class))); + + expectations.allowing(ss.getDiscoveryServerService()).postProcessNewlyCommittedResources( + expectations.with(Expectations.any(Set.class))); + + expectations.allowing(ss.getDiscoveryServerService()).clearResourceConfigError( + expectations.with(Expectations.any(int.class))); + + expectations.ignoring(ss.getBundleServerService()); + expectations.ignoring(ss.getConfigurationServerService()); + expectations.ignoring(ss.getContentServerService()); + expectations.ignoring(ss.getCoreServerService()); + expectations.ignoring(ss.getEventServerService()); + expectations.ignoring(ss.getMeasurementServerService()); + expectations.ignoring(ss.getOperationServerService()); + expectations.ignoring(ss.getResourceFactoryServerService()); + } + + public FakeServerInventory getFakeInventory() { + return fakeInventory; + } + + public DeploymentConfig getDeploymentConfig() { + return deploymentConfig; + } + + public TestSetup setup() throws Exception { + apacheSetup.doSetup(); + + Map<String, String> replacements = deploymentConfig.getTokenReplacements(); + replacements.put("server.root", apacheSetup.serverRoot); + replacements.put("exe.path", apacheSetup.exePath); + + ApacheDeploymentUtil.addDefaultVariables(replacements, null); + + HttpdAddressUtility addressUtility = apacheSetup.getExecutionUtil().getServerComponent() + .getAddressUtility(); + ApacheDirectiveTree runtimeConfig = apacheSetup.getExecutionUtil().getRuntimeConfiguration(); + + replacements.put("snmp.identifier", + addressUtility.getHttpdInternalMainServerAddressRepresentation(runtimeConfig).toString(false, false)); + + replacements.put("main.rhq4.resource.key", ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); + + VHostSpec vhost1 = deploymentConfig.vhost1 == null ? null : deploymentConfig.vhost1.getVHostSpec(replacements); + VHostSpec vhost2 = deploymentConfig.vhost2 == null ? null : deploymentConfig.vhost2.getVHostSpec(replacements); + VHostSpec vhost3 = deploymentConfig.vhost3 == null ? null : deploymentConfig.vhost3.getVHostSpec(replacements); + VHostSpec vhost4 = deploymentConfig.vhost4 == null ? null : deploymentConfig.vhost4.getVHostSpec(replacements); + + if (vhost1 != null) { + replacements.put( + "vhost1.snmp.identifier", + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost1.hosts.get(0), + vhost1.serverName).toString(false, false)); + + replacements.put( + "vhost1.rhq4.resource.key", + ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + vhost1.serverName, vhost1.hosts)); + } + + if (vhost2 != null) { + replacements.put( + "vhost2.snmp.identifier", + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost2.hosts.get(0), + vhost2.serverName).toString(false, false)); + + replacements.put( + "vhost2.rhq4.resource.key", + ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + vhost2.serverName, vhost2.hosts)); + } + + if (vhost3 != null) { + replacements.put( + "vhost3.snmp.identifier", + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost3.hosts.get(0), + vhost3.serverName).toString(false, false)); + + replacements.put( + "vhost3.rhq4.resource.key", + ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + vhost3.serverName, vhost3.hosts)); + } + + if (vhost4 != null) { + replacements.put( + "vhost4.snmp.identifier", + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost4.hosts.get(0), + vhost4.serverName).toString(false, false)); + + replacements.put( + "vhost4.rhq4.resource.key", + ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + vhost4.serverName, vhost4.hosts)); + } + + //let the user override everything we just did + replacements.putAll(defaultOverrides); + + inventoryFileReplacements = replacements; + + InputStream dataStream = getClass().getResourceAsStream(inventoryFile); + + Reader rdr = new TokenReplacingReader(new InputStreamReader(dataStream), replacements); + + @SuppressWarnings("unchecked") + List<Resource> inventory = (List<Resource>) new ObjectCollectionSerializer().deserialize(rdr); + + //fix up the parent relationships, because they might not be reconstructed correctly by + //JAXB - we're missing XmlID and XmlIDRef annotations in our model + fixupParent(null, inventory); + + fakeInventory.prepopulateInventory(platform, inventory); + + return this; + } + + /** + * After the setup, this returns all the variables used to update the tokens in the inventory file. + * + * @return + */ + public Map<String, String> getInventoryFileReplacements() { + return inventoryFileReplacements; + } + + private void fixupParent(Resource parent, Collection<Resource> children) { + for (Resource child : children) { + child.setParentResource(parent); + if (child.getChildResources() != null) { + fixupParent(child, child.getChildResources()); + } + } + } + } + + protected static class TestConfiguration { + public String[] apacheConfigurationFiles; + public String inventoryFile; + public String configurationName; + public String serverRoot; + public String binPath; + public Map<String, String> defaultOverrides = new HashMap<String, String>(); + public boolean upgradeShouldSucceed = true; + + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + + } + + public void beforePluginContainerStart(TestSetup setup) throws Throwable { + + } + + public void beforeTests(TestSetup setup) throws Throwable { + + } + } + + protected static final String PLATFORM_PLUGIN = "file:target/itest/plugins/rhq-platform-plugin-for-apache-test.jar"; + protected static final String AUGEAS_PLUGIN = "file:target/itest/plugins/rhq-augeas-plugin-for-apache-test.jar"; + protected static final String APACHE_PLUGIN = "file:target/itest/plugins/rhq-apache-plugin-for-apache-test.jar"; + + protected static final String DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES = "simpleWithResolvableServerNames"; + protected static final String DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES = "simpleWithUnresolvableServerNames"; + protected static final String DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS = "simpleWithWildcardListens"; + + private List<ResourceType> resourceTypesInApachePlugin; + protected Resource platform; + + @BeforeClass + public void parseResourceTypesFromApachePlugin() throws Exception { + resourceTypesInApachePlugin = getResourceTypesInPlugin(APACHE_PLUGIN); + platform = discoverPlatform(); + } + + protected ResourceType findApachePluginResourceTypeByName(String resourceTypeName) { + for (ResourceType rt : resourceTypesInApachePlugin) { + if (resourceTypeName.equals(rt.getName())) { + return rt; + } + } + + return null; + } + + protected void testUpgrade(TestConfiguration testConfiguration) throws Throwable { + final TestSetup setup = new TestSetup(testConfiguration.configurationName); + boolean testFailed = false; + try { + + String[] configFiles = Arrays.copyOf(testConfiguration.apacheConfigurationFiles, testConfiguration.apacheConfigurationFiles.length + 2); + configFiles[testConfiguration.apacheConfigurationFiles.length] = "/snmpd.conf"; + configFiles[testConfiguration.apacheConfigurationFiles.length + 1] = "/mime.types"; + + setup.withInventoryFrom(testConfiguration.inventoryFile) + .withPlatformResource(platform).withDefaultExpectations().withDefaultOverrides(testConfiguration.defaultOverrides) + .withApacheSetup().withConfigurationFiles(configFiles) + .withServerRoot(testConfiguration.serverRoot).withExePath(testConfiguration.binPath); + + testConfiguration.beforeTestSetup(setup); + + setup.setup(); + + testConfiguration.beforePluginContainerStart(setup); + + startConfiguredPluginContainer(); + + testConfiguration.beforeTests(setup); + + if (!testConfiguration.upgradeShouldSucceed) { + return; + } + + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); + + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfiguration.serverRoot, testConfiguration.serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), 5, "Unexpected number of vhosts discovered found"); + + List<String> expectedResourceKeys = new ArrayList<String>(5); + + DeploymentConfig dc = setup.getDeploymentConfig(); + Map<String, String> replacements = dc.getTokenReplacements(); + + VHostSpec vh1 = dc.vhost1.getVHostSpec(replacements); + VHostSpec vh2 = dc.vhost2.getVHostSpec(replacements); + VHostSpec vh3 = dc.vhost3.getVHostSpec(replacements); + VHostSpec vh4 = dc.vhost4.getVHostSpec(replacements); + + expectedResourceKeys.add(ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + vh1.serverName, vh1.hosts)); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + vh2.serverName, vh2.hosts)); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + vh3.serverName, vh3.hosts)); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + vh4.serverName, vh4.hosts)); + + for (Resource vhost : vhosts) { + assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), + "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'. Only expecting " + expectedResourceKeys); + } + } catch (Throwable t) { + testFailed = true; + LOG.error("Error during test upgrade execution.", t); + throw t; + } finally { + try { + setup.withApacheSetup().getExecutionUtil().invokeOperation("stop"); + } catch (Exception e) { + if (testFailed) { + LOG.error("Failed to stop apache.", e); + } else { + throw e; + } + } + } + } + + private static List<ResourceType> getResourceTypesInPlugin(String pluginUri) throws Exception { + PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(new URI(pluginUri).toURL()); + PluginMetadataParser parser = new PluginMetadataParser(descriptor, + Collections.<String, PluginMetadataParser> emptyMap()); + + return parser.getAllTypes(); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + private static Resource discoverPlatform() throws Exception { + PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(new URI(PLATFORM_PLUGIN) + .toURL()); + PluginMetadataParser parser = new PluginMetadataParser(descriptor, + Collections.<String, PluginMetadataParser> emptyMap()); + + List<ResourceType> platformTypes = parser.getAllTypes(); + + for (ResourceType rt : platformTypes) { + Class discoveryClass = Class.forName(parser.getDiscoveryComponentClass(rt)); + + ResourceDiscoveryComponent discoveryComponent = (ResourceDiscoveryComponent) discoveryClass.newInstance(); + + ResourceDiscoveryContext context = new ResourceDiscoveryContext(rt, null, null, + SystemInfoFactory.createSystemInfo(), null, null, PluginContainerDeployment.AGENT); + + Set<DiscoveredResourceDetails> results = discoveryComponent.discoverResources(context); + + if (!results.isEmpty()) { + DiscoveredResourceDetails details = results.iterator().next(); + + Resource platform = new Resource(); + + platform.setDescription(details.getResourceDescription()); + platform.setResourceKey(details.getResourceKey()); + platform.setName(details.getResourceName()); + platform.setVersion(details.getResourceVersion()); + platform.setPluginConfiguration(details.getPluginConfiguration()); + platform.setResourceType(rt); + platform.setUuid(UUID.randomUUID().toString()); + platform.setId(1); + + return platform; + } + } + + return null; + } + + protected static String variableName(String prefix, String name) { + StringBuilder bld = new StringBuilder(); + if (prefix != null && !prefix.isEmpty()) { + bld.append(prefix).append("."); + } + + bld.append(name); + + return bld.toString(); + } + + protected static InetAddress determineLocalhost() { + try { + return InetAddress.getLocalHost(); + } catch (UnknownHostException e) { + try { + return InetAddress.getByName("127.0.0.1"); + } catch (UnknownHostException ee) { + //doesn't happen + return null; + } + } + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeSimpleConfigurationFromRHQ1_3Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeSimpleConfigurationFromRHQ1_3Test.java new file mode 100644 index 0000000..1fd44ba --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq1_3_x/UpgradeSimpleConfigurationFromRHQ1_3Test.java @@ -0,0 +1,168 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.upgrade.rhq1_3_x; + +import java.util.Comparator; +import java.util.HashMap; +import java.util.Set; +import java.util.TreeSet; + +import org.testng.annotations.Parameters; +import org.testng.annotations.Test; + +import org.rhq.core.domain.resource.Resource; +import org.rhq.plugins.apache.upgrade.UpgradeTestBase; +import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestConfiguration; +import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestSetup; +import org.rhq.test.pc.PluginContainerSetup; + +/** + * + * + * @author Lukas Krejci + */ +@Test(groups = "apache-integration-tests") +public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { + + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithResolvableServerNames_Apache2(final String installPath, final String exePath) + throws Throwable { + + testUpgrade(new TestConfiguration() { + { + serverRoot = installPath; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + } + }); + } + + @Test(enabled = false) + //ApacheServerOperationsDelegate doesn't work with apache 1.3 + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache1.install.dir", "apache1.exe.path" }) + public void testWithResolvableServerNames_Apache1(final String installPath, final String exePath) + throws Throwable { + + testUpgrade(new TestConfiguration() {{ + serverRoot = installPath; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + apacheConfigurationFiles = new String[] { "/full-configurations/1.3.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + }}); + } + + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithNonUniqueServerNames_Apache2(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + serverRoot = installPath; + binPath = exePath; + + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); + } + + @Override + public void beforePluginContainerStart(TestSetup setup) { + //in this scenario, the RHQ 1.3 would only discover 1 vhost (and the main vhost), because they would have the same resource key + //due to the same ServerName. I need to process the default inventory to reflect that otherwise I would get upgrade + //failures. + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(findApachePluginResourceTypeByName("Apache Virtual Host")); + Set<Resource> uniques = new TreeSet<Resource>(new Comparator<Resource>() { + public int compare(Resource a, Resource b) { + return a.getResourceKey().compareTo(b.getResourceKey()); + } + }); + + for(Resource vhost : vhosts) { + if (uniques.contains(vhost)) { + //remove the vhost from the server's inventory + setup.getFakeInventory().removeResource(vhost); + } else { + uniques.add(vhost); + } + } + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddress(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + serverRoot = installPath; + binPath = exePath; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddress(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + serverRoot = installPath; + binPath = exePath; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + }); + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java new file mode 100644 index 0000000..fb2e360 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_0/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java @@ -0,0 +1,449 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.upgrade.rhq3_0_0; + + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.testng.annotations.Parameters; +import org.testng.annotations.Test; + +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceError; +import org.rhq.core.domain.resource.ResourceErrorType; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.plugins.apache.ApacheServerComponent; +import org.rhq.plugins.apache.ApacheServerDiscoveryComponent; +import org.rhq.plugins.apache.parser.ApacheDirectiveTree; +import org.rhq.plugins.apache.upgrade.UpgradeTestBase; +import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestConfiguration; +import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestSetup; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; +import org.rhq.plugins.apache.util.RuntimeApacheConfiguration; +import org.rhq.plugins.apache.util.VirtualHostLegacyResourceKeyUtil; +import org.rhq.test.pc.PluginContainerSetup; + +/** + * + * + * @author Lukas Krejci + */ +public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase { + + /** + * This tests the upgrade from RHQ 3.0.0 where the apache server was discovered without SNMP support. + * The Main Server URL must have been set in this case, otherwise the component would fail to start + * and therefore the vhost discovery wouldn't even take place. + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost}"); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithUnresolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${listen3}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${listen4}"); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithNonUniqueNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); + } + }); + } + + /** + * This tests the upgrade from RHQ 3.0.0 where the Apache server was discovered with the following: + * + * <ol> + * <li> SNMP enabled + * <li> Main URL set or unset (it doesn't make a difference here) + * </ol> + * @param installDir + * @param exePath + * @throws Throwable + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithUnresolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${listen3}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${listen4}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithNonUniqueNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + }); + } + + /** + * Unlike other SNMP tests this one actually succeeds to upgrade because of the messed up discovery that + * RHQ 3.0.0 would perform. In case of any-address (0.0.0.0), the main vhost would get the MainServer + * resource key even with SNMP, because RHQ 3 codebase wouldn't be able to match what it think should + * have been the SNMP record with the actual results from SNMP module. + * + * Because of this, RHQ 3 discovers all 5 vhosts and the upgrade code is therefore able to successfully + * upgrade all of them. + * + * @param installPath + * @param exePath + * @throws Throwable + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddressWithSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp-anyaddr.xml"; + serverRoot = installPath; + binPath = exePath; + + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddressWithSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + upgradeShouldSucceed = false; + + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + + private void beforeTestSetupWithSNMP(TestConfiguration testConfig, TestSetup setup) throws Exception { + setup.withApacheSetup().init(); + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + + DeploymentConfig deployConfig = setup.getDeploymentConfig(); + + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + Map<String, String> replacements = deployConfig.getTokenReplacements(); + + testConfig.defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey()); + + if (deployConfig.vhost1 != null) { + testConfig.defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec(replacements))); + } + + if (deployConfig.vhost2 != null) { + testConfig.defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec(replacements))); + } + + if (deployConfig.vhost3 != null) { + testConfig.defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec(replacements))); + } + + if (deployConfig.vhost4 != null) { + testConfig.defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec(replacements))); + } + + setup.withDefaultOverrides(testConfig.defaultOverrides); + } + + private void testWithSNMP(TestConfiguration testConfig, TestSetup setup) { + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); + + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfig.serverRoot, testConfig.serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), 4, "Unexpected number of vhosts discovered found"); + + //let's check that the main vhost has a an upgrade error attached to it + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + String mainVhostRK = keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey(); + + Resource mainVhost = null; + for(Resource r : vhosts) { + if (mainVhostRK.equals(r.getResourceKey())) { + mainVhost = r; + break; + } + } + + assertNotNull(mainVhost, "Couldn't find the main vhost with the expected resource key '" + mainVhostRK + "'."); + + List<ResourceError> errors = mainVhost.getResourceErrors(ResourceErrorType.UPGRADE); + assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); + assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + + //check that all other vhosts were not upgraded but have no errors + for(Resource r : vhosts) { + if (r.equals(mainVhost)) { + continue; + } + + assertEquals(r.getResourceErrors(ResourceErrorType.UPGRADE).size(), 0, "Unexpected number of resource upgrade errors on non-main vhost " + r); + } + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java new file mode 100644 index 0000000..cbd4826 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/upgrade/rhq3_0_1/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java @@ -0,0 +1,554 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache.upgrade.rhq3_0_1; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +import java.io.StringReader; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.testng.annotations.Parameters; +import org.testng.annotations.Test; + +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceError; +import org.rhq.core.domain.resource.ResourceErrorType; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.util.stream.StreamUtil; +import org.rhq.plugins.apache.ApacheServerComponent; +import org.rhq.plugins.apache.ApacheServerDiscoveryComponent; +import org.rhq.plugins.apache.parser.ApacheDirectiveTree; +import org.rhq.plugins.apache.upgrade.UpgradeTestBase; +import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestConfiguration; +import org.rhq.plugins.apache.upgrade.UpgradeTestBase.TestSetup; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; +import org.rhq.plugins.apache.util.RuntimeApacheConfiguration; +import org.rhq.plugins.apache.util.VirtualHostLegacyResourceKeyUtil; +import org.rhq.test.TokenReplacingReader; +import org.rhq.test.pc.PluginContainerSetup; + +/** + * + * + * @author Lukas Krejci + */ +public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase { + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 4, failingRK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost.ip}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String vhost1RK = interpret("${vhost1.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 5, vhost1RK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithUnresolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${listen3}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${listen4}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 4, failingRK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithUnresolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + //we use this in the serialized inventory to init the URL of the main server. The localhost.ip is actually what + //the RHQ 301 discovers even though unresolvable.host is specified in the ServerName directive. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${port1}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${port2}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${port3}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${port4}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithNonUniqueNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 4, failingRK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithNonUniqueNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + + //we use this in the serialized inventory to init the URL of the main server. The localhost.ip is actually what + //the RHQ 301 discovers even though unresolvable.host is specified in the ServerName directive. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), + "ServerName ${unresolvable.host}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + }); + } + + /** + * The duplicate Main vhosts "condition" was triggered by: + * <ol> + * <li>Disabling SNMP by putting in an invalid hostname + * <li>Changing the URL of the apache server to some "other" value + * <li>Running discovery + * </ol> + * From that point on, 2 Main vhosts live in the inventory and the inventory has the "rest" + * of the resource keys coming from the SNMP based discovery. + * + * It is not possible to recover from such condition automatically during + * the resource upgrade, so the only thing we need to check here is that + * the two main vhosts are marked as failed upgrade and that the rest of the vhosts + * are not upgraded and have no upgrade errors attached. + * + * @param installDir + * @param exePath + * @throws Throwable + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testDuplicateMainVhostsMarkedAsFailedUpgrade(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String mainVHost1RK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + String mainVhost2RK = interpret("${localhost}:${port1}", setup.getInventoryFileReplacements()); + + testExpectedFailures(this, setup, 5, mainVHost1RK, mainVhost2RK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + //yes, the inventory file can be the same for both the with and without snmp tests because + //they both yield the same inventory in this case. + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml"; + serverRoot = installPath; + binPath = exePath; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + }); + } + + /** + * Unlike other SNMP tests this one actually succeeds to upgrade because of the messed up discovery that + * RHQ 3.0.0 would perform. In case of any-address (0.0.0.0), the main vhost would get the MainServer + * resource key even with SNMP, because RHQ 3 codebase wouldn't be able to match what it think should + * have been the SNMP record with the actual results from SNMP module. + * + * Because of this, RHQ 3 discovers all 5 vhosts and the upgrade code is therefore able to successfully + * upgrade all of them. + * + * @param installPath + * @param exePath + * @throws Throwable + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddressWithSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml"; + serverRoot = installPath; + binPath = exePath; + + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + }); + } + + /** + * This configuration will fail to upgrade the first vhost, because it doesn't uniquely match to new-style + * vhosts - it could be either a main vhost or vhost1. + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + upgradeShouldSucceed = false; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String failingRK = interpret("${vhost1.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 5, failingRK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddressWithSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + upgradeShouldSucceed = false; + + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 4, failingRK); + } + }); + } + + private void defineRHQ3ResourceKeys(TestConfiguration testConfig, TestSetup setup) throws Exception { + setup.withApacheSetup().init(); + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + + DeploymentConfig deployConfig = setup.getDeploymentConfig(); + + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + Map<String, String> replacements = deployConfig.getTokenReplacements(); + + testConfig.defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey()); + + if (deployConfig.vhost1 != null) { + testConfig.defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec(replacements))); + } + + if (deployConfig.vhost2 != null) { + testConfig.defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec(replacements))); + } + + if (deployConfig.vhost3 != null) { + testConfig.defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec(replacements))); + } + + if (deployConfig.vhost4 != null) { + testConfig.defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec(replacements))); + } + + setup.withDefaultOverrides(testConfig.defaultOverrides); + } + + private void testExpectedFailures(TestConfiguration testConfig, TestSetup setup, int numberOfVhosts, String... failingRKs) { + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); + + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfig.serverRoot, testConfig.serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), numberOfVhosts, "Unexpected number of vhosts discovered found"); + + //let's check that the main vhost has a an upgrade error attached to it + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + Set<Resource> failingResources = new HashSet<Resource>(); + + for(String rk : failingRKs) { + for(Resource r : vhosts) { + if (rk.equals(r.getResourceKey())) { + failingResources.add(r); + break; + } + } + } + + assertEquals(failingResources.size(), failingRKs.length, "Couldn't find all the resources that should have failed."); + + for(Resource failingResource : failingResources) { + List<ResourceError> errors = failingResource.getResourceErrors(ResourceErrorType.UPGRADE); + assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); + assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + } + + //check that all other vhosts were not upgraded but have no errors + for(Resource r : vhosts) { + if (failingResources.contains(r)) { + continue; + } + + assertEquals(r.getResourceErrors(ResourceErrorType.UPGRADE).size(), 0, "Unexpected number of resource upgrade errors on non-main vhost " + r); + } + } + + private String interpret(String string, Map<String, String> variables) { + return StreamUtil.slurp(new TokenReplacingReader(new StringReader(string), variables)); + } +} commit 3280b0bd86bf5fe68765cfa72c37cc7af8e4b853 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed Jun 29 17:08:00 2011 +0200 added tests for handling the any-address and wildcard address during upgrade to the simple config tests, finished up the tests for RHQ 3.0.1 for simple config. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java index 135c2aa..8d1fe22 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java @@ -115,5 +115,51 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { } } }); - } + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddress(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + serverRoot = installPath; + binPath = exePath; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddress(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; + serverRoot = installPath; + binPath = exePath; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + }); + } } diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java index 8d0c03b..d3e5c86 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java @@ -23,7 +23,6 @@ package org.rhq.plugins.apache; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -64,6 +63,11 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost}"); } }); } @@ -80,7 +84,6 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; - defaultOverrides = new HashMap<String, String>(); defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); @@ -102,7 +105,6 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; - defaultOverrides = new HashMap<String, String>(); defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); @@ -134,9 +136,7 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - upgradeShouldSucceed = false; - - defaultOverrides = new HashMap<String, String>(); + upgradeShouldSucceed = false; } @Override @@ -168,7 +168,6 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; upgradeShouldSucceed = false; - defaultOverrides = new HashMap<String, String>(); defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); @@ -205,7 +204,6 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; upgradeShouldSucceed = false; - defaultOverrides = new HashMap<String, String>(); defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); @@ -229,6 +227,135 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase }); } + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + }); + } + + /** + * Unlike other SNMP tests this one actually succeeds to upgrade because of the messed up discovery that + * RHQ 3.0.0 would perform. In case of any-address (0.0.0.0), the main vhost would get the MainServer + * resource key even with SNMP, because RHQ 3 codebase wouldn't be able to match what it think should + * have been the SNMP record with the actual results from SNMP module. + * + * Because of this, RHQ 3 discovers all 5 vhosts and the upgrade code is therefore able to successfully + * upgrade all of them. + * + * @param installPath + * @param exePath + * @throws Throwable + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddressWithSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp-anyaddr.xml"; + serverRoot = installPath; + binPath = exePath; + + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddressWithSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + upgradeShouldSucceed = false; + + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + private void beforeTestSetupWithSNMP(TestConfiguration testConfig, TestSetup setup) throws Exception { setup.withApacheSetup().init(); ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java index 5938889..b43d3f3 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java @@ -23,7 +23,7 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import java.io.StringReader; -import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -62,13 +62,11 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; upgradeShouldSucceed = false; - - defaultOverrides = new HashMap<String, String>(); } @Override public void beforeTestSetup(TestSetup testSetup) throws Throwable { - beforeTestSetupWithSNMP(this, testSetup); + defineRHQ3ResourceKeys(this, testSetup); } /** @@ -77,7 +75,8 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase */ @Override public void beforeTests(TestSetup setup) throws Throwable { - testWithSNMP(this, setup); + String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 4, failingRK); } }); } @@ -85,6 +84,38 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase @Test @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost.ip}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String vhost1RK = interpret("${vhost1.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 5, vhost1RK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) public void testWithUnresolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { @@ -95,7 +126,6 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; upgradeShouldSucceed = false; - defaultOverrides = new HashMap<String, String>(); defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); @@ -105,7 +135,7 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase @Override public void beforeTestSetup(TestSetup testSetup) throws Throwable { - beforeTestSetupWithSNMP(this, testSetup); + defineRHQ3ResourceKeys(this, testSetup); } /** @@ -114,7 +144,37 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase */ @Override public void beforeTests(TestSetup setup) throws Throwable { - testWithSNMP(this, setup); + String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 4, failingRK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithUnresolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + //we use this in the serialized inventory to init the URL of the main server. The localhost.ip is actually what + //the RHQ 301 discovers even though unresolvable.host is specified in the ServerName directive. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${port1}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${port2}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${port3}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${port4}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); } }); } @@ -132,7 +192,6 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; upgradeShouldSucceed = false; - defaultOverrides = new HashMap<String, String>(); defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); @@ -142,7 +201,7 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase @Override public void beforeTestSetup(TestSetup testSetup) throws Throwable { - beforeTestSetupWithSNMP(this, testSetup); + defineRHQ3ResourceKeys(this, testSetup); } /** @@ -151,7 +210,41 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase */ @Override public void beforeTests(TestSetup setup) throws Throwable { - testWithSNMP(this, setup); + String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 4, failingRK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithNonUniqueNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + + //we use this in the serialized inventory to init the URL of the main server. The localhost.ip is actually what + //the RHQ 301 discovers even though unresolvable.host is specified in the ServerName directive. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), + "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), + "ServerName ${unresolvable.host}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); } }); } @@ -187,13 +280,11 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; upgradeShouldSucceed = false; - - defaultOverrides = new HashMap<String, String>(); } @Override public void beforeTestSetup(TestSetup testSetup) throws Throwable { - beforeTestSetupWithSNMP(this, testSetup); + defineRHQ3ResourceKeys(this, testSetup); } /** @@ -202,73 +293,168 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase */ @Override public void beforeTests(TestSetup setup) throws Throwable { - //ok, now we should see the resources upgraded in the fake server inventory. - ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); - ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); - - Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); - - assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); - - Resource server = servers.iterator().next(); - - String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(this.serverRoot, this.serverRoot - + "/conf/httpd.conf"); - - assertEquals(server.getResourceKey(), expectedResourceKey, - "The server resource key doesn't seem to be upgraded."); - - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); - - assertEquals(vhosts.size(), 5, "Unexpected number of vhosts discovered found"); - - //let's check that the main vhost has a an upgrade error attached to it - ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); - ApacheDirectiveTree config = component.loadParser(); - config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); - VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); - - String mainVhost1RK = keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey(); - String mainVhost2RK = interpret("${localhost.ip}:${listen1}", setup.getInventoryFileReplacements()); - Resource mainVhost1 = null; - Resource mainVhost2 = null; - for(Resource r : vhosts) { - if (mainVhost1RK.equals(r.getResourceKey())) { - mainVhost1 = r; - break; - } - } - for(Resource r : vhosts) { - if (mainVhost2RK.equals(r.getResourceKey())) { - mainVhost2 = r; - break; - } - } + String mainVHost1RK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + String mainVhost2RK = interpret("${localhost}:${port1}", setup.getInventoryFileReplacements()); - assertNotNull(mainVhost1, "Couldn't find the main vhost with the expected resource key '" + mainVhost1RK + "'."); - assertNotNull(mainVhost2, "Couldn't find the main vhost with the expected resource key '" + mainVhost2RK + "'."); + testExpectedFailures(this, setup, 5, mainVHost1RK, mainVhost2RK); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + //yes, the inventory file can be the same for both the with and without snmp tests because + //they both yield the same inventory in this case. + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml"; + serverRoot = installPath; + binPath = exePath; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + }); + } + + /** + * Unlike other SNMP tests this one actually succeeds to upgrade because of the messed up discovery that + * RHQ 3.0.0 would perform. In case of any-address (0.0.0.0), the main vhost would get the MainServer + * resource key even with SNMP, because RHQ 3 codebase wouldn't be able to match what it think should + * have been the SNMP record with the actual results from SNMP module. + * + * Because of this, RHQ 3 discovers all 5 vhosts and the upgrade code is therefore able to successfully + * upgrade all of them. + * + * @param installPath + * @param exePath + * @throws Throwable + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithAnyAddressWithSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - List<ResourceError> errors = mainVhost1.getResourceErrors(ResourceErrorType.UPGRADE); - assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); - assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml"; + serverRoot = installPath; + binPath = exePath; + + defaultOverrides.put(variableName(configurationName, "listen1"), "0.0.0.0:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "0.0.0.0:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "0.0.0.0:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "0.0.0.0:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "0.0.0.0:${port1}"); + } - errors = mainVhost2.getResourceErrors(ResourceErrorType.UPGRADE); - assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); - assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + }); + } + + /** + * This configuration will fail to upgrade the first vhost, because it doesn't uniquely match to new-style + * vhosts - it could be either a main vhost or vhost1. + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddressWithoutSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; - //check that all other vhosts were not upgraded but have no errors - for(Resource r : vhosts) { - if (r.equals(mainVhost1) || r.equals(mainVhost2)) { - continue; - } - - assertEquals(r.getResourceErrors(ResourceErrorType.UPGRADE).size(), 0, "Unexpected number of resource upgrade errors on non-main vhost " + r); - } + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + upgradeShouldSucceed = false; + + //just define the servername value without actually setting the ${servername.directive} so that + //we don't define a servername directive itself but do have a value for the actual server name. + //this is deduced by apache and the plugin but tests aren't that clever. + defaultOverrides.put("servername", "${localhost.ip}"); + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String failingRK = interpret("${vhost1.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 5, failingRK); } }); } - private void beforeTestSetupWithSNMP(TestConfiguration testConfig, TestSetup setup) throws Exception { + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path" }) + public void testWithWildcardAddressWithSNMP(final String installPath, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS; + + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + serverRoot = installPath; + binPath = exePath; + upgradeShouldSucceed = false; + + defaultOverrides.put(variableName(configurationName, "listen1"), "*:${port1}"); + defaultOverrides.put(variableName(configurationName, "listen2"), "*:${port2}"); + defaultOverrides.put(variableName(configurationName, "listen3"), "*:${port3}"); + defaultOverrides.put(variableName(configurationName, "listen4"), "*:${port4}"); + defaultOverrides.put(variableName(configurationName, "vhost1.urls"), "*:${port1}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + defineRHQ3ResourceKeys(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + String failingRK = interpret("${main.rhq3.resource.key}", setup.getInventoryFileReplacements()); + testExpectedFailures(this, setup, 4, failingRK); + } + }); + } + + private void defineRHQ3ResourceKeys(TestConfiguration testConfig, TestSetup setup) throws Exception { setup.withApacheSetup().init(); ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); ApacheDirectiveTree config = component.loadParser(); @@ -301,7 +487,7 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase setup.withDefaultOverrides(testConfig.defaultOverrides); } - private void testWithSNMP(TestConfiguration testConfig, TestSetup setup) { + private void testExpectedFailures(TestConfiguration testConfig, TestSetup setup, int numberOfVhosts, String... failingRKs) { //ok, now we should see the resources upgraded in the fake server inventory. ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); @@ -320,7 +506,7 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); - assertEquals(vhosts.size(), 4, "Unexpected number of vhosts discovered found"); + assertEquals(vhosts.size(), numberOfVhosts, "Unexpected number of vhosts discovered found"); //let's check that the main vhost has a an upgrade error attached to it ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); @@ -328,25 +514,28 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); - String mainVhostRK = keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey(); + Set<Resource> failingResources = new HashSet<Resource>(); - Resource mainVhost = null; - for(Resource r : vhosts) { - if (mainVhostRK.equals(r.getResourceKey())) { - mainVhost = r; - break; + for(String rk : failingRKs) { + for(Resource r : vhosts) { + if (rk.equals(r.getResourceKey())) { + failingResources.add(r); + break; + } } } - assertNotNull(mainVhost, "Couldn't find the main vhost with the expected resource key '" + mainVhostRK + "'."); + assertEquals(failingResources.size(), failingRKs.length, "Couldn't find all the resources that should have failed."); - List<ResourceError> errors = mainVhost.getResourceErrors(ResourceErrorType.UPGRADE); - assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); - assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + for(Resource failingResource : failingResources) { + List<ResourceError> errors = failingResource.getResourceErrors(ResourceErrorType.UPGRADE); + assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); + assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + } //check that all other vhosts were not upgraded but have no errors for(Resource r : vhosts) { - if (r.equals(mainVhost)) { + if (failingResources.contains(r)) { continue; } diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java index 59c1348..831b2d8 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java @@ -60,10 +60,12 @@ import org.rhq.core.pluginapi.inventory.PluginContainerDeployment; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.core.system.SystemInfoFactory; +import org.rhq.plugins.apache.parser.ApacheConfigReader; import org.rhq.plugins.apache.parser.ApacheDirectiveTree; +import org.rhq.plugins.apache.parser.ApacheParser; +import org.rhq.plugins.apache.parser.ApacheParserImpl; import org.rhq.plugins.apache.util.ApacheDeploymentUtil; import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; -import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig.VHost; import org.rhq.plugins.apache.util.ApacheExecutionUtil; import org.rhq.plugins.apache.util.HttpdAddressUtility; import org.rhq.plugins.apache.util.VHostSpec; @@ -149,6 +151,8 @@ public class UpgradeTestBase extends PluginContainerTest { assertTrue(confDir.exists(), "The configured server root denotes a directory that doesn't have a 'conf' subdirectory. This is unexpected."); + String confFilePath = confDir.getAbsolutePath() + File.separatorChar + "httpd.conf"; + String snmpHost = null; int snmpPort = 0; String pingUrl = null; @@ -157,13 +161,15 @@ public class UpgradeTestBase extends PluginContainerTest { if (deploy) { ApacheDeploymentUtil.deployConfiguration(confDir, configurationFiles, deploymentConfig); } - - HttpdAddressUtility.Address addr = deploymentConfig.mainServer.address1; - HttpdAddressUtility.Address addrToUse = new HttpdAddressUtility.Address(null, null, - HttpdAddressUtility.Address.NO_PORT_SPECIFIED_VALUE); - addrToUse.scheme = addr.scheme == null ? "http" : addr.scheme; - addrToUse.host = addr.host == null ? "localhost" : addr.host; - addrToUse.port = addr.port; + + //ok, now try to find the ping URL. The best thing is to actually invoke + //the same code the apache server discovery does. + ApacheDirectiveTree tree = new ApacheDirectiveTree(); + ApacheParser parser = new ApacheParserImpl(tree, serverRootDir.getAbsolutePath()); + ApacheConfigReader.buildTree(confFilePath, parser); + + //XXX this hardcodes apache2 as the only option we have... + HttpdAddressUtility.Address addrToUse = HttpdAddressUtility.APACHE_2_x.getMainServerSampleAddress(tree, null, -1); pingUrl = addrToUse.toString(); snmpHost = deploymentConfig.snmpHost; @@ -171,7 +177,7 @@ public class UpgradeTestBase extends PluginContainerTest { } execution = new ApacheExecutionUtil(findApachePluginResourceTypeByName("Apache HTTP Server"), - serverRoot, exePath, confDir.getAbsolutePath() + File.separatorChar + "httpd.conf", pingUrl, + serverRoot, exePath, confFilePath, pingUrl, snmpHost, snmpPort); execution.init(); } @@ -384,7 +390,7 @@ public class UpgradeTestBase extends PluginContainerTest { public String configurationName; public String serverRoot; public String binPath; - public Map<String, String> defaultOverrides; + public Map<String, String> defaultOverrides = new HashMap<String, String>(); public boolean upgradeShouldSucceed = true; public void beforeTestSetup(TestSetup testSetup) throws Throwable { @@ -406,6 +412,7 @@ public class UpgradeTestBase extends PluginContainerTest { protected static final String DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES = "simpleWithResolvableServerNames"; protected static final String DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES = "simpleWithUnresolvableServerNames"; + protected static final String DEPLOYMENT_SIMPLE_WITH_WILDCARD_LISTENS = "simpleWithWildcardListens"; private List<ResourceType> resourceTypesInApachePlugin; protected Resource platform; @@ -573,4 +580,17 @@ public class UpgradeTestBase extends PluginContainerTest { return bld.toString(); } + + protected static InetAddress determineLocalhost() { + try { + return InetAddress.getLocalHost(); + } catch (UnknownHostException e) { + try { + return InetAddress.getByName("127.0.0.1"); + } catch (UnknownHostException ee) { + //doesn't happen + return null; + } + } + } } diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java index 232741f..b640b59 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java @@ -159,9 +159,7 @@ public class ApacheDeploymentUtil { : serverNameDirective); String serverName = getServerName(); - if (serverName != null) { - tokenReplacements.put(prefix + SERVERNAME, serverName); - } + tokenReplacements.put(prefix + SERVERNAME, serverName == null ? "" : serverName); String dirs = ""; if (!additionalDirectives.isEmpty()) { diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp-anyaddr.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp-anyaddr.xml new file mode 100644 index 0000000..fc34748 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp-anyaddr.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>20037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq4.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml index 3d41813..ff9d715 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml @@ -9,7 +9,7 @@ <id>10022</id> <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> <resourceKey>${server.root}</resourceKey> - <name>${localhost}:${listen1}</name> + <name>${localhost}:${port1}</name> <inventoryStatus>COMMITTED</inventoryStatus> <connected>false</connected> <version>2.2.17</version> @@ -179,7 +179,7 @@ <propertySimple> <id>10808</id> <name>url</name> - <stringValue>http://${localhost}:${listen1}/</stringValue> + <stringValue>http://${localhost}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10807</id> @@ -398,7 +398,7 @@ <propertySimple> <id>10795</id> <name>url</name> - <stringValue>http://${localhost}:${listen1}/</stringValue> + <stringValue>http://${localhost}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10709</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml index 76269db..590b10f 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml @@ -9,7 +9,7 @@ <id>10041</id> <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> <resourceKey>${server.root}</resourceKey> - <name>${localhost}:${listen1}</name> + <name>${localhost}:${port1}</name> <inventoryStatus>COMMITTED</inventoryStatus> <connected>true</connected> <version>2.2.17</version> @@ -255,7 +255,7 @@ <propertySimple> <id>10928</id> <name>url</name> - <stringValue>http://${localhost}:${listen1}/</stringValue> + <stringValue>http://${localhost}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10927</id> @@ -351,7 +351,7 @@ <id>10050</id> <uuid>ae880c2d-747d-492d-8586-a47ab5791b0e</uuid> <resourceKey>${vhost1.rhq4.resource.key}</resourceKey> - <name>${vhos1.snmp.identifier}</name> + <name>${vhost1.snmp.identifier}</name> <inventoryStatus>COMMITTED</inventoryStatus> <connected>false</connected> <version></version> @@ -474,7 +474,7 @@ <propertySimple> <id>10868</id> <name>url</name> - <stringValue>http://${servername}:${listen1}/</stringValue> + <stringValue>http://${servername}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10870</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml index 999914d..78fc9dd 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml @@ -9,7 +9,7 @@ <id>10022</id> <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> <resourceKey>${server.root}</resourceKey> - <name>${localhost}:${listen1}</name> + <name>${localhost}:${port1}</name> <inventoryStatus>COMMITTED</inventoryStatus> <connected>false</connected> <version>2.2.17</version> @@ -179,7 +179,7 @@ <propertySimple> <id>10808</id> <name>url</name> - <stringValue>http://${localhost}:${listen1}/</stringValue> + <stringValue>http://${localhost}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10807</id> @@ -198,7 +198,7 @@ <childResources> <id>100371</id> <uuid>b2928cc6-30ab-47fe-8095-e1292887ac90</uuid> - <resourceKey>${localhost.ip}:${listen1}</resourceKey> + <resourceKey>${localhost}:${port1}</resourceKey> <name>Main</name> <inventoryStatus>COMMITTED</inventoryStatus> <connected>false</connected> @@ -255,7 +255,7 @@ <propertySimple> <id>10808</id> <name>url</name> - <stringValue>http://${localhost.ip}:${listen1}/</stringValue> + <stringValue>http://${localhost.ip}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10807</id> @@ -474,7 +474,7 @@ <propertySimple> <id>10795</id> <name>url</name> - <stringValue>http://${localhost}:${listen1}/</stringValue> + <stringValue>http://${localhost}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10709</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml new file mode 100644 index 0000000..47d502d --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp-anyaddr.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>20037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>0.0.0.0:${port1}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://0.0.0.0:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml index 3d41813..ff9d715 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml @@ -9,7 +9,7 @@ <id>10022</id> <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> <resourceKey>${server.root}</resourceKey> - <name>${localhost}:${listen1}</name> + <name>${localhost}:${port1}</name> <inventoryStatus>COMMITTED</inventoryStatus> <connected>false</connected> <version>2.2.17</version> @@ -179,7 +179,7 @@ <propertySimple> <id>10808</id> <name>url</name> - <stringValue>http://${localhost}:${listen1}/</stringValue> + <stringValue>http://${localhost}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10807</id> @@ -398,7 +398,7 @@ <propertySimple> <id>10795</id> <name>url</name> - <stringValue>http://${localhost}:${listen1}/</stringValue> + <stringValue>http://${localhost}:${port1}/</stringValue> </propertySimple> <propertySimple> <id>10709</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml new file mode 100644 index 0000000..44ea502 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-without-snmp.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10041</id> + <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${port1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1309116183350</ctime> + <mtime>1309116225316</mtime> + <itime>1309116225316</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10046</id> + <uuid>908ea047-889e-4978-a61f-d96e8b1c6d17</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + <itime>1309117635788</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10241</id> + <version>0</version> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10242</id> + <version>0</version> + <ctime>1309117635790</ctime> + <mtime>1309117635790</mtime> + <propertySimple> + <id>10858</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10857</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10860</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10859</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10047</id> + <uuid>5fccc52b-8003-42ed-aa69-0b146c783e91</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + <itime>1309117635802</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10243</id> + <version>0</version> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10244</id> + <version>0</version> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + <propertySimple> + <id>10922</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10921</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10924</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10923</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10048</id> + <uuid>704a31f3-7f5f-46c1-9bda-70f2645c9604</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635810</ctime> + <mtime>1309117635810</mtime> + <itime>1309117635810</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10245</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10246</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + <propertySimple> + <id>10926</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10925</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10928</id> + <name>url</name> + <stringValue>http://${localhost}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10927</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10049</id> + <uuid>03638606-623b-4218-bd23-42e04db0e296</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + <itime>1309117635818</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10247</id> + <version>0</version> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10248</id> + <version>0</version> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + <propertySimple> + <id>10930</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10929</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10932</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10931</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10050</id> + <uuid>ae880c2d-747d-492d-8586-a47ab5791b0e</uuid> + <resourceKey>${vhost1.rhq3.resource.key}</resourceKey> + <name>${vhost1.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + <itime>1309117635829</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10249</id> + <version>0</version> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10250</id> + <version>0</version> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + <propertySimple> + <id>10934</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10933</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10936</id> + <name>url</name> + <stringValue>http://${vhost1.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10935</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10201</id> + <version>0</version> + <ctime>1309116183368</ctime> + <mtime>1309116183368</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10211</id> + <version>0</version> + <ctime>1309117523737</ctime> + <mtime>1309117523737</mtime> + <propertySimple> + <id>10863</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10862</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10861</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10865</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10864</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10867</id> + <name>snmpAgentHost</name> + <stringValue>${unresolvable.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10866</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10869</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10868</id> + <name>url</name> + <stringValue>http://${servername}:${port1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10870</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10871</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10872</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10873</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10874</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10875</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10876</id> + <name>snmpAgentPort</name> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10877</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + <propertySimple> + <id>10878</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> commit f019479e86c88a7702fc61a6955f5449501b3818 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Tue Jun 28 17:05:38 2011 +0200 Added a batch of tests for RHQ 3.0.1. More to come.. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java new file mode 100644 index 0000000..5938889 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_1Test.java @@ -0,0 +1,360 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +import java.io.StringReader; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.testng.annotations.Parameters; +import org.testng.annotations.Test; + +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceError; +import org.rhq.core.domain.resource.ResourceErrorType; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.core.util.stream.StreamUtil; +import org.rhq.plugins.apache.parser.ApacheDirectiveTree; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; +import org.rhq.plugins.apache.util.RuntimeApacheConfiguration; +import org.rhq.plugins.apache.util.VirtualHostLegacyResourceKeyUtil; +import org.rhq.test.TokenReplacingReader; +import org.rhq.test.pc.PluginContainerSetup; + +/** + * + * + * @author Lukas Krejci + */ +public class UpgradeSimpleConfigurationFromRHQ3_0_1Test extends UpgradeTestBase { + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + defaultOverrides = new HashMap<String, String>(); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithUnresolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${listen3}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${listen4}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithNonUniqueNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + + /** + * The duplicate Main vhosts "condition" was triggered by: + * <ol> + * <li>Disabling SNMP by putting in an invalid hostname + * <li>Changing the URL of the apache server to some "other" value + * <li>Running discovery + * </ol> + * From that point on, 2 Main vhosts live in the inventory and the inventory has the "rest" + * of the resource keys coming from the SNMP based discovery. + * + * It is not possible to recover from such condition automatically during + * the resource upgrade, so the only thing we need to check here is that + * the two main vhosts are marked as failed upgrade and that the rest of the vhosts + * are not upgraded and have no upgrade errors attached. + * + * @param installDir + * @param exePath + * @throws Throwable + */ + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testDuplicateMainVhostsMarkedAsFailedUpgrade(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + + defaultOverrides = new HashMap<String, String>(); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); + + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(this.serverRoot, this.serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), 5, "Unexpected number of vhosts discovered found"); + + //let's check that the main vhost has a an upgrade error attached to it + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + String mainVhost1RK = keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey(); + String mainVhost2RK = interpret("${localhost.ip}:${listen1}", setup.getInventoryFileReplacements()); + Resource mainVhost1 = null; + Resource mainVhost2 = null; + for(Resource r : vhosts) { + if (mainVhost1RK.equals(r.getResourceKey())) { + mainVhost1 = r; + break; + } + } + for(Resource r : vhosts) { + if (mainVhost2RK.equals(r.getResourceKey())) { + mainVhost2 = r; + break; + } + } + + assertNotNull(mainVhost1, "Couldn't find the main vhost with the expected resource key '" + mainVhost1RK + "'."); + assertNotNull(mainVhost2, "Couldn't find the main vhost with the expected resource key '" + mainVhost2RK + "'."); + + List<ResourceError> errors = mainVhost1.getResourceErrors(ResourceErrorType.UPGRADE); + assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); + assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + + errors = mainVhost2.getResourceErrors(ResourceErrorType.UPGRADE); + assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); + assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + + //check that all other vhosts were not upgraded but have no errors + for(Resource r : vhosts) { + if (r.equals(mainVhost1) || r.equals(mainVhost2)) { + continue; + } + + assertEquals(r.getResourceErrors(ResourceErrorType.UPGRADE).size(), 0, "Unexpected number of resource upgrade errors on non-main vhost " + r); + } + } + }); + } + + private void beforeTestSetupWithSNMP(TestConfiguration testConfig, TestSetup setup) throws Exception { + setup.withApacheSetup().init(); + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + + DeploymentConfig deployConfig = setup.getDeploymentConfig(); + + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + Map<String, String> replacements = deployConfig.getTokenReplacements(); + + testConfig.defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey()); + + if (deployConfig.vhost1 != null) { + testConfig.defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec(replacements))); + } + + if (deployConfig.vhost2 != null) { + testConfig.defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec(replacements))); + } + + if (deployConfig.vhost3 != null) { + testConfig.defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec(replacements))); + } + + if (deployConfig.vhost4 != null) { + testConfig.defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec(replacements))); + } + + setup.withDefaultOverrides(testConfig.defaultOverrides); + } + + private void testWithSNMP(TestConfiguration testConfig, TestSetup setup) { + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); + + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfig.serverRoot, testConfig.serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), 4, "Unexpected number of vhosts discovered found"); + + //let's check that the main vhost has a an upgrade error attached to it + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + String mainVhostRK = keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey(); + + Resource mainVhost = null; + for(Resource r : vhosts) { + if (mainVhostRK.equals(r.getResourceKey())) { + mainVhost = r; + break; + } + } + + assertNotNull(mainVhost, "Couldn't find the main vhost with the expected resource key '" + mainVhostRK + "'."); + + List<ResourceError> errors = mainVhost.getResourceErrors(ResourceErrorType.UPGRADE); + assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); + assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + + //check that all other vhosts were not upgraded but have no errors + for(Resource r : vhosts) { + if (r.equals(mainVhost)) { + continue; + } + + assertEquals(r.getResourceErrors(ResourceErrorType.UPGRADE).size(), 0, "Unexpected number of resource upgrade errors on non-main vhost " + r); + } + } + + private String interpret(String string, Map<String, String> variables) { + return StreamUtil.slurp(new TokenReplacingReader(new StringReader(string), variables)); + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java index 9726250..59c1348 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java @@ -89,7 +89,8 @@ public class UpgradeTestBase extends PluginContainerTest { private ApacheSetup apacheSetup = new ApacheSetup(); private DeploymentConfig deploymentConfig; private Map<String, String> defaultOverrides = new HashMap<String, String>(); - + private Map<String, String> inventoryFileReplacements; + public class ApacheSetup { private String serverRoot; private String exePath; @@ -272,7 +273,8 @@ public class UpgradeTestBase extends PluginContainerTest { Map<String, String> replacements = deploymentConfig.getTokenReplacements(); replacements.put("server.root", apacheSetup.serverRoot); replacements.put("exe.path", apacheSetup.exePath); - replacements.put("localhost", determineLocalhost()); + + ApacheDeploymentUtil.addDefaultVariables(replacements, null); HttpdAddressUtility addressUtility = apacheSetup.getExecutionUtil().getServerComponent() .getAddressUtility(); @@ -339,6 +341,8 @@ public class UpgradeTestBase extends PluginContainerTest { //let the user override everything we just did replacements.putAll(defaultOverrides); + inventoryFileReplacements = replacements; + InputStream dataStream = getClass().getResourceAsStream(inventoryFile); Reader rdr = new TokenReplacingReader(new InputStreamReader(dataStream), replacements); @@ -355,6 +359,15 @@ public class UpgradeTestBase extends PluginContainerTest { return this; } + /** + * After the setup, this returns all the variables used to update the tokens in the inventory file. + * + * @return + */ + public Map<String, String> getInventoryFileReplacements() { + return inventoryFileReplacements; + } + private void fixupParent(Resource parent, Collection<Resource> children) { for (Resource child : children) { child.setParentResource(parent); @@ -363,14 +376,6 @@ public class UpgradeTestBase extends PluginContainerTest { } } } - - private String determineLocalhost() { - try { - return InetAddress.getLocalHost().getCanonicalHostName(); - } catch (UnknownHostException e) { - return "127.0.0.1"; - } - } } protected static class TestConfiguration { diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml index eb2f7c7..76269db 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml @@ -474,7 +474,7 @@ <propertySimple> <id>10868</id> <name>url</name> - <stringValue>http://${localhost}:${listen1}/</stringValue> + <stringValue>http://${servername}:${listen1}/</stringValue> </propertySimple> <propertySimple> <id>10870</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml new file mode 100644 index 0000000..999914d --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-duplicate-main.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${listen1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>100371</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac90</uuid> + <resourceKey>${localhost.ip}:${listen1}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost.ip}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml new file mode 100644 index 0000000..3d41813 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.1/simple/inventory-with-snmp.xml @@ -0,0 +1,462 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${listen1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> commit e1e0c171b991c623ba2a4eeb69d88b97690989aa Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Tue Jun 28 15:53:21 2011 +0200 Adding slurp(Reader) to StreamUtil to complete the set of methods using readers/writers. diff --git a/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java b/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java index 19f56ac..be0446b 100644 --- a/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java +++ b/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java @@ -34,6 +34,7 @@ import java.io.ObjectOutputStream; import java.io.OutputStream; import java.io.Reader; import java.io.Serializable; +import java.io.StringWriter; import java.io.Writer; import org.apache.commons.logging.Log; @@ -75,6 +76,19 @@ public class StreamUtil { } /** + * Equivalent of {@link #slurp(InputStream)} but using a reader instead of input stream. + * + * @param reader + * @return + * @throws RuntimeException + */ + public static String slurp(Reader reader) throws RuntimeException { + StringWriter wrt = new StringWriter(); + copy(reader, wrt); + return wrt.toString(); + } + + /** * Copies data from the input stream to the output stream. Upon completion or on an exception, the streams will be * closed. * commit 0b208d23a6f5d49f39bc916afc8ee2e57430d6e1 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jun 27 16:34:15 2011 +0200 Finish up the tests for RHQ 3.0.0 diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java index 5d4bb1d..8d0c03b 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java @@ -135,92 +135,183 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; upgradeShouldSucceed = false; + + defaultOverrides = new HashMap<String, String>(); } @Override public void beforeTestSetup(TestSetup testSetup) throws Throwable { - testSetup.withApacheSetup().init(); - ApacheServerComponent component = testSetup.withApacheSetup().getExecutionUtil().getServerComponent(); - ApacheDirectiveTree config = component.loadParser(); - config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + beforeTestSetupWithSNMP(this, testSetup); + } - DeploymentConfig deployConfig = testSetup.getDeploymentConfig(); - - VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); - - Map<String, String> replacements = deployConfig.getTokenReplacements(); + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithUnresolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; defaultOverrides = new HashMap<String, String>(); - defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey()); - - if (deployConfig.vhost1 != null) { - defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec(replacements))); - } - - if (deployConfig.vhost2 != null) { - defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec(replacements))); - } - - if (deployConfig.vhost3 != null) { - defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec(replacements))); - } - - if (deployConfig.vhost4 != null) { - defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec(replacements))); - } + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${listen3}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${listen4}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); + } + + /** + * Do our own tests here, because the generic test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + testWithSNMP(this, setup); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithNonUniqueNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; - testSetup.withDefaultOverrides(defaultOverrides); + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + beforeTestSetupWithSNMP(this, testSetup); } /** - * Do our own tests here, because the test method won't do much, since + * Do our own tests here, because the generic test method won't do much, since * we told it that the upgrade won't succeed. */ @Override public void beforeTests(TestSetup setup) throws Throwable { - //ok, now we should see the resources upgraded in the fake server inventory. - ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); - ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); - - Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + testWithSNMP(this, setup); + } + }); + } + + private void beforeTestSetupWithSNMP(TestConfiguration testConfig, TestSetup setup) throws Exception { + setup.withApacheSetup().init(); + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); - assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + DeploymentConfig deployConfig = setup.getDeploymentConfig(); + + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + Map<String, String> replacements = deployConfig.getTokenReplacements(); - Resource server = servers.iterator().next(); + testConfig.defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey()); - String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(this.serverRoot, this.serverRoot - + "/conf/httpd.conf"); + if (deployConfig.vhost1 != null) { + testConfig.defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec(replacements))); + } - assertEquals(server.getResourceKey(), expectedResourceKey, - "The server resource key doesn't seem to be upgraded."); + if (deployConfig.vhost2 != null) { + testConfig.defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec(replacements))); + } - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + if (deployConfig.vhost3 != null) { + testConfig.defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec(replacements))); + } - assertEquals(vhosts.size(), 4, "Unexpected number of vhosts discovered found"); + if (deployConfig.vhost4 != null) { + testConfig.defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec(replacements))); + } + + setup.withDefaultOverrides(testConfig.defaultOverrides); + } + + private void testWithSNMP(TestConfiguration testConfig, TestSetup setup) { + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); - //let's check that the main vhost has a an upgrade error attached to it - ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); - ApacheDirectiveTree config = component.loadParser(); - config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); - VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); - String mainVhostRK = keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey(); - - Resource mainVhost = null; - for(Resource r : vhosts) { - if (mainVhostRK.equals(r.getResourceKey())) { - mainVhost = r; - break; - } - } - - assertNotNull(mainVhost, "Couldn't find the main vhost with the expected resource key '" + mainVhostRK + "'."); - - List<ResourceError> errors = mainVhost.getResourceErrors(ResourceErrorType.UPGRADE); - assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); - assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfig.serverRoot, testConfig.serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), 4, "Unexpected number of vhosts discovered found"); + + //let's check that the main vhost has a an upgrade error attached to it + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + String mainVhostRK = keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey(); + + Resource mainVhost = null; + for(Resource r : vhosts) { + if (mainVhostRK.equals(r.getResourceKey())) { + mainVhost = r; + break; } - }); + } + + assertNotNull(mainVhost, "Couldn't find the main vhost with the expected resource key '" + mainVhostRK + "'."); + + List<ResourceError> errors = mainVhost.getResourceErrors(ResourceErrorType.UPGRADE); + assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); + assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + + //check that all other vhosts were not upgraded but have no errors + for(Resource r : vhosts) { + if (r.equals(mainVhost)) { + continue; + } + + assertEquals(r.getResourceErrors(ResourceErrorType.UPGRADE).size(), 0, "Unexpected number of resource upgrade errors on non-main vhost " + r); + } } - } commit 4aff7c7212efe091e96ae9e3ae0eeb11e9a06212 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jun 27 15:15:14 2011 +0200 Make it possible for the TokenReplacingReader to resolve references to other tokens in token values and used that capability to be able to parametrize nearly every value during the tests. Added copy() methods to the StreamUtil that can consume reader and writer instead of the streams to aid me in using the TokenReplacingReader. diff --git a/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java b/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java index e970b83..19f56ac 100644 --- a/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java +++ b/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java @@ -23,6 +23,8 @@ package org.rhq.core.util.stream; import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -30,7 +32,9 @@ import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.OutputStream; +import java.io.Reader; import java.io.Serializable; +import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -86,6 +90,19 @@ public class StreamUtil { } /** + * Equivalent of {@link #copy(InputStream, OutputStream)} but using reader and writer instead + * of streams. + * + * @param rdr + * @param wrt + * @return + * @throws RuntimeException + */ + public static long copy(Reader rdr, Writer wrt) throws RuntimeException { + return copy(rdr, wrt, true); + } + + /** * Copies data from the input stream to the output stream. Upon completion or on an exception, the streams will be * closed but only if <code>closeStreams</code> is <code>true</code>. If <code>closeStreams</code> is <code> * false</code>, the streams are left open; the caller has the reponsibility to close them. @@ -136,6 +153,47 @@ public class StreamUtil { } /** + * Equivalent of {@link #copy(InputStream, OutputStream, boolean)} only using reader and writer + * instead of input stream and output stream. + * + * @param rdr + * @param wrt + * @param closeStreams + * @return + * @throws RuntimeException + */ + public static long copy(Reader rdr, Writer wrt, boolean closeStreams) throws RuntimeException { + try { + long numCharsCopied = 0; + char[] buffer = new char[32768]; + + int cnt; + while((cnt = rdr.read(buffer)) != -1) { + numCharsCopied += cnt; + wrt.write(buffer, 0, cnt); + } + + return numCharsCopied; + } catch (IOException e) { + throw new RuntimeException("Reader could not have been copied to the writer.", e); + } finally { + if (closeStreams) { + try { + rdr.close(); + } catch (IOException ioe) { + LOG.warn("Reader could not be closed.", ioe); + } + + try { + wrt.close(); + } catch (IOException ioe) { + LOG.warn("Writer could not be closed.", ioe); + } + } + } + } + + /** * Copies data from the input stream to the output stream. The caller has the reponsibility to close them. This * method allows you to copy a byte range from the input stream. The start byte is the index (where the first byte * of the stream is index #0) that starts to be copied. <code>length</code> indicates how many bytes to copy, a diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java index 311033d..5d4bb1d 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java @@ -25,6 +25,7 @@ import static org.testng.Assert.assertNotNull; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Set; import org.testng.annotations.Parameters; @@ -67,6 +68,50 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase }); } + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithUnresolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}:${listen1}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}:${listen2}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}:${listen3}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}:${listen4}"); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithNonUniqueNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); + } + }); + } + /** * This tests the upgrade from RHQ 3.0.0 where the Apache server was discovered with the following: * @@ -103,23 +148,25 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + Map<String, String> replacements = deployConfig.getTokenReplacements(); + defaultOverrides = new HashMap<String, String>(); defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey()); if (deployConfig.vhost1 != null) { - defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec())); + defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec(replacements))); } if (deployConfig.vhost2 != null) { - defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec())); + defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec(replacements))); } if (deployConfig.vhost3 != null) { - defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec())); + defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec(replacements))); } if (deployConfig.vhost4 != null) { - defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec())); + defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec(replacements))); } testSetup.withDefaultOverrides(defaultOverrides); diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java index 38f349e..9726250 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java @@ -63,8 +63,10 @@ import org.rhq.core.system.SystemInfoFactory; import org.rhq.plugins.apache.parser.ApacheDirectiveTree; import org.rhq.plugins.apache.util.ApacheDeploymentUtil; import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig.VHost; import org.rhq.plugins.apache.util.ApacheExecutionUtil; import org.rhq.plugins.apache.util.HttpdAddressUtility; +import org.rhq.plugins.apache.util.VHostSpec; import org.rhq.test.ObjectCollectionSerializer; import org.rhq.test.TokenReplacingReader; import org.rhq.test.pc.PluginContainerTest; @@ -281,61 +283,57 @@ public class UpgradeTestBase extends PluginContainerTest { replacements.put("main.rhq4.resource.key", ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); - String vhost1Address = deploymentConfig.vhost1 == null ? null : deploymentConfig.vhost1.address1.toString( - false, false); - String vhost2Address = deploymentConfig.vhost2 == null ? null : deploymentConfig.vhost2.address1.toString( - false, false); - String vhost3Address = deploymentConfig.vhost3 == null ? null : deploymentConfig.vhost3.address1.toString( - false, false); - String vhost4Address = deploymentConfig.vhost4 == null ? null : deploymentConfig.vhost4.address1.toString( - false, false); - - if (vhost1Address != null) { + VHostSpec vhost1 = deploymentConfig.vhost1 == null ? null : deploymentConfig.vhost1.getVHostSpec(replacements); + VHostSpec vhost2 = deploymentConfig.vhost2 == null ? null : deploymentConfig.vhost2.getVHostSpec(replacements); + VHostSpec vhost3 = deploymentConfig.vhost3 == null ? null : deploymentConfig.vhost3.getVHostSpec(replacements); + VHostSpec vhost4 = deploymentConfig.vhost4 == null ? null : deploymentConfig.vhost4.getVHostSpec(replacements); + + if (vhost1 != null) { replacements.put( "vhost1.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost1Address, - deploymentConfig.vhost1.getServerName()).toString(false, false)); + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost1.hosts.get(0), + vhost1.serverName).toString(false, false)); replacements.put( "vhost1.rhq4.resource.key", ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - deploymentConfig.vhost1.getServerName(), deploymentConfig.vhost1.getAddresses())); + vhost1.serverName, vhost1.hosts)); } - if (vhost2Address != null) { + if (vhost2 != null) { replacements.put( "vhost2.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost2Address, - deploymentConfig.vhost2.getServerName()).toString(false, false)); + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost2.hosts.get(0), + vhost2.serverName).toString(false, false)); replacements.put( "vhost2.rhq4.resource.key", ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - deploymentConfig.vhost2.getServerName(), deploymentConfig.vhost2.getAddresses())); + vhost2.serverName, vhost2.hosts)); } - if (vhost3Address != null) { + if (vhost3 != null) { replacements.put( "vhost3.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost3Address, - deploymentConfig.vhost3.getServerName()).toString(false, false)); + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost3.hosts.get(0), + vhost3.serverName).toString(false, false)); replacements.put( "vhost3.rhq4.resource.key", ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - deploymentConfig.vhost3.getServerName(), deploymentConfig.vhost3.getAddresses())); + vhost3.serverName, vhost3.hosts)); } - if (vhost4Address != null) { + if (vhost4 != null) { replacements.put( "vhost4.snmp.identifier", - addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost4Address, - deploymentConfig.vhost4.getServerName()).toString(false, false)); + addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost4.hosts.get(0), + vhost4.serverName).toString(false, false)); replacements.put( "vhost4.rhq4.resource.key", ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - deploymentConfig.vhost4.getServerName(), deploymentConfig.vhost4.getAddresses())); + vhost4.serverName, vhost4.hosts)); } //let the user override everything we just did @@ -474,16 +472,22 @@ public class UpgradeTestBase extends PluginContainerTest { List<String> expectedResourceKeys = new ArrayList<String>(5); DeploymentConfig dc = setup.getDeploymentConfig(); - + Map<String, String> replacements = dc.getTokenReplacements(); + + VHostSpec vh1 = dc.vhost1.getVHostSpec(replacements); + VHostSpec vh2 = dc.vhost2.getVHostSpec(replacements); + VHostSpec vh3 = dc.vhost3.getVHostSpec(replacements); + VHostSpec vh4 = dc.vhost4.getVHostSpec(replacements); + expectedResourceKeys.add(ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost1.getServerName(), dc.vhost1.getAddresses())); + vh1.serverName, vh1.hosts)); expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost2.getServerName(), dc.vhost2.getAddresses())); + vh2.serverName, vh2.hosts)); expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost3.getServerName(), dc.vhost3.getAddresses())); + vh3.serverName, vh3.hosts)); expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost4.getServerName(), dc.vhost4.getAddresses())); + vh4.serverName, vh4.hosts)); for (Resource vhost : vhosts) { assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java index be73319..232741f 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java @@ -19,23 +19,29 @@ package org.rhq.plugins.apache.util; +import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; +import java.io.StringReader; +import java.io.StringWriter; import java.net.InetAddress; import java.net.URL; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.Iterator; import java.util.List; +import java.util.ListIterator; import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.unitils.thirdparty.org.apache.commons.io.FileUtils; +import org.rhq.core.util.stream.StreamUtil; import org.rhq.plugins.apache.util.HttpdAddressUtility.Address; import org.rhq.test.TokenReplacingProperties; import org.rhq.test.TokenReplacingReader; @@ -76,7 +82,7 @@ public class ApacheDeploymentUtil { public String serverNameDirective = null; public final List<String> additionalDirectives = new ArrayList<String>(); - public String getServerName() { + private String getServerName() { String serverName = null; if (serverNameDirective != null && serverNameDirective.startsWith("ServerName")) { int startIdx = serverNameDirective.indexOf(' '); @@ -93,14 +99,21 @@ public class ApacheDeploymentUtil { return serverName; } - public VHostSpec getVHostSpec() { + private String getServerName(Map<String, String> replacements) { + TokenReplacingReader rdr = new TokenReplacingReader(new StringReader(getServerName()), replacements); + StringWriter wrt = new StringWriter(); + StreamUtil.copy(rdr, wrt); + return wrt.toString(); + } + + public VHostSpec getVHostSpec(Map<String, String> replacements) { VHostSpec ret = new VHostSpec(); - ret.serverName = getServerName(); - ret.hosts = getAddresses(); + ret.serverName = getServerName(replacements); + ret.hosts = getAddresses(replacements); return ret; } - public List<String> getAddresses() { + private List<String> getAddresses() { ArrayList<String> ret = new ArrayList<String>(); if (address1 != null) { ret.add(address1.toString()); @@ -118,6 +131,21 @@ public class ApacheDeploymentUtil { return ret; } + public List<String> getAddresses(Map<String, String> replacements) { + List<String> addresses = getAddresses(); + ListIterator<String> it = addresses.listIterator(); + while(it.hasNext()) { + String addr = it.next(); + + TokenReplacingReader rdr = new TokenReplacingReader(new StringReader(addr), replacements); + StringWriter wrt = new StringWriter(); + StreamUtil.copy(rdr, wrt); + it.set(wrt.toString()); + } + + return addresses; + } + private void addToTokenReplacements(int ordinal, Map<String, String> tokenReplacements) { String prefix = null; @@ -184,7 +212,7 @@ public class ApacheDeploymentUtil { } public Map<String, String> getTokenReplacements() { - HashMap<String, String> ret = new HashMap<String, String>(); + Map<String, String> ret = new TokenReplacingProperties(new HashMap<String, String>()); ret.put(SERVER_ROOT, serverRoot == null ? "" : serverRoot); ret.put(DOCUMENT_ROOT, documentRoot == null ? "" : documentRoot); diff --git a/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingProperties.java b/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingProperties.java index 0b9e87d..5708ee3 100644 --- a/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingProperties.java +++ b/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingProperties.java @@ -22,10 +22,8 @@ package org.rhq.test; import java.io.IOException; import java.io.Reader; import java.io.StringReader; -import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Collection; -import java.util.Deque; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -65,7 +63,6 @@ public class TokenReplacingProperties extends HashMap<String, String> { private static final long serialVersionUID = 1L; private Map<String, String> wrapped; - private Deque<String> currentResolutionStack = new ArrayDeque<String>(); private Map<Object, String> resolved = new HashMap<Object, String>(); private class Entry implements Map.Entry<String, String> { @@ -146,22 +143,14 @@ public class TokenReplacingProperties extends HashMap<String, String> { return resolved.get(key); } - if (currentResolutionStack.contains(key)) { - throw new IllegalArgumentException("Property '" + key + "' indirectly references itself in its value."); - } - String rawValue = getRaw(key); if (rawValue == null) { return null; } - currentResolutionStack.push(key.toString()); - String ret = readAll(new TokenReplacingReader(new StringReader(rawValue.toString()), this)); - currentResolutionStack.pop(); - resolved.put(key, ret); return ret; diff --git a/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java b/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java index 35ba2d2..bc5aef6 100644 --- a/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java +++ b/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java @@ -22,7 +22,11 @@ package org.rhq.test; import java.io.IOException; import java.io.PushbackReader; import java.io.Reader; +import java.io.StringReader; import java.nio.CharBuffer; +import java.util.ArrayDeque; +import java.util.Deque; +import java.util.HashMap; import java.util.Map; /** @@ -39,12 +43,23 @@ public class TokenReplacingReader extends Reader { private String tokenValue = null; private int tokenValueIndex = 0; private boolean escaping = false; + private Deque<String> activeTokens; + private Map<String, String> resolvedTokens; public TokenReplacingReader(Reader source, Map<String, String> tokens) { this.pushbackReader = new PushbackReader(source, 2); this.tokens = tokens; + this.activeTokens = new ArrayDeque<String>(); + this.resolvedTokens = new HashMap<String, String>(); } + protected TokenReplacingReader(String source, Map<String, String> tokens, Deque<String> activeTokens, Map<String, String> resolvedTokens) { + pushbackReader = new PushbackReader(new StringReader(source)); + this.tokens = tokens; + this.activeTokens = activeTokens; + this.resolvedTokens = resolvedTokens; + } + public int read(CharBuffer target) throws IOException { throw new RuntimeException("Operation Not Supported"); } @@ -88,12 +103,16 @@ public class TokenReplacingReader extends Reader { data = this.pushbackReader.read(); } - this.tokenValue = tokens.get(this.tokenNameBuffer.toString()); - - if (this.tokenValue == null) { - this.tokenValue = "${" + this.tokenNameBuffer.toString() + "}"; + String tokenName = tokenNameBuffer.toString(); + + if (resolvedTokens.containsKey(tokenName)) { + tokenValue = resolvedTokens.get(tokenName); + } else { + tokenValue = resolveToken(tokenName); } + tokenValueIndex = 0; + if (!this.tokenValue.isEmpty()) { return this.tokenValue.charAt(this.tokenValueIndex++); } else { @@ -143,4 +162,40 @@ public class TokenReplacingReader extends Reader { public void reset() throws IOException { throw new IOException("reset() not supported on TokenReplacingReader."); } + + private String readAll(Reader r) throws IOException { + int c; + StringBuilder bld = new StringBuilder(); + while((c = r.read()) >= 0) { + bld.append((char)c); + } + + return bld.toString(); + } + + private String resolveToken(String tokenName) throws IOException { + if (activeTokens.contains(tokenName)) { + throw new IllegalArgumentException("Token '" + tokenName + "' (indirectly) contains reference to itself in its value."); + } + + activeTokens.push(tokenName); + + String tokenValue = tokens.get(tokenName); + + if (tokenValue != null) { + if (tokenValue.contains("${")) { + TokenReplacingReader childReader = new TokenReplacingReader(tokenValue, tokens, activeTokens, resolvedTokens); + + tokenValue = readAll(childReader); + } + } else { + tokenValue = "${" + tokenName + "}"; + } + + resolvedTokens.put(tokenName, tokenValue); + + activeTokens.pop(); + + return tokenValue; + } } commit ced0cf7f6b8f8d56d3eaf0c5150a8189f051d474 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Mon Jun 27 11:51:22 2011 +0200 added some docs on what each of the RHQ 3.0.0 test tests, small correction in the inventory file. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java index 38fc049..311033d 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java @@ -47,10 +47,11 @@ import org.rhq.test.pc.PluginContainerSetup; */ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase { - //TODO override the *.rhq3.resource.key variables in each test to define whether - //the resource key was discovered without SNMP, with SNMP, with Main Server URL set, - //or not - + /** + * This tests the upgrade from RHQ 3.0.0 where the apache server was discovered without SNMP support. + * The Main Server URL must have been set in this case, otherwise the component would fail to start + * and therefore the vhost discovery wouldn't even take place. + */ @Test @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) @Parameters({"apache2.install.dir", "apache2.exe.path"}) @@ -65,7 +66,18 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase } }); } - + + /** + * This tests the upgrade from RHQ 3.0.0 where the Apache server was discovered with the following: + * + * <ol> + * <li> SNMP enabled + * <li> Main URL set or unset (it doesn't make a difference here) + * </ol> + * @param installDir + * @param exePath + * @throws Throwable + */ @Test @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) @Parameters({"apache2.install.dir", "apache2.exe.path"}) diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml index 5961b3e..eb2f7c7 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml @@ -9,7 +9,7 @@ <id>10041</id> <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> <resourceKey>${server.root}</resourceKey> - <name>${localhost}:{listen1}</name> + <name>${localhost}:${listen1}</name> <inventoryStatus>COMMITTED</inventoryStatus> <connected>true</connected> <version>2.2.17</version> commit daf1e1a4fbf2b8781258969291207dffa9d470da Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Sun Jun 26 23:23:55 2011 +0200 actually figured out how RHQ 3.0.0 discovered vhosts without SNMP support and added tests for it. Some minor fixes in the RHQ 3.0.0 with SNMP test. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java index 386a871..38fc049 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java @@ -51,68 +51,29 @@ public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase //the resource key was discovered without SNMP, with SNMP, with Main Server URL set, //or not - //TODO the default inventory.xml uses discovery results without snmp active. with SNMP active, all 5 vhost - //would discovered in RHQ 3. This test should therefore use a different inventory file. - @Test(enabled = false) //this fails until the above todo is implemented + @Test @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory.xml"; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml"; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; } - - @Override - public void beforeTestSetup(TestSetup testSetup) throws Throwable { - testSetup.withApacheSetup().init(); - ApacheServerComponent component = testSetup.withApacheSetup().getExecutionUtil().getServerComponent(); - ApacheDirectiveTree config = component.loadParser(); - config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); - - DeploymentConfig deployConfig = testSetup.getDeploymentConfig(); - - VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); - - defaultOverrides = new HashMap<String, String>(); - defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey())); - - if (deployConfig.vhost1 != null) { - String rhq3Key = keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec()); - defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(rhq3Key)); - } - - if (deployConfig.vhost2 != null) { - String rhq3Key = keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec()); - defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(rhq3Key)); - } - - if (deployConfig.vhost3 != null) { - String rhq3Key = keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec()); - defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(rhq3Key)); - } - - if (deployConfig.vhost4 != null) { - String rhq3Key = keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec()); - defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(rhq3Key)); - } - - testSetup.withDefaultOverrides(defaultOverrides); - } }); } @Test @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) @Parameters({"apache2.install.dir", "apache2.exe.path"}) - public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { testUpgrade(new TestConfiguration() { { apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; - inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory.xml"; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml"; serverRoot = installDir; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java index 96260a6..38f349e 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java @@ -279,6 +279,8 @@ public class UpgradeTestBase extends PluginContainerTest { replacements.put("snmp.identifier", addressUtility.getHttpdInternalMainServerAddressRepresentation(runtimeConfig).toString(false, false)); + replacements.put("main.rhq4.resource.key", ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); + String vhost1Address = deploymentConfig.vhost1 == null ? null : deploymentConfig.vhost1.address1.toString( false, false); String vhost2Address = deploymentConfig.vhost2 == null ? null : deploymentConfig.vhost2.address1.toString( @@ -293,6 +295,11 @@ public class UpgradeTestBase extends PluginContainerTest { "vhost1.snmp.identifier", addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost1Address, deploymentConfig.vhost1.getServerName()).toString(false, false)); + + replacements.put( + "vhost1.rhq4.resource.key", + ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + deploymentConfig.vhost1.getServerName(), deploymentConfig.vhost1.getAddresses())); } if (vhost2Address != null) { @@ -300,6 +307,11 @@ public class UpgradeTestBase extends PluginContainerTest { "vhost2.snmp.identifier", addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost2Address, deploymentConfig.vhost2.getServerName()).toString(false, false)); + + replacements.put( + "vhost2.rhq4.resource.key", + ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + deploymentConfig.vhost2.getServerName(), deploymentConfig.vhost2.getAddresses())); } if (vhost3Address != null) { @@ -307,6 +319,11 @@ public class UpgradeTestBase extends PluginContainerTest { "vhost3.snmp.identifier", addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost3Address, deploymentConfig.vhost3.getServerName()).toString(false, false)); + + replacements.put( + "vhost3.rhq4.resource.key", + ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + deploymentConfig.vhost3.getServerName(), deploymentConfig.vhost3.getAddresses())); } if (vhost4Address != null) { @@ -314,6 +331,11 @@ public class UpgradeTestBase extends PluginContainerTest { "vhost4.snmp.identifier", addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost4Address, deploymentConfig.vhost4.getServerName()).toString(false, false)); + + replacements.put( + "vhost4.rhq4.resource.key", + ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + deploymentConfig.vhost4.getServerName(), deploymentConfig.vhost4.getAddresses())); } //let the user override everything we just did diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml new file mode 100644 index 0000000..3d41813 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-with-snmp.xml @@ -0,0 +1,462 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${listen1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>${vhost2.rhq3.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${localhost}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml new file mode 100644 index 0000000..5961b3e --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory-without-snmp.xml @@ -0,0 +1,538 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10041</id> + <uuid>02f44194-9bb8-44ef-9866-ef7b69eedc0a</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:{listen1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>true</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1309116183350</ctime> + <mtime>1309116225316</mtime> + <itime>1309116225316</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10046</id> + <uuid>908ea047-889e-4978-a61f-d96e8b1c6d17</uuid> + <resourceKey>${vhost4.rhq4.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + <itime>1309117635788</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10241</id> + <version>0</version> + <ctime>1309117635789</ctime> + <mtime>1309117635789</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10242</id> + <version>0</version> + <ctime>1309117635790</ctime> + <mtime>1309117635790</mtime> + <propertySimple> + <id>10858</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10857</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10860</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10859</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10047</id> + <uuid>5fccc52b-8003-42ed-aa69-0b146c783e91</uuid> + <resourceKey>${vhost3.rhq4.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + <itime>1309117635802</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10243</id> + <version>0</version> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10244</id> + <version>0</version> + <ctime>1309117635802</ctime> + <mtime>1309117635802</mtime> + <propertySimple> + <id>10922</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10921</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10924</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10923</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10048</id> + <uuid>704a31f3-7f5f-46c1-9bda-70f2645c9604</uuid> + <resourceKey>${main.rhq4.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635810</ctime> + <mtime>1309117635810</mtime> + <itime>1309117635810</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10245</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10246</id> + <version>0</version> + <ctime>1309117635811</ctime> + <mtime>1309117635811</mtime> + <propertySimple> + <id>10926</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10925</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10928</id> + <name>url</name> + <stringValue>http://${localhost}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10927</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10049</id> + <uuid>03638606-623b-4218-bd23-42e04db0e296</uuid> + <resourceKey>${vhost2.rhq4.resource.key}</resourceKey> + <name>${vhost2.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + <itime>1309117635818</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10247</id> + <version>0</version> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10248</id> + <version>0</version> + <ctime>1309117635819</ctime> + <mtime>1309117635819</mtime> + <propertySimple> + <id>10930</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10929</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10932</id> + <name>url</name> + <stringValue>http://${vhost2.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10931</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10050</id> + <uuid>ae880c2d-747d-492d-8586-a47ab5791b0e</uuid> + <resourceKey>${vhost1.rhq4.resource.key}</resourceKey> + <name>${vhos1.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + <itime>1309117635829</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10249</id> + <version>0</version> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10250</id> + <version>0</version> + <ctime>1309117635829</ctime> + <mtime>1309117635829</mtime> + <propertySimple> + <id>10934</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10933</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10936</id> + <name>url</name> + <stringValue>http://${vhost1.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10935</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10201</id> + <version>0</version> + <ctime>1309116183368</ctime> + <mtime>1309116183368</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10211</id> + <version>0</version> + <ctime>1309117523737</ctime> + <mtime>1309117523737</mtime> + <propertySimple> + <id>10863</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10862</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10861</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10865</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10864</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10867</id> + <name>snmpAgentHost</name> + <stringValue>${unresolvable.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10866</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10869</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10868</id> + <name>url</name> + <stringValue>http://${localhost}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10870</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10871</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10872</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10873</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10874</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10875</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10876</id> + <name>snmpAgentPort</name> + <stringValue>1610</stringValue> + </propertySimple> + <propertySimple> + <id>10877</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + <propertySimple> + <id>10878</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory.xml deleted file mode 100644 index be89240..0000000 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory.xml +++ /dev/null @@ -1,462 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<inventory-dump> -<classes-used> -<class>org.rhq.core.domain.resource.Resource</class> -</classes-used> -<objects> - -<resource> - <id>10022</id> - <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> - <resourceKey>${server.root}</resourceKey> - <name>${localhost}:${listen1}</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version>2.2.17</version> - <description>Apache Web Server</description> - <ctime>1308835177519</ctime> - <mtime>1308835282077</mtime> - <itime>1308835282077</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVER</category> - <createDeletePolicy>NEITHER</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <description>an Apache HTTP Server instance</description> - <id>10044</id> - <name>Apache HTTP Server</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10101</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <resourceConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10102</id> - <propertyDefinitions/> - </resourceConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>true</supportsManualAdd> - </resourceType> - <childResources> - <id>10036</id> - <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> - <resourceKey>localhost.localdomain:11676</resourceKey> - <name>localhost.localdomain:11676</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description></description> - <ctime>1308835287457</ctime> - <mtime>1308835287457</mtime> - <itime>1308835287457</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>BOTH</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10046</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10112</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <resourceConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10113</id> - <propertyDefinitions/> - </resourceConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10186</id> - <version>0</version> - <ctime>1308835287457</ctime> - <mtime>1308835287457</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10187</id> - <version>0</version> - <ctime>1308835287458</ctime> - <mtime>1308835287458</mtime> - <propertySimple> - <id>10802</id> - <name>responseTimeUrlExcludes</name> - </propertySimple> - <propertySimple> - <id>10801</id> - <name>responseTimeLogFile</name> - <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10804</id> - <name>url</name> - <stringValue>http://localhost.localdomain:11676/</stringValue> - </propertySimple> - <propertySimple> - <id>10803</id> - <name>responseTimeUrlTransforms</name> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - </childResources> - <childResources> - <id>10037</id> - <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> - <resourceKey>${main.rhq3.resource.key}</resourceKey> - <name>Main</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description></description> - <ctime>1308835287473</ctime> - <mtime>1308835287473</mtime> - <itime>1308835287473</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>BOTH</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10046</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10112</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <resourceConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10113</id> - <propertyDefinitions/> - </resourceConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10188</id> - <version>0</version> - <ctime>1308835287473</ctime> - <mtime>1308835287473</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10189</id> - <version>0</version> - <ctime>1308835287474</ctime> - <mtime>1308835287474</mtime> - <propertySimple> - <id>10806</id> - <name>responseTimeUrlExcludes</name> - </propertySimple> - <propertySimple> - <id>10805</id> - <name>responseTimeLogFile</name> - <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10808</id> - <name>url</name> - <stringValue>http://${snmp.identifier}/</stringValue> - </propertySimple> - <propertySimple> - <id>10807</id> - <name>responseTimeUrlTransforms</name> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - </childResources> - <childResources> - <id>10038</id> - <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> - <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> - <name>${vhost4.snmp.identifier}</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description></description> - <ctime>1308835287482</ctime> - <mtime>1308835287482</mtime> - <itime>1308835287481</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>BOTH</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10046</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10112</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <resourceConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10113</id> - <propertyDefinitions/> - </resourceConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10190</id> - <version>0</version> - <ctime>1308835287482</ctime> - <mtime>1308835287482</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10191</id> - <version>0</version> - <ctime>1308835287482</ctime> - <mtime>1308835287482</mtime> - <propertySimple> - <id>10810</id> - <name>responseTimeUrlExcludes</name> - </propertySimple> - <propertySimple> - <id>10809</id> - <name>responseTimeLogFile</name> - <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10812</id> - <name>url</name> - <stringValue>http://${vhost4.snmp.identifier}/</stringValue> - </propertySimple> - <propertySimple> - <id>10811</id> - <name>responseTimeUrlTransforms</name> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - </childResources> - <childResources> - <id>10039</id> - <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> - <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> - <name>${vhost3.snmp.identifier}</name> - <inventoryStatus>COMMITTED</inventoryStatus> - <connected>false</connected> - <version></version> - <description></description> - <ctime>1308835287493</ctime> - <mtime>1308835287493</mtime> - <itime>1308835287492</itime> - <modifiedBy> - <factive>false</factive> - <fsystem>false</fsystem> - <id>1</id> - </modifiedBy> - <resourceType> - <category>SERVICE</category> - <createDeletePolicy>BOTH</createDeletePolicy> - <creationDataType>CONFIGURATION</creationDataType> - <id>10046</id> - <name>Apache Virtual Host</name> - <plugin>Apache</plugin> - <pluginConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10112</id> - <propertyDefinitions/> - </pluginConfigurationDefinition> - <resourceConfigurationDefinition> - <configurationFormat>STRUCTURED</configurationFormat> - <id>10113</id> - <propertyDefinitions/> - </resourceConfigurationDefinition> - <singleton>false</singleton> - <supportsManualAdd>false</supportsManualAdd> - </resourceType> - <resourceConfiguration> - <id>10192</id> - <version>0</version> - <ctime>1308835287493</ctime> - <mtime>1308835287493</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10193</id> - <version>0</version> - <ctime>1308835287494</ctime> - <mtime>1308835287494</mtime> - <propertySimple> - <id>10814</id> - <name>responseTimeUrlExcludes</name> - </propertySimple> - <propertySimple> - <id>10813</id> - <name>responseTimeLogFile</name> - <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> - </propertySimple> - <propertySimple> - <id>10816</id> - <name>url</name> - <stringValue>http://${vhost3.snmp.identifier}/</stringValue> - </propertySimple> - <propertySimple> - <id>10815</id> - <name>responseTimeUrlTransforms</name> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - </childResources> - <resourceConfiguration> - <id>10174</id> - <version>0</version> - <ctime>1308835177520</ctime> - <mtime>1308835177520</mtime> - </resourceConfiguration> - <pluginConfiguration> - <id>10175</id> - <version>0</version> - <ctime>1308835177520</ctime> - <mtime>1308835177520</mtime> - <propertySimple> - <id>10790</id> - <name>errorLogIncludesPattern</name> - </propertySimple> - <propertySimple> - <id>10783</id> - <name>errorLogMinimumSeverity</name> - <stringValue>error</stringValue> - </propertySimple> - <propertySimple> - <id>10708</id> - <name>augeasEnabled</name> - <stringValue>no</stringValue> - </propertySimple> - <propertySimple> - <id>10789</id> - <name>errorLogFilePath</name> - </propertySimple> - <propertySimple> - <id>10786</id> - <name>snmpAgentCommunity</name> - <stringValue>public</stringValue> - </propertySimple> - <propertySimple> - <id>10784</id> - <name>snmpAgentHost</name> - <stringValue>${snmp.host}</stringValue> - </propertySimple> - <propertySimple> - <id>10782</id> - <name>errorLogEventsEnabled</name> - <stringValue>false</stringValue> - </propertySimple> - <propertySimple> - <id>10793</id> - <name>controlScriptPath</name> - </propertySimple> - <propertySimple> - <id>10795</id> - <name>url</name> - <stringValue>http://${localhost}:${listen1}/</stringValue> - </propertySimple> - <propertySimple> - <id>10709</id> - <name>augeasModuleName</name> - <stringValue>Httpd</stringValue> - </propertySimple> - <propertySimple> - <id>10794</id> - <name>configFile</name> - <stringValue>${server.root}/conf/httpd.conf</stringValue> - </propertySimple> - <propertySimple> - <id>10710</id> - <name>configurationFilesInclusionPatterns</name> - <stringValue>${server.root}/conf/httpd.conf</stringValue> - </propertySimple> - <propertySimple> - <id>10788</id> - <name>vhostFilesMask</name> - <stringValue>${server.root}/conf/*</stringValue> - </propertySimple> - <propertySimple> - <id>10787</id> - <name>restartAfterConfigurationUpdate</name> - <stringValue>true</stringValue> - </propertySimple> - <propertySimple> - <id>10792</id> - <name>executablePath</name> - <stringValue>${exe.path}</stringValue> - </propertySimple> - <propertySimple> - <id>10785</id> - <name>snmpAgentPort</name> - <stringValue>${snmp.port}</stringValue> - </propertySimple> - <propertySimple> - <id>10781</id> - <name>vhostCreationPolicy</name> - <stringValue>vhost-per-file</stringValue> - </propertySimple> - <propertySimple> - <id>10791</id> - <name>serverRoot</name> - <stringValue>${server.root}</stringValue> - </propertySimple> - </pluginConfiguration> - <agent> - <backFilled>false</backFilled> - <id>10001</id> - <port>0</port> - </agent> - <currentAvailability> - <availabilityType>UP</availabilityType> - </currentAvailability> - <productVersion> - <id>10004</id> - </productVersion> -</resource> -</objects> -</inventory-dump> commit 968b9a1aba058c407e14af1b17063f33677addd9 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri Jun 24 17:59:32 2011 +0200 Basic set of tests for upgrade from RHQ 3.0.0 codebase using the simple apache configuration. diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VHostSpec.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VHostSpec.java index 0e269ee..62940c2 100644 --- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VHostSpec.java +++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VHostSpec.java @@ -42,6 +42,10 @@ public class VHostSpec { return ret; } + public VHostSpec() { + + } + public VHostSpec(ApacheDirective vhostDirective) { hosts = new ArrayList<String>(vhostDirective.getValues()); diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VirtualHostLegacyResourceKeyUtil.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VirtualHostLegacyResourceKeyUtil.java index c1f98aa..3f6a15c 100644 --- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VirtualHostLegacyResourceKeyUtil.java +++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/VirtualHostLegacyResourceKeyUtil.java @@ -71,6 +71,37 @@ public class VirtualHostLegacyResourceKeyUtil { * @return possible resource keys of the main server. */ public Set<String> getLegacyMainServerResourceKeys() { + Set<String> ret = new HashSet<String>(); + + String key = getRHQ3NonSNMPLegacyMainServerResourceKey(); + + ret.add(key); + + String snmpKey = getRHQ3SNMPLikeResourceKey(key); + + if (snmpKey != null) { + ret.add(snmpKey); + } + + ret.add(addressUtility.getHttpdInternalMainServerAddressRepresentation(runtimeConfig).toString(false, false)); + + return ret; + } + + /** + * A resource key for the main vhost that would be returned by the RHQ 3 codebase + * if SNMP wasn't enabled during discovery. + * + * Note that this can return 2 different values depending on whether the URL property + * in the parent apache server's plugin configuration is set or not. + * + * Because the resource key is dependent on a value manually entered by the user (albeit + * autodetected during discovery), no attempt is made to guess what values that property + * could have had. Only the current value is used. + * + * @return + */ + public String getRHQ3NonSNMPLegacyMainServerResourceKey() { String mainServerUrl = serverComponent.getServerUrl(); String key = null; @@ -92,32 +123,45 @@ public class VirtualHostLegacyResourceKeyUtil { key = ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY; } + return key; + } + + /** + * Returns a list of possible resource keys that the RHQ 3 code could generate for the specified + * vhost. + * + * As with {@link #getLegacyMainServerResourceKeys()} the resulting set will contain all the various + * resource keys that could have been found by past versions of the plugin. + * + * @param vhost + * @return the possible vhosts + */ + public Set<String> getLegacyVirtualHostResourceKeys(VHostSpec vhost) { + String key = getRHQ3NonSNMPLegacyVirtualHostResourceKey(vhost); + Set<String> ret = new HashSet<String>(); ret.add(key); - String snmpKey = getSNMPResourceKey(key); - + String snmpKey = getRHQ3SNMPLikeResourceKey(key); if (snmpKey != null) { ret.add(snmpKey); } - ret.add(addressUtility.getHttpdInternalMainServerAddressRepresentation(runtimeConfig).toString(false, false)); + String snmpKeyFromRhq1 = addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost.hosts.get(0), vhost.serverName).toString(false, false); + ret.add(snmpKeyFromRhq1); return ret; } /** - * Returns a list of possible resource keys that the RHQ 3 code could generate for the specified - * vhost. - * - * As with {@link #getLegacyMainServerResourceKeys()} the resulting set will contain all the various - * resource keys that could have been found by past versions of the plugin. + * A resource key for given vhost that would be returned by RHQ 3 if SNMP wasn't enabled during + * discovery. * * @param vhost - * @return the possible vhosts + * @return */ - public Set<String> getLegacyVirtualHostResourceKeys(VHostSpec vhost) { + public String getRHQ3NonSNMPLegacyVirtualHostResourceKey(VHostSpec vhost) { String host = vhost.hosts.get(0); HttpdAddressUtility.Address hostAddr = HttpdAddressUtility.Address.parse(host); if (vhost.serverName != null) { @@ -132,24 +176,18 @@ public class VirtualHostLegacyResourceKeyUtil { } catch (UnknownHostException e) { } - String key = hostAddr.host + ":" + hostAddr.port; - - Set<String> ret = new HashSet<String>(); - - ret.add(key); - - String snmpKey = getSNMPResourceKey(key); - if (snmpKey != null) { - ret.add(snmpKey); - } - - String snmpKeyFromRhq1 = addressUtility.getHttpdInternalVirtualHostAddressRepresentation(runtimeConfig, vhost.hosts.get(0), vhost.serverName).toString(false, false); - ret.add(snmpKeyFromRhq1); - - return ret; + return hostAddr.host + ":" + hostAddr.port; } - private String getSNMPResourceKey(String nonSnmpResourceKey) { + /** + * Returns an "SNMP" resource key that would have been resolved out of the non-snmp resource key + * by the RHQ 3 code-base. Note that the returned key actually isn't what SNMP module would + * actually return. + * + * @param nonSnmpResourceKey + * @return + */ + public String getRHQ3SNMPLikeResourceKey(String nonSnmpResourceKey) { int idx = getMatchingWwwServiceIndex(nonSnmpResourceKey); if (idx < 0) { diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java index 13a9c4a..135c2aa 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java @@ -19,25 +19,15 @@ package org.rhq.plugins.apache; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - -import java.util.ArrayList; import java.util.Comparator; import java.util.HashMap; -import java.util.List; -import java.util.Map; import java.util.Set; import java.util.TreeSet; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.testng.annotations.Parameters; import org.testng.annotations.Test; import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; import org.rhq.test.pc.PluginContainerSetup; /** @@ -47,44 +37,7 @@ import org.rhq.test.pc.PluginContainerSetup; */ @Test(groups = "apache-integration-tests") public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { - private static final Log LOG = LogFactory.getLog(UpgradeSimpleConfigurationFromRHQ1_3Test.class); - - private enum Apache { - V_1_3_x { - public String getConfigDirName() { - return "1.3.x"; - } - }, - - V_2_2_x { - public String getConfigDirName() { - return "2.2.x"; - } - }; - public abstract String getConfigDirName(); - } - - private static class TestConfiguration { - public Apache version; - public String configurationName; - public String serverRoot; - public String binPath; - public Map<String, String> defaultOverrides; - - public void beforeTestSetup(TestSetup testSetup) { - - } - - public void beforePluginContainerStart(TestSetup setup) { - - } - - public void beforeTests() { - - } - } - @Test @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) @Parameters({ "apache2.install.dir", "apache2.exe.path" }) @@ -96,7 +49,8 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { serverRoot = installPath; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - version = Apache.V_2_2_x; + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; } }); } @@ -112,7 +66,8 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { serverRoot = installPath; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - version = Apache.V_1_3_x; + apacheConfigurationFiles = new String[] { "/full-configurations/1.3.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; }}); } @@ -123,9 +78,11 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { testUpgrade(new TestConfiguration() { { configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; + apacheConfigurationFiles = new String[] { "/full-configurations/2.2.x/simple/httpd.conf" }; + inventoryFile = "/mocked-inventories/rhq-1.3.x/simple/inventory.xml"; serverRoot = installPath; binPath = exePath; - version = Apache.V_2_2_x; + defaultOverrides = new HashMap<String, String>(); defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); @@ -158,78 +115,5 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { } } }); - } - - private void testUpgrade(TestConfiguration testConfiguration) throws Throwable { - final TestSetup setup = new TestSetup(testConfiguration.configurationName); - boolean testFailed = false; - try { - testConfiguration.beforeTestSetup(setup); - - String configPath = "/full-configurations/" + testConfiguration.version.getConfigDirName() + "/simple/httpd.conf"; - - setup.withInventoryFrom("/mocked-inventories/rhq-1.3.x/simple/inventory.xml") - .withPlatformResource(platform).withDefaultExpectations().withDefaultOverrides(testConfiguration.defaultOverrides) - .withApacheSetup().withConfigurationFiles(configPath, "/snmpd.conf", "/mime.types") - .withServerRoot(testConfiguration.serverRoot).withExePath(testConfiguration.binPath).setup(); - - testConfiguration.beforePluginContainerStart(setup); - - startConfiguredPluginContainer(); - - testConfiguration.beforeTests(); - - //ok, now we should see the resources upgraded in the fake server inventory. - ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); - ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); - - Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); - - assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); - - Resource server = servers.iterator().next(); - - String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfiguration.serverRoot, testConfiguration.serverRoot - + "/conf/httpd.conf"); - - assertEquals(server.getResourceKey(), expectedResourceKey, - "The server resource key doesn't seem to be upgraded."); - - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); - - assertEquals(vhosts.size(), 5, "Unexpected number of vhosts discovered found"); - - List<String> expectedResourceKeys = new ArrayList<String>(5); - - DeploymentConfig dc = setup.getDeploymentConfig(); - - expectedResourceKeys.add(ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost1.getServerName(), dc.vhost1.getAddresses())); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost2.getServerName(), dc.vhost2.getAddresses())); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost3.getServerName(), dc.vhost3.getAddresses())); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost4.getServerName(), dc.vhost4.getAddresses())); - - for (Resource vhost : vhosts) { - assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), - "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'. Only expecting " + expectedResourceKeys); - } - } catch (Throwable t) { - testFailed = true; - throw t; - } finally { - try { - setup.withApacheSetup().getExecutionUtil().invokeOperation("stop"); - } catch (Exception e) { - if (testFailed) { - LOG.error("Failed to stop apache.", e); - } else { - throw e; - } - } - } - } + } } diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java new file mode 100644 index 0000000..386a871 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ3_0_0Test.java @@ -0,0 +1,206 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache; + + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +import java.util.HashMap; +import java.util.List; +import java.util.Set; + +import org.testng.annotations.Parameters; +import org.testng.annotations.Test; + +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceError; +import org.rhq.core.domain.resource.ResourceErrorType; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.plugins.apache.parser.ApacheDirectiveTree; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; +import org.rhq.plugins.apache.util.RuntimeApacheConfiguration; +import org.rhq.plugins.apache.util.VirtualHostLegacyResourceKeyUtil; +import org.rhq.test.pc.PluginContainerSetup; + +/** + * + * + * @author Lukas Krejci + */ +public class UpgradeSimpleConfigurationFromRHQ3_0_0Test extends UpgradeTestBase { + + //TODO override the *.rhq3.resource.key variables in each test to define whether + //the resource key was discovered without SNMP, with SNMP, with Main Server URL set, + //or not + + //TODO the default inventory.xml uses discovery results without snmp active. with SNMP active, all 5 vhost + //would discovered in RHQ 3. This test should therefore use a different inventory file. + @Test(enabled = false) //this fails until the above todo is implemented + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}, numberOfInitialDiscoveries = 2) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithResolvableNamesWithSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + testSetup.withApacheSetup().init(); + ApacheServerComponent component = testSetup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + + DeploymentConfig deployConfig = testSetup.getDeploymentConfig(); + + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey())); + + if (deployConfig.vhost1 != null) { + String rhq3Key = keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec()); + defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(rhq3Key)); + } + + if (deployConfig.vhost2 != null) { + String rhq3Key = keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec()); + defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(rhq3Key)); + } + + if (deployConfig.vhost3 != null) { + String rhq3Key = keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec()); + defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(rhq3Key)); + } + + if (deployConfig.vhost4 != null) { + String rhq3Key = keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec()); + defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3SNMPLikeResourceKey(rhq3Key)); + } + + testSetup.withDefaultOverrides(defaultOverrides); + } + }); + } + + @Test + @PluginContainerSetup(plugins = {PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN}) + @Parameters({"apache2.install.dir", "apache2.exe.path"}) + public void testWithResolvableNamesWithoutSNMP(final String installDir, final String exePath) throws Throwable { + testUpgrade(new TestConfiguration() { + { + apacheConfigurationFiles = new String[]{"/full-configurations/2.2.x/simple/httpd.conf"}; + inventoryFile = "/mocked-inventories/rhq-3.0.0/simple/inventory.xml"; + serverRoot = installDir; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + upgradeShouldSucceed = false; + } + + @Override + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + testSetup.withApacheSetup().init(); + ApacheServerComponent component = testSetup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + + DeploymentConfig deployConfig = testSetup.getDeploymentConfig(); + + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put("main.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey()); + + if (deployConfig.vhost1 != null) { + defaultOverrides.put("vhost1.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost1.getVHostSpec())); + } + + if (deployConfig.vhost2 != null) { + defaultOverrides.put("vhost2.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost2.getVHostSpec())); + } + + if (deployConfig.vhost3 != null) { + defaultOverrides.put("vhost3.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost3.getVHostSpec())); + } + + if (deployConfig.vhost4 != null) { + defaultOverrides.put("vhost4.rhq3.resource.key", keyUtil.getRHQ3NonSNMPLegacyVirtualHostResourceKey(deployConfig.vhost4.getVHostSpec())); + } + + testSetup.withDefaultOverrides(defaultOverrides); + } + + /** + * Do our own tests here, because the test method won't do much, since + * we told it that the upgrade won't succeed. + */ + @Override + public void beforeTests(TestSetup setup) throws Throwable { + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); + + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(this.serverRoot, this.serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), 4, "Unexpected number of vhosts discovered found"); + + //let's check that the main vhost has a an upgrade error attached to it + ApacheServerComponent component = setup.withApacheSetup().getExecutionUtil().getServerComponent(); + ApacheDirectiveTree config = component.loadParser(); + config = RuntimeApacheConfiguration.extract(config, component.getCurrentProcessInfo(), component.getCurrentBinaryInfo(), component.getModuleNames(), false); + VirtualHostLegacyResourceKeyUtil keyUtil = new VirtualHostLegacyResourceKeyUtil(component, config); + + String mainVhostRK = keyUtil.getRHQ3NonSNMPLegacyMainServerResourceKey(); + + Resource mainVhost = null; + for(Resource r : vhosts) { + if (mainVhostRK.equals(r.getResourceKey())) { + mainVhost = r; + break; + } + } + + assertNotNull(mainVhost, "Couldn't find the main vhost with the expected resource key '" + mainVhostRK + "'."); + + List<ResourceError> errors = mainVhost.getResourceErrors(ResourceErrorType.UPGRADE); + assertNotNull(errors, "The main vhost doesn't have any upgrade errors."); + assertEquals(errors.size(), 1, "There should be exactly one upgrade error on the main vhost."); + } + }); + } + +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java index 16bd06b..96260a6 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeTestBase.java @@ -19,6 +19,7 @@ package org.rhq.plugins.apache; +import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; import java.io.File; @@ -28,6 +29,7 @@ import java.io.Reader; import java.net.InetAddress; import java.net.URI; import java.net.UnknownHostException; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -37,6 +39,8 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.jmock.Expectations; import org.testng.annotations.BeforeClass; @@ -73,6 +77,8 @@ import org.rhq.test.pc.PluginContainerTest; */ public class UpgradeTestBase extends PluginContainerTest { + private static final Log LOG = LogFactory.getLog(UpgradeTestBase.class); + protected class TestSetup { private String configurationName; private FakeServerInventory fakeInventory = new FakeServerInventory(); @@ -310,6 +316,9 @@ public class UpgradeTestBase extends PluginContainerTest { deploymentConfig.vhost4.getServerName()).toString(false, false)); } + //let the user override everything we just did + replacements.putAll(defaultOverrides); + InputStream dataStream = getClass().getResourceAsStream(inventoryFile); Reader rdr = new TokenReplacingReader(new InputStreamReader(dataStream), replacements); @@ -344,6 +353,28 @@ public class UpgradeTestBase extends PluginContainerTest { } } + protected static class TestConfiguration { + public String[] apacheConfigurationFiles; + public String inventoryFile; + public String configurationName; + public String serverRoot; + public String binPath; + public Map<String, String> defaultOverrides; + public boolean upgradeShouldSucceed = true; + + public void beforeTestSetup(TestSetup testSetup) throws Throwable { + + } + + public void beforePluginContainerStart(TestSetup setup) throws Throwable { + + } + + public void beforeTests(TestSetup setup) throws Throwable { + + } + } + protected static final String PLATFORM_PLUGIN = "file:target/itest/plugins/rhq-platform-plugin-for-apache-test.jar"; protected static final String AUGEAS_PLUGIN = "file:target/itest/plugins/rhq-augeas-plugin-for-apache-test.jar"; protected static final String APACHE_PLUGIN = "file:target/itest/plugins/rhq-apache-plugin-for-apache-test.jar"; @@ -370,6 +401,89 @@ public class UpgradeTestBase extends PluginContainerTest { return null; } + protected void testUpgrade(TestConfiguration testConfiguration) throws Throwable { + final TestSetup setup = new TestSetup(testConfiguration.configurationName); + boolean testFailed = false; + try { + + String[] configFiles = Arrays.copyOf(testConfiguration.apacheConfigurationFiles, testConfiguration.apacheConfigurationFiles.length + 2); + configFiles[testConfiguration.apacheConfigurationFiles.length] = "/snmpd.conf"; + configFiles[testConfiguration.apacheConfigurationFiles.length + 1] = "/mime.types"; + + setup.withInventoryFrom(testConfiguration.inventoryFile) + .withPlatformResource(platform).withDefaultExpectations().withDefaultOverrides(testConfiguration.defaultOverrides) + .withApacheSetup().withConfigurationFiles(configFiles) + .withServerRoot(testConfiguration.serverRoot).withExePath(testConfiguration.binPath); + + testConfiguration.beforeTestSetup(setup); + + setup.setup(); + + testConfiguration.beforePluginContainerStart(setup); + + startConfiguredPluginContainer(); + + testConfiguration.beforeTests(setup); + + if (!testConfiguration.upgradeShouldSucceed) { + return; + } + + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); + + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfiguration.serverRoot, testConfiguration.serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), 5, "Unexpected number of vhosts discovered found"); + + List<String> expectedResourceKeys = new ArrayList<String>(5); + + DeploymentConfig dc = setup.getDeploymentConfig(); + + expectedResourceKeys.add(ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost1.getServerName(), dc.vhost1.getAddresses())); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost2.getServerName(), dc.vhost2.getAddresses())); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost3.getServerName(), dc.vhost3.getAddresses())); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost4.getServerName(), dc.vhost4.getAddresses())); + + for (Resource vhost : vhosts) { + assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), + "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'. Only expecting " + expectedResourceKeys); + } + } catch (Throwable t) { + testFailed = true; + LOG.error("Error during test upgrade execution.", t); + throw t; + } finally { + try { + setup.withApacheSetup().getExecutionUtil().invokeOperation("stop"); + } catch (Exception e) { + if (testFailed) { + LOG.error("Failed to stop apache.", e); + } else { + throw e; + } + } + } + } + private static List<ResourceType> getResourceTypesInPlugin(String pluginUri) throws Exception { PluginDescriptor descriptor = AgentPluginDescriptorUtil.loadPluginDescriptorFromUrl(new URI(pluginUri).toURL()); PluginMetadataParser parser = new PluginMetadataParser(descriptor, diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java index 97abce3..be73319 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheDeploymentUtil.java @@ -93,6 +93,13 @@ public class ApacheDeploymentUtil { return serverName; } + public VHostSpec getVHostSpec() { + VHostSpec ret = new VHostSpec(); + ret.serverName = getServerName(); + ret.hosts = getAddresses(); + return ret; + } + public List<String> getAddresses() { ArrayList<String> ret = new ArrayList<String>(); if (address1 != null) { diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory.xml index 1aa8b38..f8d181d 100644 --- a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory.xml +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-1.3.x/simple/inventory.xml @@ -486,7 +486,7 @@ <id>10370</id> <name>snmpAgentHost</name> <override>false</override> - <stringValue>127.0.0.1</stringValue> + <stringValue>${snmp.host}</stringValue> </propertySimple> <propertySimple> <id>10713</id> @@ -514,7 +514,7 @@ <id>10712</id> <name>snmpAgentPort</name> <override>false</override> - <stringValue>1610</stringValue> + <stringValue>${snmp.port}</stringValue> </propertySimple> <propertySimple> <id>10715</id> diff --git a/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory.xml b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory.xml new file mode 100644 index 0000000..be89240 --- /dev/null +++ b/modules/plugins/apache/src/test/resources/mocked-inventories/rhq-3.0.0/simple/inventory.xml @@ -0,0 +1,462 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<inventory-dump> +<classes-used> +<class>org.rhq.core.domain.resource.Resource</class> +</classes-used> +<objects> + +<resource> + <id>10022</id> + <uuid>e61040b4-d645-44dc-a6b7-460d39f1b625</uuid> + <resourceKey>${server.root}</resourceKey> + <name>${localhost}:${listen1}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version>2.2.17</version> + <description>Apache Web Server</description> + <ctime>1308835177519</ctime> + <mtime>1308835282077</mtime> + <itime>1308835282077</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVER</category> + <createDeletePolicy>NEITHER</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <description>an Apache HTTP Server instance</description> + <id>10044</id> + <name>Apache HTTP Server</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10101</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10102</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>true</supportsManualAdd> + </resourceType> + <childResources> + <id>10036</id> + <uuid>5eb8fa91-2a4e-4a6e-9cd7-7b1927ea1a3a</uuid> + <resourceKey>localhost.localdomain:11676</resourceKey> + <name>localhost.localdomain:11676</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + <itime>1308835287457</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10186</id> + <version>0</version> + <ctime>1308835287457</ctime> + <mtime>1308835287457</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10187</id> + <version>0</version> + <ctime>1308835287458</ctime> + <mtime>1308835287458</mtime> + <propertySimple> + <id>10802</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10801</id> + <name>responseTimeLogFile</name> + <stringValue>/home/metlos/Progs/apache-2.2.17/build/logs/localhost.localdomain11676_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10804</id> + <name>url</name> + <stringValue>http://localhost.localdomain:11676/</stringValue> + </propertySimple> + <propertySimple> + <id>10803</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10037</id> + <uuid>b2928cc6-30ab-47fe-8095-e1292887ac18</uuid> + <resourceKey>${main.rhq3.resource.key}</resourceKey> + <name>Main</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + <itime>1308835287473</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10188</id> + <version>0</version> + <ctime>1308835287473</ctime> + <mtime>1308835287473</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10189</id> + <version>0</version> + <ctime>1308835287474</ctime> + <mtime>1308835287474</mtime> + <propertySimple> + <id>10806</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10805</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/127.0.0.111675_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10808</id> + <name>url</name> + <stringValue>http://${snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10807</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10038</id> + <uuid>fe8d389e-5a45-4bf2-9f73-0831caca63df</uuid> + <resourceKey>${vhost4.rhq3.resource.key}</resourceKey> + <name>${vhost4.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <itime>1308835287481</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10190</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10191</id> + <version>0</version> + <ctime>1308835287482</ctime> + <mtime>1308835287482</mtime> + <propertySimple> + <id>10810</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10809</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}/logs/localhost.localdomain11678_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10812</id> + <name>url</name> + <stringValue>http://${vhost4.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10811</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <childResources> + <id>10039</id> + <uuid>369d9dee-b4e1-45bf-9ad9-6a5d8cdd563e</uuid> + <resourceKey>${vhost3.rhq3.resource.key}</resourceKey> + <name>${vhost3.snmp.identifier}</name> + <inventoryStatus>COMMITTED</inventoryStatus> + <connected>false</connected> + <version></version> + <description></description> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + <itime>1308835287492</itime> + <modifiedBy> + <factive>false</factive> + <fsystem>false</fsystem> + <id>1</id> + </modifiedBy> + <resourceType> + <category>SERVICE</category> + <createDeletePolicy>BOTH</createDeletePolicy> + <creationDataType>CONFIGURATION</creationDataType> + <id>10046</id> + <name>Apache Virtual Host</name> + <plugin>Apache</plugin> + <pluginConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10112</id> + <propertyDefinitions/> + </pluginConfigurationDefinition> + <resourceConfigurationDefinition> + <configurationFormat>STRUCTURED</configurationFormat> + <id>10113</id> + <propertyDefinitions/> + </resourceConfigurationDefinition> + <singleton>false</singleton> + <supportsManualAdd>false</supportsManualAdd> + </resourceType> + <resourceConfiguration> + <id>10192</id> + <version>0</version> + <ctime>1308835287493</ctime> + <mtime>1308835287493</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10193</id> + <version>0</version> + <ctime>1308835287494</ctime> + <mtime>1308835287494</mtime> + <propertySimple> + <id>10814</id> + <name>responseTimeUrlExcludes</name> + </propertySimple> + <propertySimple> + <id>10813</id> + <name>responseTimeLogFile</name> + <stringValue>${server.root}logs/localhost.localdomain11677_rt.log</stringValue> + </propertySimple> + <propertySimple> + <id>10816</id> + <name>url</name> + <stringValue>http://${vhost3.snmp.identifier}/</stringValue> + </propertySimple> + <propertySimple> + <id>10815</id> + <name>responseTimeUrlTransforms</name> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + </childResources> + <resourceConfiguration> + <id>10174</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + </resourceConfiguration> + <pluginConfiguration> + <id>10175</id> + <version>0</version> + <ctime>1308835177520</ctime> + <mtime>1308835177520</mtime> + <propertySimple> + <id>10790</id> + <name>errorLogIncludesPattern</name> + </propertySimple> + <propertySimple> + <id>10783</id> + <name>errorLogMinimumSeverity</name> + <stringValue>error</stringValue> + </propertySimple> + <propertySimple> + <id>10708</id> + <name>augeasEnabled</name> + <stringValue>no</stringValue> + </propertySimple> + <propertySimple> + <id>10789</id> + <name>errorLogFilePath</name> + </propertySimple> + <propertySimple> + <id>10786</id> + <name>snmpAgentCommunity</name> + <stringValue>public</stringValue> + </propertySimple> + <propertySimple> + <id>10784</id> + <name>snmpAgentHost</name> + <stringValue>${snmp.host}</stringValue> + </propertySimple> + <propertySimple> + <id>10782</id> + <name>errorLogEventsEnabled</name> + <stringValue>false</stringValue> + </propertySimple> + <propertySimple> + <id>10793</id> + <name>controlScriptPath</name> + </propertySimple> + <propertySimple> + <id>10795</id> + <name>url</name> + <stringValue>http://${localhost}:${listen1}/</stringValue> + </propertySimple> + <propertySimple> + <id>10709</id> + <name>augeasModuleName</name> + <stringValue>Httpd</stringValue> + </propertySimple> + <propertySimple> + <id>10794</id> + <name>configFile</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10710</id> + <name>configurationFilesInclusionPatterns</name> + <stringValue>${server.root}/conf/httpd.conf</stringValue> + </propertySimple> + <propertySimple> + <id>10788</id> + <name>vhostFilesMask</name> + <stringValue>${server.root}/conf/*</stringValue> + </propertySimple> + <propertySimple> + <id>10787</id> + <name>restartAfterConfigurationUpdate</name> + <stringValue>true</stringValue> + </propertySimple> + <propertySimple> + <id>10792</id> + <name>executablePath</name> + <stringValue>${exe.path}</stringValue> + </propertySimple> + <propertySimple> + <id>10785</id> + <name>snmpAgentPort</name> + <stringValue>${snmp.port}</stringValue> + </propertySimple> + <propertySimple> + <id>10781</id> + <name>vhostCreationPolicy</name> + <stringValue>vhost-per-file</stringValue> + </propertySimple> + <propertySimple> + <id>10791</id> + <name>serverRoot</name> + <stringValue>${server.root}</stringValue> + </propertySimple> + </pluginConfiguration> + <agent> + <backFilled>false</backFilled> + <id>10001</id> + <port>0</port> + </agent> + <currentAvailability> + <availabilityType>UP</availabilityType> + </currentAvailability> + <productVersion> + <id>10004</id> + </productVersion> +</resource> +</objects> +</inventory-dump> commit f234bd208c3b0e5344fe8e235237c58063985326 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Jun 23 13:23:43 2011 +0200 make the tests actually compile diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java index af809a5..13a9c4a 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java @@ -91,7 +91,7 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { public void testWithResolvableServerNames_Apache2(final String installPath, final String exePath) throws Throwable { - testUpgradeFromRHQ1_3(new TestConfiguration() { + testUpgrade(new TestConfiguration() { { serverRoot = installPath; binPath = exePath; @@ -108,7 +108,7 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { public void testWithResolvableServerNames_Apache1(final String installPath, final String exePath) throws Throwable { - testUpgradeFromRHQ1_3(new TestConfiguration() {{ + testUpgrade(new TestConfiguration() {{ serverRoot = installPath; binPath = exePath; configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; @@ -120,7 +120,7 @@ public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) @Parameters({ "apache2.install.dir", "apache2.exe.path" }) public void testWithNonUniqueServerNames_Apache2(final String installPath, final String exePath) throws Throwable { - testUpgradeFromRHQ1_3(new TestConfiguration() { + testUpgrade(new TestConfiguration() { { configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; serverRoot = installPath; commit 44049422b33901613c769fd1fab60c211427089a Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Jun 23 13:22:58 2011 +0200 fix removing of the resources in the fake server inventory. diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java index 4d5dc7d..17beb1e 100644 --- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java +++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java @@ -277,6 +277,9 @@ public class FakeServerInventory { if (parent != null) { parent.getChildResources().remove(r); } + for(Resource child : r.getChildResources()) { + removeResource(child); + } } private Resource fakePersist(Resource agentSideResource, InventoryStatus requiredInventoryStatus, commit f15678e57cb7001b4120c38b3ca0b5cf9d62e745 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Jun 23 13:22:40 2011 +0200 Throw more appropriate (or documented) exceptions. diff --git a/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java b/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java index 22a3167..35ba2d2 100644 --- a/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java +++ b/modules/test-utils/src/main/java/org/rhq/test/TokenReplacingReader.java @@ -125,7 +125,7 @@ public class TokenReplacingReader extends Reader { } public long skip(long n) throws IOException { - throw new RuntimeException("Operation Not Supported"); + throw new UnsupportedOperationException("skip() not supported on TokenReplacingReader."); } public boolean ready() throws IOException { @@ -137,10 +137,10 @@ public class TokenReplacingReader extends Reader { } public void mark(int readAheadLimit) throws IOException { - throw new RuntimeException("Operation Not Supported"); + throw new IOException("mark() not supported on TokenReplacingReader."); } public void reset() throws IOException { - throw new RuntimeException("Operation Not Supported"); + throw new IOException("reset() not supported on TokenReplacingReader."); } } commit b93c6ce9baf853bbdc69d7cfc85032cd63fcbccd Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Jun 23 13:22:09 2011 +0200 Renamed the UpgradeSimpleConfigurationWithResolvableServerNamesTest to UpgradeSimpleConfigurationFromRHQ1_3Test to better describe what is actually being tested and to support better fragmentation of the tests we are going to have into standalone test classes. diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java new file mode 100644 index 0000000..af809a5 --- /dev/null +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationFromRHQ1_3Test.java @@ -0,0 +1,235 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2011 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.plugins.apache; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.testng.annotations.Parameters; +import org.testng.annotations.Test; + +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceType; +import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; +import org.rhq.test.pc.PluginContainerSetup; + +/** + * + * + * @author Lukas Krejci + */ +@Test(groups = "apache-integration-tests") +public class UpgradeSimpleConfigurationFromRHQ1_3Test extends UpgradeTestBase { + private static final Log LOG = LogFactory.getLog(UpgradeSimpleConfigurationFromRHQ1_3Test.class); + + private enum Apache { + V_1_3_x { + public String getConfigDirName() { + return "1.3.x"; + } + }, + + V_2_2_x { + public String getConfigDirName() { + return "2.2.x"; + } + }; + + public abstract String getConfigDirName(); + } + + private static class TestConfiguration { + public Apache version; + public String configurationName; + public String serverRoot; + public String binPath; + public Map<String, String> defaultOverrides; + + public void beforeTestSetup(TestSetup testSetup) { + + } + + public void beforePluginContainerStart(TestSetup setup) { + + } + + public void beforeTests() { + + } + } + + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithResolvableServerNames_Apache2(final String installPath, final String exePath) + throws Throwable { + + testUpgradeFromRHQ1_3(new TestConfiguration() { + { + serverRoot = installPath; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + version = Apache.V_2_2_x; + } + }); + } + + @Test(enabled = false) + //ApacheServerOperationsDelegate doesn't work with apache 1.3 + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache1.install.dir", "apache1.exe.path" }) + public void testWithResolvableServerNames_Apache1(final String installPath, final String exePath) + throws Throwable { + + testUpgradeFromRHQ1_3(new TestConfiguration() {{ + serverRoot = installPath; + binPath = exePath; + configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; + version = Apache.V_1_3_x; + }}); + } + + @Test + @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) + @Parameters({ "apache2.install.dir", "apache2.exe.path" }) + public void testWithNonUniqueServerNames_Apache2(final String installPath, final String exePath) throws Throwable { + testUpgradeFromRHQ1_3(new TestConfiguration() { + { + configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; + serverRoot = installPath; + binPath = exePath; + version = Apache.V_2_2_x; + + defaultOverrides = new HashMap<String, String>(); + defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); + defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); + } + + @Override + public void beforePluginContainerStart(TestSetup setup) { + //in this scenario, the RHQ 1.3 would only discover 1 vhost (and the main vhost), because they would have the same resource key + //due to the same ServerName. I need to process the default inventory to reflect that otherwise I would get upgrade + //failures. + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(findApachePluginResourceTypeByName("Apache Virtual Host")); + Set<Resource> uniques = new TreeSet<Resource>(new Comparator<Resource>() { + public int compare(Resource a, Resource b) { + return a.getResourceKey().compareTo(b.getResourceKey()); + } + }); + + for(Resource vhost : vhosts) { + if (uniques.contains(vhost)) { + //remove the vhost from the server's inventory + setup.getFakeInventory().removeResource(vhost); + } else { + uniques.add(vhost); + } + } + } + }); + } + + private void testUpgrade(TestConfiguration testConfiguration) throws Throwable { + final TestSetup setup = new TestSetup(testConfiguration.configurationName); + boolean testFailed = false; + try { + testConfiguration.beforeTestSetup(setup); + + String configPath = "/full-configurations/" + testConfiguration.version.getConfigDirName() + "/simple/httpd.conf"; + + setup.withInventoryFrom("/mocked-inventories/rhq-1.3.x/simple/inventory.xml") + .withPlatformResource(platform).withDefaultExpectations().withDefaultOverrides(testConfiguration.defaultOverrides) + .withApacheSetup().withConfigurationFiles(configPath, "/snmpd.conf", "/mime.types") + .withServerRoot(testConfiguration.serverRoot).withExePath(testConfiguration.binPath).setup(); + + testConfiguration.beforePluginContainerStart(setup); + + startConfiguredPluginContainer(); + + testConfiguration.beforeTests(); + + //ok, now we should see the resources upgraded in the fake server inventory. + ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); + ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); + + Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); + + assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); + + Resource server = servers.iterator().next(); + + String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfiguration.serverRoot, testConfiguration.serverRoot + + "/conf/httpd.conf"); + + assertEquals(server.getResourceKey(), expectedResourceKey, + "The server resource key doesn't seem to be upgraded."); + + Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); + + assertEquals(vhosts.size(), 5, "Unexpected number of vhosts discovered found"); + + List<String> expectedResourceKeys = new ArrayList<String>(5); + + DeploymentConfig dc = setup.getDeploymentConfig(); + + expectedResourceKeys.add(ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost1.getServerName(), dc.vhost1.getAddresses())); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost2.getServerName(), dc.vhost2.getAddresses())); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost3.getServerName(), dc.vhost3.getAddresses())); + expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( + dc.vhost4.getServerName(), dc.vhost4.getAddresses())); + + for (Resource vhost : vhosts) { + assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), + "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'. Only expecting " + expectedResourceKeys); + } + } catch (Throwable t) { + testFailed = true; + throw t; + } finally { + try { + setup.withApacheSetup().getExecutionUtil().invokeOperation("stop"); + } catch (Exception e) { + if (testFailed) { + LOG.error("Failed to stop apache.", e); + } else { + throw e; + } + } + } + } +} diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java deleted file mode 100644 index f887b83..0000000 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java +++ /dev/null @@ -1,235 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -package org.rhq.plugins.apache; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.testng.annotations.Parameters; -import org.testng.annotations.Test; - -import org.rhq.core.domain.resource.Resource; -import org.rhq.core.domain.resource.ResourceType; -import org.rhq.plugins.apache.util.ApacheDeploymentUtil.DeploymentConfig; -import org.rhq.test.pc.PluginContainerSetup; - -/** - * - * - * @author Lukas Krejci - */ -@Test(groups = "apache-integration-tests") -public class UpgradeSimpleConfigurationWithResolvableServerNamesTest extends UpgradeTestBase { - private static final Log LOG = LogFactory.getLog(UpgradeSimpleConfigurationWithResolvableServerNamesTest.class); - - private enum Apache { - V_1_3_x { - public String getConfigDirName() { - return "1.3.x"; - } - }, - - V_2_2_x { - public String getConfigDirName() { - return "2.2.x"; - } - }; - - public abstract String getConfigDirName(); - } - - private static class TestConfiguration { - public Apache version; - public String configurationName; - public String serverRoot; - public String binPath; - public Map<String, String> defaultOverrides; - - public void beforeTestSetup(TestSetup testSetup) { - - } - - public void beforePluginContainerStart(TestSetup setup) { - - } - - public void beforeTests() { - - } - } - - @Test - @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) - @Parameters({ "apache2.install.dir", "apache2.exe.path" }) - public void testWithResolvableServerNames_Apache2_upgradeFromRHQ1_3(final String installPath, final String exePath) - throws Throwable { - - testUpgradeFromRHQ1_3(new TestConfiguration() { - { - serverRoot = installPath; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - version = Apache.V_2_2_x; - } - }); - } - - @Test(enabled = false) - //ApacheServerOperationsDelegate doesn't work with apache 1.3 - @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) - @Parameters({ "apache1.install.dir", "apache1.exe.path" }) - public void testWithResolvableServerNames_Apache1_upgradeFromRHQ1_3(final String installPath, final String exePath) - throws Throwable { - - testUpgradeFromRHQ1_3(new TestConfiguration() {{ - serverRoot = installPath; - binPath = exePath; - configurationName = DEPLOYMENT_SIMPLE_WITH_RESOLVABLE_SERVERNAMES; - version = Apache.V_1_3_x; - }}); - } - - @Test - @PluginContainerSetup(plugins = { PLATFORM_PLUGIN, AUGEAS_PLUGIN, APACHE_PLUGIN }) - @Parameters({ "apache2.install.dir", "apache2.exe.path" }) - public void testWithUnresolvableServerNames_Apache2_upgradeFromRHQ1_3(final String installPath, final String exePath) throws Throwable { - testUpgradeFromRHQ1_3(new TestConfiguration() { - { - configurationName = DEPLOYMENT_SIMPLE_WITH_UNRESOLVABLE_SERVER_NAMES; - serverRoot = installPath; - binPath = exePath; - version = Apache.V_2_2_x; - - defaultOverrides = new HashMap<String, String>(); - defaultOverrides.put(variableName(configurationName, "servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost1.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost2.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost3.servername.directive"), "ServerName ${unresolvable.host}"); - defaultOverrides.put(variableName(configurationName, "vhost4.servername.directive"), "ServerName ${unresolvable.host}"); - } - - @Override - public void beforePluginContainerStart(TestSetup setup) { - //in this scenario, the RHQ 1.3 would only discover 1 vhost (and the main vhost), because they would have the same resource key - //due to the same ServerName. I need to process the default inventory to reflect that otherwise I would get upgrade - //failures. - - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(findApachePluginResourceTypeByName("Apache Virtual Host")); - Set<Resource> uniques = new TreeSet<Resource>(new Comparator<Resource>() { - public int compare(Resource a, Resource b) { - return a.getResourceKey().compareTo(b.getResourceKey()); - } - }); - - for(Resource vhost : vhosts) { - if (uniques.contains(vhost)) { - //remove the vhost from the server's inventory - setup.getFakeInventory().removeResource(vhost); - } else { - uniques.add(vhost); - } - } - } - }); - } - - private void testUpgradeFromRHQ1_3(TestConfiguration testConfiguration) throws Throwable { - final TestSetup setup = new TestSetup(testConfiguration.configurationName); - boolean testFailed = false; - try { - testConfiguration.beforeTestSetup(setup); - - String configPath = "/full-configurations/" + testConfiguration.version.getConfigDirName() + "/simple/httpd.conf"; - - setup.withInventoryFrom("/mocked-inventories/rhq-1.3.x/simple/inventory.xml") - .withPlatformResource(platform).withDefaultExpectations().withDefaultOverrides(testConfiguration.defaultOverrides) - .withApacheSetup().withConfigurationFiles(configPath, "/snmpd.conf", "/mime.types") - .withServerRoot(testConfiguration.serverRoot).withExePath(testConfiguration.binPath).setup(); - - testConfiguration.beforePluginContainerStart(setup); - - startConfiguredPluginContainer(); - - testConfiguration.beforeTests(); - - //ok, now we should see the resources upgraded in the fake server inventory. - ResourceType serverResourceType = findApachePluginResourceTypeByName("Apache HTTP Server"); - ResourceType vhostResourceType = findApachePluginResourceTypeByName("Apache Virtual Host"); - - Set<Resource> servers = setup.getFakeInventory().findResourcesByType(serverResourceType); - - assertEquals(servers.size(), 1, "There should be exactly one apache server discovered."); - - Resource server = servers.iterator().next(); - - String expectedResourceKey = ApacheServerDiscoveryComponent.formatResourceKey(testConfiguration.serverRoot, testConfiguration.serverRoot - + "/conf/httpd.conf"); - - assertEquals(server.getResourceKey(), expectedResourceKey, - "The server resource key doesn't seem to be upgraded."); - - Set<Resource> vhosts = setup.getFakeInventory().findResourcesByType(vhostResourceType); - - assertEquals(vhosts.size(), 5, "Unexpected number of vhosts discovered found"); - - List<String> expectedResourceKeys = new ArrayList<String>(5); - - DeploymentConfig dc = setup.getDeploymentConfig(); - - expectedResourceKeys.add(ApacheVirtualHostServiceComponent.MAIN_SERVER_RESOURCE_KEY); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost1.getServerName(), dc.vhost1.getAddresses())); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost2.getServerName(), dc.vhost2.getAddresses())); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost3.getServerName(), dc.vhost3.getAddresses())); - expectedResourceKeys.add(ApacheVirtualHostServiceDiscoveryComponent.createResourceKey( - dc.vhost4.getServerName(), dc.vhost4.getAddresses())); - - for (Resource vhost : vhosts) { - assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), - "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'. Only expecting " + expectedResourceKeys); - } - } catch (Throwable t) { - testFailed = true; - throw t; - } finally { - try { - setup.withApacheSetup().getExecutionUtil().invokeOperation("stop"); - } catch (Exception e) { - if (testFailed) { - LOG.error("Failed to stop apache.", e); - } else { - throw e; - } - } - } - } -} commit 5a02ee97caf19a7f9945976f4fb22934574f7a36 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed Jun 22 18:17:07 2011 +0200 better message in TestNG reports diff --git a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java index 2ba6108..f887b83 100644 --- a/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java +++ b/modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UpgradeSimpleConfigurationWithResolvableServerNamesTest.java @@ -215,7 +215,7 @@ public class UpgradeSimpleConfigurationWithResolvableServerNamesTest extends Upg for (Resource vhost : vhosts) { assertTrue(expectedResourceKeys.contains(vhost.getResourceKey()), - "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'."); + "Unexpected virtual host resource key: '" + vhost.getResourceKey() + "'. Only expecting " + expectedResourceKeys); } } catch (Throwable t) { testFailed = true;

1 0

[rhq] Branch 'drift' - modules/enterprise
by mazz 11 Jul '11

11 Jul '11

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddConfigWizardInfoStep.java | 22 +--------- 1 file changed, 4 insertions(+), 18 deletions(-) New commits: commit f94ad2f2eb4b9c6868a87eb1dff77be51f5caa94 Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Jul 11 12:30:13 2011 -0400 remove test code - not needed anymore since we have now fully integrated plugin descriptor metadata diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddConfigWizardInfoStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddConfigWizardInfoStep.java index d1cda75..d2ce5be 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddConfigWizardInfoStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/wizard/DriftAddConfigWizardInfoStep.java @@ -35,10 +35,6 @@ import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.definition.ConfigurationTemplate; -import org.rhq.core.domain.drift.DriftConfiguration; -import org.rhq.core.domain.drift.DriftConfigurationDefinition; -import org.rhq.core.domain.drift.DriftConfiguration.BaseDirectory; -import org.rhq.core.domain.drift.DriftConfigurationDefinition.BaseDirValueContext; import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep; import org.rhq.enterprise.gui.coregui.client.util.FormUtility; import org.rhq.enterprise.gui.coregui.client.util.selenium.Locatable; @@ -95,25 +91,15 @@ public class DriftAddConfigWizardInfoStep extends AbstractWizardStep { Set<ConfigurationTemplate> templates = wizard.getType().getDriftConfigurationTemplates(); final HashMap<String, ConfigurationTemplate> templatesMap = new HashMap<String, ConfigurationTemplate>( - templates.size() + 1); + templates.size()); if (!templates.isEmpty()) { for (ConfigurationTemplate template : templates) { templatesMap.put(template.getName(), template); } } else { - // TODO this should throw an error as there should be at least one template (can remove the +1 sizing above when changing) - // throw new IllegalStateException( "At least one drift configuration template should exist for the resource type" ); - ConfigurationTemplate test = new ConfigurationTemplate("Test", "Test"); - Configuration config = new Configuration(); - DriftConfiguration driftConfig = new DriftConfiguration(config); - driftConfig - .setBasedir(new BaseDirectory(BaseDirValueContext.fileSystem, - "C:/workspace/rhq/dev-container/jbossas/server/default/deploy/rhq.ear/coregui.war/images/subsystems/content")); - driftConfig.setName("Test"); - driftConfig.setInterval(6000L); - test.setConfiguration(driftConfig.getConfiguration()); - test.setConfigurationDefinition(DriftConfigurationDefinition.getInstance()); - templatesMap.put("TestOnly", test); + // there should be at least one template for any resource type that supports drift monitoring + throw new IllegalStateException( + "At least one drift configuration template should exist for the resource type"); } templateSelect.setValueMap(templatesMap.keySet().toArray(new String[templatesMap.size()]));

1 0

[rhq] Branch 'as7plugin' - 6 commits - modules/core modules/enterprise modules/plugins
by Heiko W. Rupp 11 Jul '11

11 Jul '11

modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 2616 ++++----- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 2726 +++++----- modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml | 28 modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml | 40 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java | 33 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java | 15 modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 201 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/DatasourceDeployTest.java | 43 modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/UploadAndDeployTest.java | 4 10 files changed, 2962 insertions(+), 2746 deletions(-) New commits: commit ac2a4e90d6a50392bee2a42b08eca7422109e818 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Jul 11 18:18:56 2011 +0200 Enable more operations on data sources and improve metric descriptors and configuration for xa data sources. diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java index e969644..5e3fbe2 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DatasourceComponent.java @@ -29,6 +29,9 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet Configuration parameters) throws Exception { OperationResult result = new OperationResult(); + ASConnection connection = getASConnection(); + Operation op; + if (operationName.equals("addDriver")) { // TODO decide if we need this at all. See also the plugin-descriptor String drivername = parameters.getSimpleValue("driver-name", NOTSET); @@ -36,25 +39,18 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet List<PROPERTY_VALUE> address = pathToAddress(getPath()); address.add(new PROPERTY_VALUE("jdbc-driver",drivername)); - Operation op = new Operation("add",address,"driver-name",drivername); + op = new Operation("add",address,"driver-name",drivername); op.addAdditionalProperty("deployment-name",parameters.getSimpleValue("deployment-name", NOTSET)); op.addAdditionalProperty("driver-class-name",parameters.getSimpleValue("driver-class-name", NOTSET)); - ASConnection connection = getASConnection(); - Result res = connection.execute(op); - if (res.isSuccess()) { - result.setSimpleResult("Success"); - } - else { - result.setErrorMessage(res.getFailureDescription().toString()); - } + } else if (operationName.equals("addDatasource")) { String name = parameters.getSimpleValue("name",NOTSET); List<PROPERTY_VALUE> address = pathToAddress(getPath()); address.add(new PROPERTY_VALUE("data-source",name)); - Operation op = new Operation("add",address); + op = new Operation("add",address); addRequiredToOp(op,parameters,"driver-name"); addRequiredToOp(op,parameters,"jndi-name"); addRequiredToOp(op, parameters, "pool-name"); @@ -76,7 +72,7 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet List<PROPERTY_VALUE> address = pathToAddress(getPath()); address.add(new PROPERTY_VALUE("xa-data-source",name)); - Operation op = new Operation("add",address); + op = new Operation("add",address); addRequiredToOp(op,parameters,"driver-name"); addRequiredToOp(op,parameters,"jndi-name"); addRequiredToOp(op,parameters,"pool-name"); @@ -99,8 +95,21 @@ public class DatasourceComponent extends BaseComponent implements OperationFacet } else { - result.setErrorMessage("Unknown operation " + operationName); + /* + * This is a catch all for operations that are not explicitly treated above. + */ + List<PROPERTY_VALUE> address = pathToAddress(getPath()); + op = new Operation(operationName,address); + } + + Result res = connection.execute(op); + if (res.isSuccess()) { + result.setSimpleResult("Success"); } + else { + result.setErrorMessage(res.getFailureDescription().toString()); + } + return result; } diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java index cf498d3..f2ca5e2 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Domain2Descriptor.java @@ -157,10 +157,14 @@ public class Domain2Descriptor { if (key.equals("type") || key.equals("description") || key.equals("required")) continue; - Map<String,Object> emapEntryValue = (Map<String, Object>) emapEntry.getValue(); - String ts = getTypeStringForTypeAndName(getTypeFromProps(emapEntryValue),key); - StringBuilder sb = generateProperty(indent, emapEntryValue,ts,emapEntry.getKey(),getAccessType(emapEntryValue)); - System.out.println(sb.toString()); + if (emapEntry.getValue() instanceof Map) { + Map<String,Object> emapEntryValue = (Map<String, Object>) emapEntry.getValue(); + String ts = getTypeStringForTypeAndName(getTypeFromProps(emapEntryValue),key); + StringBuilder sb = generateProperty(indent, emapEntryValue,ts,emapEntry.getKey(),getAccessType(emapEntryValue)); + System.out.println(sb.toString()); + } + else + System.out.println(emapEntry.getValue()); } } @@ -229,6 +233,9 @@ public class Domain2Descriptor { private void createOperation(String name, Map<String, Object> operationMap) { + if (operationMap==null) + return; + StringBuilder builder = new StringBuilder("<operation name=\""); builder.append(name).append('"'); diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index ff36bc9..3e2c84d 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -787,27 +787,57 @@ <c:simple-property name="path" readOnly="true" default="data-source"/> </plugin-configuration> + <operation name="enable" description="Enables the data-source"> + <results> + <c:simple-property name="operationResult"/> + </results> + </operation> + <operation name="disable" description="Disables the XA data-source"> + <results> + <c:simple-property name="operationResult"/> + </results> + </operation> + + <operation name="flush-all-connection-in-pool" description="Flushes the pool for all connections"> + <results> + <c:simple-property name="operationResult"/> + </results> + </operation> + + <operation name="flush-idle-connection-in-pool" description="Flushes the pool for idle connections"> + <results> + <c:simple-property name="operationResult"/> + </results> + </operation> + <metric property="PreparedStatementCacheCurrentSize" description="The number of prepared and callable statements currently cached in the statement cache"/> - <metric property="PreparedStatementCacheMissCount" + <metric property="PreparedStatementCacheMissCount" measurementType="trendsup" description="The number of times that a statement request could not be satisfied with a statement from the cache"/> - <metric property="PreparedStatementCacheAddCount" description="The number of statements added to the statement cache"/> - <metric property="PreparedStatementCacheAccessCount" description="The number of times that the statement cache was accessed"/> - <metric property="PreparedStatementCacheDeleteCount" description="The number of statements discarded from the cache"/> - <metric property="PreparedStatementCacheHitCount" description="The number of times that statements from the cache were used"/> - <metric property="AverageBlockingTime" description="The average time spent blocking for a connection"/> - <metric property="MaxWaitTime" description="The maximum wait time for a connection"/> - <metric property="ActiveCount" description="The active count"/> - <metric property="CreatedCount" description="The created count"/> - <metric property="MaxCreationTime" description="The maximum time for creating a physical connection"/> - <metric property="MaxWaitCount" description="The maximum number of threads waiting for a connection"/> - <metric property="TotalCreationTime" description="The total time spent creating physical connections"/> - <metric property="AvailableCount" description="The available count"/> + <metric property="PreparedStatementCacheAddCount" + description="The number of statements added to the statement cache"/> + <metric property="PreparedStatementCacheAccessCount" measurementType="trendsup" + description="The number of times that the statement cache was accessed"/> + <metric property="PreparedStatementCacheDeleteCount" measurementType="trendsup" + description="The number of statements discarded from the cache"/> + <metric property="PreparedStatementCacheHitCount" measurementType="trendsup" + description="The number of times that statements from the cache were used"/> + <metric property="AverageBlockingTime" units="milliseconds" + description="The average time spent blocking for a connection"/> + <metric property="MaxWaitTime" units="milliseconds" + description="The maximum wait time for a connection" displayType="summary"/> + <metric property="ActiveCount" + description="The active count"/> + <metric property="CreatedCount" description="The created count" measurementType="trendsup"/> + <metric property="MaxCreationTime" description="The maximum time for creating a physical connection" units="milliseconds"/> + <metric property="MaxWaitCount" description="The maximum number of threads waiting for a connection" units="milliseconds" displayType="summary"/> + <metric property="TotalCreationTime" description="The total time spent creating physical connections" measurementType="trendsup" units="milliseconds"/> + <metric property="AvailableCount" description="The available count" units="milliseconds"/> <metric property="MaxUsedCount" description="The maximum number of connections used"/> - <metric property="TimedOut" description="The timed out count"/> - <metric property="TotalBlockingTime" description="The total blocking time"/> - <metric property="AverageCreationTime" description="The average time spent creating a physical connection"/> - <metric property="DestroyedCount" description="The destroyed count"/> + <metric property="TimedOut" description="The timed out count" measurementType="trendsup" displayType="summary"/> + <metric property="TotalBlockingTime" description="The total blocking time" measurementType="trendsup" units="milliseconds"/> + <metric property="AverageCreationTime" description="The average time spent creating a physical connection" units="milliseconds"/> + <metric property="DestroyedCount" description="The destroyed count" measurementType="trendsup"/> <resource-configuration> <c:simple-property name="connection-url" required="true" type="string" readOnly="true" description="The JDBC driver connection URL"/> @@ -887,13 +917,148 @@ <service name="XADataSource" discovery="SubsystemDiscovery" - class="BaseComponent" + class="DatasourceComponent" description="An XA data source" > <plugin-configuration> <c:simple-property name="path" readOnly="true" default="xa-data-source"/> </plugin-configuration> + + <operation name="enable" description="Enables the data-source"> + <results> + <c:simple-property name="operationResult"/> + </results> + </operation> + <operation name="disable" description="Disables the XA data-source"> + <results> + <c:simple-property name="operationResult"/> + </results> + </operation> + + <operation name="flush-all-connection-in-pool" description="Flushes the pool for all connections"> + <results> + <c:simple-property name="operationResult"/> + </results> + </operation> + + <operation name="flush-idle-connection-in-pool" description="Flushes the pool for idle connections"> + <results> + <c:simple-property name="operationResult"/> + </results> + </operation> + + <metric property="PreparedStatementCacheCurrentSize" + description="The number of prepared and callable statements currently cached in the statement cache"/> + <metric property="PreparedStatementCacheMissCount" measurementType="trendsup" + description="The number of times that a statement request could not be satisfied with a statement from the cache"/> + <metric property="PreparedStatementCacheAddCount" + description="The number of statements added to the statement cache"/> + <metric property="PreparedStatementCacheAccessCount" measurementType="trendsup" + description="The number of times that the statement cache was accessed"/> + <metric property="PreparedStatementCacheDeleteCount" measurementType="trendsup" + description="The number of statements discarded from the cache"/> + <metric property="PreparedStatementCacheHitCount" measurementType="trendsup" + description="The number of times that statements from the cache were used"/> + <metric property="AverageBlockingTime" units="milliseconds" + description="The average time spent blocking for a connection"/> + <metric property="MaxWaitTime" units="milliseconds" + description="The maximum wait time for a connection" displayType="summary"/> + <metric property="ActiveCount" + description="The active count"/> + <metric property="CreatedCount" description="The created count" measurementType="trendsup"/> + <metric property="MaxCreationTime" description="The maximum time for creating a physical connection" units="milliseconds"/> + <metric property="MaxWaitCount" description="The maximum number of threads waiting for a connection" units="milliseconds" displayType="summary"/> + <metric property="TotalCreationTime" description="The total time spent creating physical connections" measurementType="trendsup" units="milliseconds"/> + <metric property="AvailableCount" description="The available count" units="milliseconds"/> + <metric property="MaxUsedCount" description="The maximum number of connections used"/> + <metric property="TimedOut" description="The timed out count" measurementType="trendsup" displayType="summary"/> + <metric property="TotalBlockingTime" description="The total blocking time" measurementType="trendsup" units="milliseconds"/> + <metric property="AverageCreationTime" description="The average time spent creating a physical connection" units="milliseconds"/> + <metric property="DestroyedCount" description="The destroyed count" measurementType="trendsup"/> + + <resource-configuration> + <c:simple-property name="xa-data-source-class" required="true" type="string" readOnly="true" description="The fully qualifed name of the javax.sql.XADataSource implementation"/> + <c:simple-property name="jndi-name" required="true" type="string" readOnly="true" description="Specifies the JNDI name for the datasource"/> + <c:simple-property name="driver-name" required="true" type="string" readOnly="true" description="Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit"/> + <c:simple-property name="new-connection-sql" required="false" type="string" readOnly="true" description="Specifies an SQL statement to execute whenever a connection is added to the connection pool."/> + <c:simple-property name="pool-name" required="false" type="string" readOnly="true" description="Specifies the pool name for the datasource used for management"/> + <c:simple-property name="url-delimiter" required="false" type="string" readOnly="true" description="Specifies the delimeter for URLs in connection-url for HA datasources"/> + <c:simple-property name="url-selector-strategy-class-name" required="false" type="string" readOnly="true" description="A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy"/> + <c:simple-property name="use-java-context" required="false" type="boolean" readOnly="true" description="Setting this to false will bind the DataSource into global JNDI;"/> + <c:simple-property name="enabled" required="false" type="boolean" readOnly="true" description="Specifies if the datasource should be enabled"/> + <c:simple-property name="max-pool-size" required="false" type="integer" readOnly="false" description="The max-pool-size element indicates the maximum number of connections for a pool. No more connections will be created in each sub-pool."/> + <c:simple-property name="min-pool-size" required="false" type="integer" readOnly="false" description="The min-pool-size element indicates the minimum number of connections a pool should hold. These are not created until a Subject is known from a request for a connection."/> + <c:simple-property name="pool-prefill" required="false" type="boolean" readOnly="false" description="Whether to attempt to prefill the connection pool. Changing this value require a server restart."/> + <c:simple-property name="pool-use-strict-min" required="false" type="boolean" readOnly="false" description="Define if the min-pool-size should be considered a strictly."/> + <c:simple-property name="interliving" required="false" type="boolean" readOnly="true" description="An element to enable interleaving for XA connection factories"/> + <c:simple-property name="no-tx-separate-pool" required="false" type="boolean" readOnly="true" description="Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different context"/> + <c:simple-property name="pad-xid" required="false" type="boolean" readOnly="true" description="Should the Xid be padded"/> + <c:simple-property name="same-rm-override" required="false" type="boolean" readOnly="true" description="The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false"/> + <c:simple-property name="wrap-xa-datasource" required="false" type="boolean" readOnly="true" description="Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance"/> + <c:simple-property name="user-name" required="false" type="string" readOnly="true" description="Specify the username used when creating a new connection."/> + <c:simple-property name="password" required="false" type="string" readOnly="true" description="Specify the passwprd used when creating a new connection."/> + <c:simple-property name="security-domain" required="false" type="string" readOnly="true" description="Indicates Subject (from security domain) are used to distinguish connections in the pool. The content of the security-domain is the name of the JAAS security manager that will handleauthentication. This name correlates to the JAAS login-config.xml descriptor application-policy/name attribute."/> + <c:simple-property name="recovery-plugin-class-name" required="false" type="string" readOnly="true" description="recovery plugin implementation provided for specific puropose (i.e vendor)"/> + <c:simple-property name="reauth-plugin-class-name" required="false" type="string" readOnly="true" description="re-authentication plugin implementation provided for specific puropose (i.e vendor)"/> + + <c:simple-property name="flush-strategy" required="false" type="string" readOnly="true" description="Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections, EntirePool"/> + <c:simple-property name="prepared-statements-cacheSize" required="false" type="long" readOnly="true" description="The number of prepared statements per connection in an LRU cache"/> + <c:simple-property name="share-prepared-statements" required="false" type="boolean" readOnly="true" description="Whether to share prepare statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement"/> + <c:simple-property name="track-statements" required="false" type="string" readOnly="true" description="Whether to check for unclosed statements when a connection is returned to the pool and result sets are closed when a statement is closed/return to the prepared statement cache. valid values are: false - do not track statements and results true - track statements and result sets and warn when they are not closed nowarn - track statements but do no warn about them being unclosed"/> + <c:simple-property name="allocation-retry" required="false" type="integer" readOnly="true" description="The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception."/> + <c:simple-property name="allocation-retry-wait-millis" required="false" type="long" readOnly="true" description="he allocation retry wait millis element indicates the time in milliseconds to wait between retrying to allocate a connection."/> + <c:simple-property name="blocking-timeout-wait-millis" required="false" type="long" readOnly="false" description="The blocking-timeout-millis element indicates the maximum time in milliseconds to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for a permit for a connection, and will never throw an exception if creating a new connection takes an inordinately long time."/> + <c:simple-property name="idle-timeout-minutes" required="false" type="long" readOnly="false" description="The idle-timeout-minutes elements indicates the maximum time in minutes a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is 1/2 the smallest idle-timeout-minutes of any pool. Changing this value require a server restart."/> + <c:simple-property name="query-timeout" required="false" type="long" readOnly="true" description="Any configured query timeout in seconds The default is no timeout"/> + <c:simple-property name="use-try-lock" required="false" type="long" readOnly="true" description="Any configured timeout for internal locks on the resource adapter objects in seconds"/> + <c:simple-property name="set-tx-query-timeout" required="false" type="boolean" readOnly="true" description="Whether to set the query timeout based on the time remaining until transaction timeout, any configured query timeout will be used if there is no transaction."/> + <c:simple-property name="transaction-isolation" required="false" type="string" readOnly="true" description="Set java.sql.Connection transaction isolation level to use. The constants defined by transaction-isolation-values are the possible transaction isolation levels and include: TRANSACTION_READ_UNCOMMITTED TRANSACTION_READ_COMMITTED TRANSACTION_REPEATABLE_READ TRANSACTION_SERIALIZABLE TRANSACTION_NONE"/> + <c:simple-property name="check-valid-connection-sql" required="false" type="string" readOnly="true" description="Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is taken from pool for use."/> + <c:simple-property name="exception-sorter-class-name" required="false" type="string" readOnly="true" description="An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides a boolean isExceptionFatal(SQLException e) method to validate is an exception should be broadcast to all javax.resource.spi.ConnectionEventListener as a connectionErrorOccurred"/> + + <c:simple-property name="stale-connection-checker-class-name" required="false" type="string" readOnly="true" description="An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides a boolean isStaleConnection(SQLException e) method which if it it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException"/> + + <c:simple-property name="valid-connection-checker-class-name" required="false" type="string" readOnly="true" description="An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides a SQLException isValidConnection(Connection e) method to validate is a connection is valid. An exception means the connection is destroyed. This overrides the check-valid-connection-sql when present."/> + + <c:simple-property name="background-validation-minutes" required="false" type="long" readOnly="false" description="The background-validation-minutes element specifies the amount of time, in minutes, that background validation will run. Changing this value require a server restart."/> + <c:simple-property name="background-validation" required="false" type="boolean" readOnly="false" description="An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value require a server restart."/> + <c:simple-property name="use-fast-fail" required="false" type="boolean" readOnly="false" description="Whether fail a connection allocation on the first connection if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)"/> + <c:simple-property name="validate-on-match" required="false" type="boolean" readOnly="true" description="The validate-on-match element indicates whether or not connection level validation should be done when a connection factory attempts to match a managed connection for a given set. This is typically exclusive to the use of background validation"/> + <c:simple-property name="xa-resource-timeout" required="false" type="integer" readOnly="true" description="Passed to XAResource.setTransactionTimeout() Default is zero which does not invoke the setter. In seconds"/> + <c:simple-property name="spy" required="false" type="boolean" readOnly="true" description="whatever spy or not the jdbc connection"/> + <c:simple-property name="use-ccm" required="false" type="boolean" readOnly="true" description="Enable the use of a cached connection manager"/> + <c:simple-property name="recovery-username" required="false" type="string" readOnly="true" description="username used to try connection recovery"/> + <c:simple-property name="recovery-password" required="false" type="string" readOnly="true" description="password used to try connection recovery"/> + <c:simple-property name="recovery-security-domain" required="false" type="string" readOnly="true" description="security-domain used to try connection recovery"/> + + <c:simple-property name="no-recovery" required="false" type="boolean" readOnly="true" description="if true no recovery are tried for this connection pool"/> + </resource-configuration> </service> <!-- diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/DatasourceDeployTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/DatasourceDeployTest.java index 6ce5619..28d3a9f 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/DatasourceDeployTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/DatasourceDeployTest.java @@ -41,7 +41,7 @@ import org.rhq.modules.plugins.jbossas7.json.WriteAttribute; * Integration test for deploying datasources and installing jdbc drivers * @author Heiko W. Rupp */ -@Test(enabled = UploadAndDeployTest.isEnabled, groups = {"integration.as7"}) +@Test(enabled = UploadAndDeployTest.isEnabled) public class DatasourceDeployTest extends AbstractIntegrationTest { private static final String POSTGRES = "postgres"; @@ -228,9 +228,7 @@ public class DatasourceDeployTest extends AbstractIntegrationTest { public void deployDatasourceViaOperation() throws Exception { ASConnection conn = getASConnection(); uploadDriverToDomain(conn); - Result res; Address sgAddress = addDriverToMainServerGroup(conn); - Operation op; // Now create the data source in the profile, that main-server-group is using. @@ -312,8 +310,45 @@ public class DatasourceDeployTest extends AbstractIntegrationTest { } + public void flushDSviaOperation() throws Exception { + // This test executes the "fall through" operation in the DatasourceComponent + + String theOperation = "flush-all-connection-in-pool"; + + ASConnection conn = getASConnection(); + uploadDriverToDomain(conn); + Address sgAddress = addDriverToMainServerGroup(conn); + + // Now create the data source in the profile, that main-server-group is using. + Address dsAddress = createDatasource(conn, false); + + System.out.println("Deployed new datasource at " + dsAddress.toString()); + + Thread.sleep(1000L); // give some time to settle + + // Now invoke the operation + DatasourceComponent dc = new DatasourceComponent(); + dc.path="profile=default,subsystem=datasources,data-source=" + POSTGRES; + dc.connection = conn; + + Configuration parameters = new Configuration(); + // Operation takes no parameters + OperationResult operationResult = dc.invokeOperation(theOperation,parameters); + assert operationResult != null; + assert operationResult.getSimpleResult()!=null; + assert operationResult.getErrorMessage()==null; + + + cleanupDatasource(conn,dsAddress); + cleanupSGDeployment(conn,sgAddress); + cleanupDomainDeployment(conn); + + } + private void cleanupDomainDeployment(ASConnection conn) { - Operation op;Result res;Address deployment = new Address("deployment",DRIVER); + Operation op; + Result res; + Address deployment = new Address("deployment",DRIVER); op = new Remove(deployment); res = conn.execute(op); assert res != null; diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/UploadAndDeployTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/UploadAndDeployTest.java index a8b5faf..61c2d0c 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/UploadAndDeployTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/UploadAndDeployTest.java @@ -43,7 +43,7 @@ import org.rhq.modules.plugins.jbossas7.json.Result; * the UPLOAD_FILE must point to a valid archive in the resources directory. * @author Heiko W. Rupp */ -@Test(enabled = UploadAndDeployTest.isEnabled, groups = {"integration.as7"}) // TODO add an "integration test profile" that is able to fire the server before running the test +@Test(enabled = UploadAndDeployTest.isEnabled) public class UploadAndDeployTest extends AbstractIntegrationTest { private String TEST_WAR = "test-simple.war"; commit 8aede51d7d3b1251d580c9546dfc99baa5cab9bb Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 11 10:36:48 2011 -0400 Fixing oracle test failures diff --git a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml index 51e689e..3baa4a9 100644 --- a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml +++ b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml @@ -5,7 +5,7 @@ port="16163" remote_endpoint="http://here" agenttoken="tok" - backfilled="false" + backfilled="0" ctime="123456" mtime="123456"/> @@ -20,37 +20,37 @@ category="PLATFORM" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="test" - deleted="false"/> + deleted="0"/> <rhq_resource_type id="2" name="test server" category="SERVER" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="test" - deleted="false"/> + deleted="0"/> <rhq_resource_type id="3" name="test service 1" category="SERVICE" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="test" - deleted="false"/> + deleted="0"/> <rhq_resource_type id="4" name="test service 2" category="SERVICE" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="test" - deleted="false"/> + deleted="0"/> <rhq_resource_type_parents resource_type_id="2" parent_resource_type_id="1"/> @@ -90,7 +90,7 @@ deployment="AGENT" name="test" display_name="test" - enabled="true" + enabled="1" status="INSTALLED" path="/plugins/test.jar" md5="1234567" diff --git a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml index 0cfe2f1..5ff4442 100644 --- a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml +++ b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml @@ -10,55 +10,55 @@ category="SERVER" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="TestPlugin1" - deleted="false"/> + deleted="0"/> <rhq_resource_type id="2" name="TestService1" category="SERVICE" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="TestPlugin1" - deleted="false"/> + deleted="0"/> <rhq_resource_type id="3" name="TestService2" category="SERVICE" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="TestPlugin1" - deleted="false"/> + deleted="0"/> <rhq_resource_type id="4" name="TestServer2" category="SERVER" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="TestPlugin1" - deleted="false"/> + deleted="0"/> <rhq_resource_type id="5" name="TestService3" category="SERVICE" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="TestPlugin1" - deleted="false"/> + deleted="0"/> <rhq_resource_type id="6" name="TestServer3" category="SERVER" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="TestPlugin1" - deleted="false"/> + deleted="0"/> <rhq_resource_type_parents resource_type_id="2" @@ -84,13 +84,13 @@ name="TestServer1" uuid="test-server-1" resource_key="test-server-1" - connected="true"/> + connected="1"/> <rhq_resource id="2" resource_type_id="2" name="TestService1" uuid="test-service-1" resource_key="test-service-1" - connected="true" + connected="1" parent_resource_id="1"/> <rhq_resource_subcat/> commit 3834260c090c1b3a939e94191194bb62b39ae178 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Jul 11 16:03:03 2011 +0200 Disable tests that require AS7 for now diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/UploadAndDeployTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/UploadAndDeployTest.java index 31d8acf..a8b5faf 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/UploadAndDeployTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/UploadAndDeployTest.java @@ -48,7 +48,7 @@ public class UploadAndDeployTest extends AbstractIntegrationTest { private String TEST_WAR = "test-simple.war"; - protected static final boolean isEnabled = true; + protected static final boolean isEnabled = false; @Test(timeOut = 60*1000L, enabled=isEnabled) public void testUploadOnly() throws Exception { commit 72b2ea2fb03a74d8fb26c21a253893d10bd6e934 Author: Fusayuki Minamoto <fminamot(a)redhat.com> Date: Mon Jul 11 14:46:10 2011 +0200 Huge update on Japanese translations. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index b9fc4a3..ce2b078 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -8,14 +8,14 @@ # http://rhq-project.org/display/RHQ/Working+with+the+Resource+Bundles # ################################### -common_alert_high = High -common_alert_low = Low -common_alert_medium = Medium +common_alert_high = 高 +common_alert_low = 低 +common_alert_medium = 中 common_buildInfo_gwtVersion = ${gwt.version} common_button_ack = 確認 common_button_ack_all = すべてを確認 common_button_add = 追加 -common_button_advanced = Advanced... +common_button_advanced = 高度な設定... common_button_apply = 適用 common_button_cancel = キャンセル common_button_close = 閉じる @@ -41,65 +41,65 @@ common_button_search = 検索 common_button_set = 設定 common_button_showDetails = 詳細表示... common_button_uninventory = アンインベントリ -common_calendar_april_short = apr -common_calendar_august_short = aug -common_calendar_december_short = dec -common_calendar_february_short = feb -common_calendar_january_short = jan -common_calendar_july_short = jul -common_calendar_june_short = jun -common_calendar_march_short = mar -common_calendar_may_short = may -common_calendar_november_short = nov -common_calendar_october_short = oct -common_calendar_september_short = sept -common_label_ago = ago +common_calendar_april_short = 4月 +common_calendar_august_short = 8月 +common_calendar_december_short = 12月 +common_calendar_february_short = 2月 +common_calendar_january_short = 1月 +common_calendar_july_short = 7月 +common_calendar_june_short = 6月 +common_calendar_march_short = 3月 +common_calendar_may_short = 5月 +common_calendar_november_short = 11月 +common_calendar_october_short = 10月 +common_calendar_september_short = 9月 +common_label_ago = 前 common_label_all = すべての -common_label_all_resources = all resources -common_label_day = day -common_label_days = days -common_label_hour = hour -common_label_hours = hours -common_label_item = item -common_label_items = items -common_label_milliseconds = milliseconds -common_label_minutes = minutes -common_label_month = month -common_label_none = none -common_label_role = role -common_label_roles = roles -common_label_scheduled_operations = scheduled operations -common_label_seconds = seconds -common_label_selected_resources = selected resources -common_label_unlimited = unlimited -common_label_user = user -common_label_users = users -common_label_week = week -common_label_weeks = weeks -common_label_yesterday = Yesterday -common_msg_areYouSure = Are You Sure? -common_msg_changeAutoDetected = Change auto-detected -common_msg_deleteConfirm = Are you sure you want to delete the # selected {0}? -common_msg_emphasizedNotePrefix = NOTE: -common_msg_loading = Loading... -common_msg_noItemsToShow = No items to show +common_label_all_resources = すべてのリソース +common_label_day = 日 +common_label_days = 日 +common_label_hour = 時間 +common_label_hours = 時間 +common_label_item = 項目 +common_label_items = 項目 +common_label_milliseconds = ミリ秒 +common_label_minutes = 分 +common_label_month = 月 +common_label_none = なし +common_label_role = ロール +common_label_roles = ロール +common_label_scheduled_operations = スケジュールされた操作 +common_label_seconds = 秒 +common_label_selected_resources = 選択されたリソース +common_label_unlimited = 無制限 +common_label_user = ユーザー +common_label_users = ユーザー +common_label_week = 週 +common_label_weeks = 週 +common_label_yesterday = 昨日 +common_msg_areYouSure = よろしいですか? +common_msg_changeAutoDetected = 変更が自動検出されました +common_msg_deleteConfirm = を削除してもよろしいですか # selected {0}? +common_msg_emphasizedNotePrefix = 注意: +common_msg_loading = ロード中... +common_msg_noItemsToShow = 表示する項目はありません common_msg_notYetImplemented = Not Yet Implemented -common_msg_see_more = see more... -common_msg_step_x_of_y = Step {0} of {1} +common_msg_see_more = 詳細... +common_msg_step_x_of_y = ステップ {1} 中 {0} 番め common_severity_debug = Debug common_severity_error = Error common_severity_fatal = Fatal common_severity_info = Info common_severity_warn = Warn -common_status_canceled = Canceled -common_status_deferred = Deferred -common_status_failed = Failed -common_status_inprogress = In Progress -common_status_nochange = No Change -common_status_partial = Partial -common_status_success = Success -common_status_timedOut = Timed Out -common_status_unknown = Unknown +common_status_canceled = キャンセル +common_status_deferred = 延期 +common_status_failed = 失敗 +common_status_inprogress = 進行中 +common_status_nochange = 変更なし +common_status_partial = 部分的 +common_status_success = 成功 +common_status_timedOut = タイムアウト +common_status_unknown = 未知 common_title_add_column = カラム追加 common_title_add_portlet = ポートレット追加 common_title_address = アドレス @@ -123,7 +123,7 @@ common_title_configuration = 構成 common_title_count = 数 common_title_custom = カスタム common_title_dashboard_name = ダッシュボード名 -common_title_dateCreated = 生成日 +common_title_dateCreated = 作成日 common_title_dateRange = 日付の範囲 common_title_default = デフォルト common_title_description = 説明 @@ -226,48 +226,48 @@ common_title_version = バージョン common_title_view_mode = ビューモード common_title_web_address = Webアドレス common_title_welcome = ようこそ -common_unit_days = days -common_unit_hours = hours -common_unit_milliseconds = milliseconds -common_unit_minutes = minutes -common_unit_months = months -common_unit_seconds = seconds -common_unit_times = times -common_unit_weeks = weeks -common_unit_years = years +common_unit_days = 日 +common_unit_hours = 時間 +common_unit_milliseconds = ミリ秒 +common_unit_minutes = 分 +common_unit_months = 月 +common_unit_seconds = 秒 +common_unit_times = 回 +common_unit_weeks = 週 +common_unit_years = 年 common_val_for = for -common_val_n1st = {0}st -common_val_n2nd = {0}nd -common_val_n3rd = {0}rd +common_val_n1st = {0}番 +common_val_n2nd = {0}番 +common_val_n3rd = {0}番 common_val_na = N/A -common_val_never = Never -common_val_no = No -common_val_no_lower = no -common_val_none = None -common_val_nth = {0}th -common_val_yes = Yes -common_val_yes_lower = yes -dataSource_ContentRepoTree_error_load = Error loading repositories -dataSource_ContentRepoTree_field_parentId = Parent ID -dataSource_bundle_loadFailed = Failed to load Bundle data -dataSource_configurationHistory_clickToSeeError = Double click to see error message... -dataSource_configurationHistory_currentConfig = This is the current configuration +common_val_never = 決してない +common_val_no = いいえ +common_val_no_lower = いいえ +common_val_none = なし +common_val_nth = {0}番 +common_val_yes = はい +common_val_yes_lower = はい +dataSource_ContentRepoTree_error_load = リポジトリのロードエラー +dataSource_ContentRepoTree_field_parentId = 親 ID +dataSource_bundle_loadFailed = バンドルデータをロードするのに失敗しました。 +dataSource_configurationHistory_clickToSeeError = エラーメッセージを念のために再確認してください +dataSource_configurationHistory_currentConfig = これは現在の構成です dataSource_configurationHistory_dateCompleted = 完了日 dataSource_configurationHistory_dateSubmitted = 発行日 -dataSource_configurationHistory_error_fetchFailure = Unable to load configuration history. +dataSource_configurationHistory_error_fetchFailure = 構成履歴のロードができません dataSource_configurationHistory_updateType = 更新タイプ dataSource_configurationHistory_updateType_group = グループ dataSource_configurationHistory_updateType_individual = 個人 -dataSource_definitions_loadFailed = Failed to load metric definitions -dataSource_measurementOob_error_fetchFailure = Failed to load measurement OOB information +dataSource_definitions_loadFailed = メトリック定義のロードに失敗しました +dataSource_measurementOob_error_fetchFailure = OOB情報の測定のロードに失敗しました dataSource_measurementOob_field_factor = 範囲外係数 (%) dataSource_measurementOob_field_formattedBaseband = バンド -dataSource_measurementOob_field_formattedOutlier = アウトライナ +dataSource_measurementOob_field_formattedOutlier = アウトライナー dataSource_measurementOob_field_parentName = 親 dataSource_measurementOob_field_resourceName = リソース dataSource_measurementOob_field_scheduleName = メトリック -dataSource_operationHistory_error_fetchFailure = Failure loading operation histories. -dataSource_operationHistory_field_createdTime = 生成時刻 +dataSource_operationHistory_error_fetchFailure = オペレーション履歴のロードに失敗 +dataSource_operationHistory_field_createdTime = 作成時刻 dataSource_operationHistory_field_operationName = オペレーション名 dataSource_operationHistory_field_startedTime = 開始時刻 dataSource_operationHistory_field_subject = 要求者 @@ -281,64 +281,64 @@ dataSource_operationSchedule_field_timeout = タイムアウト (秒) dataSource_platforms_field_cpu = CPU dataSource_platforms_field_memory = メモリ dataSource_platforms_field_swap = スワップ -dataSource_problemResources_error_fetchFailure = Failed to load Resources with alerts/unavailability. +dataSource_problemResources_error_fetchFailure = アラートを発している、または利用不能のリソースのロードに失敗しました dataSource_problemResources_field_alerts = アラート dataSource_problemResources_field_available = 現在のアベイラビリティ -dataSource_recentOperations_error_fetchFailure = Failed to load recently completed operations. +dataSource_recentOperations_error_fetchFailure = 最近完了したオペレーションのロードに失敗しました dataSource_recentOperations_field_location = ロケーション dataSource_recentOperations_field_operation = オペレーション dataSource_recentOperations_field_resource = リソース dataSource_recentOperations_field_status = ステータス dataSource_recentOperations_field_time = 日付/時刻 -dataSource_resourceErrors_clickStatusIcon = Click the icon for more details -dataSource_resourceErrors_deleteFailure = Failed to delete resource errors -dataSource_resourceErrors_deleteSuccess = You have successfully deleted [{0}] resource error messages. -dataSource_resourceErrors_error_fetchFailure = Failed to find Resource errors for Resource with id [{0}]. +dataSource_resourceErrors_clickStatusIcon = 詳細はアイコンをクリックしてください +dataSource_resourceErrors_deleteFailure = リソースエラーの削除に失敗しました +dataSource_resourceErrors_deleteSuccess = [{0}] リソースエラーメッセージを削除するのに失敗しました +dataSource_resourceErrors_error_fetchFailure = ID [{0}] を持つリソースのリソースエラーを見つけるのに失敗しました dataSource_resourceErrors_field_errorType = エラータイプ dataSource_resourceErrors_field_summary = サマリ dataSource_resourceErrors_field_timeOccured = 時刻 -dataSource_resourceGroups_loadFailed = Failed to load Resource Groups +dataSource_resourceGroups_loadFailed = リソースグループのロードに失敗しました dataSource_resources_field_discoveryTime = 発見時刻 dataSource_resources_field_importTime = インポート時刻 dataSource_resources_field_key = キー dataSource_resources_field_lastModifiedTime = 最終更新時刻 dataSource_resources_field_lastModifier = 最終更新者 dataSource_resources_field_location = 場所 -dataSource_rpc_error_transformRequestFailure = Failure in datasource while processing {0} request. -dataSource_rpc_error_unsupportedArrayFilterType = No support for passing array filters of type {0}. -dataSource_rpc_error_unsupportedEnumType = Please add an appropriate code block for enum {0} to RPCDataSource.getEnumArray(Class) -dataSource_rpc_no = no -dataSource_rpc_yes = yes -dataSource_scheduledOperations_error_fetchFailure = Failed to load scheduled operations. +dataSource_rpc_error_transformRequestFailure = {0} リクエストの処理中にデータソースで失敗しました +dataSource_rpc_error_unsupportedArrayFilterType = タイプ {0} の配列フィルタの引き渡しはサポートしていません +dataSource_rpc_error_unsupportedEnumType = RPCDataSource.getEnumArray(Class)へ enum {0} のための適切なコードブロックを追加してください +dataSource_rpc_no = いいえ +dataSource_rpc_yes = はい +dataSource_scheduledOperations_error_fetchFailure = スケジュールされたオペレーションのロードに失敗しました dataSource_scheduledOperations_field_location = 場所 dataSource_scheduledOperations_field_operation = オペレーション dataSource_scheduledOperations_field_resource = リソース dataSource_scheduledOperations_field_time = 日付/時刻 -dataSource_schedules_disableFailure_group = Failed to disable the collection of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}] -dataSource_schedules_disableFailure_resource = Failed to disable the collection of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}] -dataSource_schedules_disableSuccessful_concise = You have disabled the collection of [{0}] measurements -dataSource_schedules_disableSuccessful_full_group = You have disabled the collection of [{0}] measurements for the resource group with ID [{1}]. The disabled measurements are: [{2}] -dataSource_schedules_disableSuccessful_full_resource = You have disabled the collection of [{0}] measurements for the resource with ID [{1}]. The disabled measurements are: [{2}] -dataSource_schedules_enableFailure_group = Failed to enable the collection of [{0}] metrics for group with ID [{1}]. The metrics were: [{2}] -dataSource_schedules_enableFailure_resource = Failed to enable the collection of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}] -dataSource_schedules_enableSuccessful_concise = You have enabled the collection of [{0}] measurements -dataSource_schedules_enableSuccessful_full_group = You have enabled the collection of [{0}] measurements for the resource group with ID [{1}]. The enabled measurements are: [{2}] -dataSource_schedules_enableSuccessful_full_resource = You have enabled the collection of [{0}] measurements for the resource with ID [{1}]. The enabled measurements are: [{2}] -dataSource_schedules_field_resourceGroupId = Group ID -dataSource_schedules_loadFailed = Failed to load metric schedules -dataSource_schedules_loadFailedContext = Failed to load metric schedules for context [{0}] -dataSource_schedules_loadFailedCriteria = Failed to load metric schedules for criteria [{0}] -dataSource_schedules_updateFailure_group = Failed to set the collection interval of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]. The collection interval was to be [{3}] seconds. -dataSource_schedules_updateFailure_resource = Failed to set the collection interval of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]. The collection interval was to be [{3}] seconds. -dataSource_schedules_updateSuccessful_concise = A new collection interval of [{0}] seconds has been set on [{1}] measurements -dataSource_schedules_updateSuccessful_full_group = A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource group with ID [{2}]. The updated measurements are: [{3}] -dataSource_schedules_updateSuccessful_full_resource = A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource with ID [{2}]. The updated measurements are: [{3}] -dataSource_traits_failFetch = Failed to fetch traits for criteria [{0}]. -dataSource_traits_field_definitionID = Definition ID -dataSource_traits_field_lastChanged = Last Changed -dataSource_traits_field_primaryKey = Primary Key -dataSource_traits_field_trait = Trait -dataSource_traits_group_field_groupId = Group ID +dataSource_schedules_disableFailure_group = ID [{1}] を持つリソースグループの [{0}] メトリックスの収集を無効にするのに失敗しました。有効になったメトリックスは [{2}] です。 +dataSource_schedules_disableFailure_resource = ID [{1}] を持つリソースの [{0}] メトリックスの収集を無効にするのに失敗しました。有効になったメトリックスは [{2}] です。 +dataSource_schedules_disableSuccessful_concise = [{0}] 測定の収集を無効にしました +dataSource_schedules_disableSuccessful_full_group = ID [{1}] を持つリソースグループの [{0}] メトリックスの収集を無効にしました。無効になったメトリックスは [{2}] です。 +dataSource_schedules_disableSuccessful_full_resource = ID [{1}] を持つリソースの [{0}] メトリックスの収集を無効にしました。無効になったメトリックスは [{2}] です。 +dataSource_schedules_enableFailure_group = ID [{1}] を持つグループのための [{0}] メトリックスの収集を有効にするのに失敗しました。メトリックスは [{2}] でした。 +dataSource_schedules_enableFailure_resource = ID [{1}] を持つリソースのための [{0}] メトリックスの収集を有効にするのに失敗しました。メトリックスは [{2}] でした。 +dataSource_schedules_enableSuccessful_concise = [{0}] 測定の収集を有効にしました +dataSource_schedules_enableSuccessful_full_group = ID [{1}] を持つリソースグループの [{0}] 測定の収集を有効にしました。有効になった測定は [{2}] です。 +dataSource_schedules_enableSuccessful_full_resource = ID [{1}] を持つリソースの [{0}] 測定の収集を有効にしました。有効になった測定は [{2}] です。 +dataSource_schedules_field_resourceGroupId = グループID +dataSource_schedules_loadFailed = メトリックスケジュールのロードに失敗しました +dataSource_schedules_loadFailedContext = コンテキスト [{0}] のためのメトリックスケジュールのロードに失敗しました +dataSource_schedules_loadFailedCriteria = クライテリア [{0}] のためのメトリックスケジュールのロードに失敗しました +dataSource_schedules_updateFailure_group = ID [{1}] を持つリソースグループの [{0}] メトリックスの収集間隔の設定に失敗しました。メトリックスは [{2}] 、収集間隔は [{3}] でした。 +dataSource_schedules_updateFailure_resource = ID [{1}] を持つリソースの [{0}] メトリックスの収集間隔の設定にに失敗しました。メトリックスは [{2}]、収集間隔は [{3}] でした。 +dataSource_schedules_updateSuccessful_concise = [{0}] 秒の新しい収集間隔が [{1}] 測定に設定されました +dataSource_schedules_updateSuccessful_full_group = [{0}] 秒の新しい収集間隔が　ID [{2}] を持つリソースグループの [{1}] 測定に設定されました。更新された測定は [{3}] です。 +dataSource_schedules_updateSuccessful_full_resource = [{0}] 秒の新しい収集間隔が　ID [{2}] を持つリソースの [{1}] 測定に設定されました。更新された測定は [{3}] です。 +dataSource_traits_failFetch = クライテリア [{0}] のためのトレイトをフェッチするのに失敗しました +dataSource_traits_field_definitionID = 定義ID +dataSource_traits_field_lastChanged = 最終更新 +dataSource_traits_field_primaryKey = 主キー +dataSource_traits_field_trait = トレイト +dataSource_traits_group_field_groupId = グループ ID dataSource_users_delete = 削除済みユーザー [{0}] dataSource_users_deleteFailed = ユーザー [{0}] の削除に失敗しました dataSource_users_field_department = 部門 @@ -358,34 +358,34 @@ datasource_roles_field_ldapGroups = LDAPグループ datasource_roles_field_permissions = パーミッション datasource_roles_field_resourceGroups = リソースグループ datasource_roles_field_subjects = サブジェクト -datasource_templateSchedules_disabled = Disabled collection of selected metric [{0}]. -datasource_templateSchedules_disabled_detailed = Disabled collection of metric [{0}] [{1}] by default for ResourceType with id [{2}]. -datasource_templateSchedules_disabled_failed = Failed to disable collection of metric [{0}] [{1}] by default for ResourceType with id [{2}]. -datasource_templateSchedules_enabled = Enabled collection of selected metric [{0}]. -datasource_templateSchedules_enabled_detailed = Enabled collection of metric [{0}] [{1}] by default for ResourceType with id [{2}]. -datasource_templateSchedules_enabled_failed = Failed to enable collection of metric [{0}] [{1}] by default for ResourceType with id [{2}]. -datasource_templateSchedules_updated = Updated collection intervals of selected metric [{0}]. -datasource_templateSchedules_updated_detail = Collection interval for metric [{0}] [{1}] by default for ResourceType with id [{2}] set to [{3}] seconds. -datasource_templateSchedules_updated_failed = Failed to set collection interval to [{0}] seconds for metric [{1}] [{2}] by default for ResourceType with id [{3}]. +datasource_templateSchedules_disabled = 選択されたメトリック [{0}] の収集を無効にしました +datasource_templateSchedules_disabled_detailed = ID [{2}] を持つリソースタイプのためにデフォルトでメトリック [{0}] [{1}] の収集を無効にしました +datasource_templateSchedules_disabled_failed = ID [{2}] を持つリソースタイプのためにデフォルトでメトリック [{0}] [{1}] の収集を無効にするのに失敗しました +datasource_templateSchedules_enabled = 選択されたメトリック [{0}] の収集を有効にしました +datasource_templateSchedules_enabled_detailed = ID [{2}] を持つリソースタイプのためにデフォルトでメトリック [{0}] [{1}] の収集を有効にしました +datasource_templateSchedules_enabled_failed = ID [{2}] を持つリソースタイプのためにデフォルトでメトリック [{0}] [{1}] の収集を有効にするのに失敗しました +datasource_templateSchedules_updated = 選択されたメトリック [{0}] の収集間隔を更新しました +datasource_templateSchedules_updated_detail = ID [{2}] を持つリソースタイプのためにデフォルトでメトリック [{0}] [{1}] の収集間隔が [{3}] 秒に設定されました +datasource_templateSchedules_updated_failed = ID [{2}] を持つリソースタイプのためにデフォルトでメトリック [{0}] [{1}] の収集間隔が [{3}] 秒に設定するのに失敗しました favorites = お気に入り favorites_groups = お気に入りグループ favorites_recentlyViewed = 最近閲覧した favorites_resources = お気に入りリソース -group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource -util_ancestry_parentAncestry = Parent Ancestry for: -util_disambiguationReportDecorator_pluginSuffix = ({0} plugin) -util_errorHandler_nullException = exception was null -util_monitoringRequestCallback_error_checkServerStatusFailure = Unable to determine login status - check Server status. -util_rpcManager_activeRequests = {0} Active Requests -util_userPerm_loadFailGlobal = Failed to load your global permissions - none granted. -util_userPerm_loadFailGroup = Failed to load your permissions for Resource Group with id [{0}] - none granted. -util_userPerm_loadFailResource = Failed to load your permissions for Resource with id [{0}] - none granted. -util_userSession_loadFailSubject = UserSessionManager: Failed to load user Subject -util_userSession_logoutFail = Failed to logout. -util_widgetsField_unlimited = Unlimited +group_tree_partialClusterTooltip = {1} の中の {0} グループメンバーが ''{2}'' リソースを持っています +util_ancestry_parentAncestry = 親の祖先 : +util_disambiguationReportDecorator_pluginSuffix = ({0} プラグイン) +util_errorHandler_nullException = 例外は null でした +util_monitoringRequestCallback_error_checkServerStatusFailure = ログインの状態を決定できません - サーバーの状態を調べてください +util_rpcManager_activeRequests = {0} アクティブリクエスト +util_userPerm_loadFailGlobal = グローバルな権限をロードするのに失敗しました - 何も許可されません +util_userPerm_loadFailGroup = ID [{0}] のリソースグループに対する権限をロードするのに失敗しました - 何も許可されません +util_userPerm_loadFailResource = ID [{0}] のリソースに対する権限をロードするのに失敗しました - 何も許可されません +util_userSession_loadFailSubject = UserSessionManager: ユーザー Subject のロードに失敗しました +util_userSession_logoutFail = ログアウトに失敗しました +util_widgetsField_unlimited = 無制限 view_aboutBox_allRightsReserved = All Rights Reserved. view_aboutBox_buildNumber = ビルド番号: -view_aboutBox_failedToLoad = Failed to load product information. +view_aboutBox_failedToLoad = プロダクト情報のロードに失敗しました view_aboutBox_homepage = ホームページ view_aboutBox_jbossByRedHat = JBoss by Red Hat view_aboutBox_title = {0}について @@ -396,76 +396,76 @@ view_adminConfig_systemSettings = システム設定 view_adminConfig_templates = テンプレート view_adminContent_contentSources = コンテントソース view_adminContent_repositories = リポジトリ -view_adminRoles_assignedGroups = Assigned Resource Groups -view_adminRoles_assignedSubjects = Assigned Subjects -view_adminRoles_failLdap = Failed to determine if LDAP configured - assuming no LDAP. -view_adminRoles_failLdapGroups = Failed to retrieve available LDAP groups - assuming no LDAP groups. -view_adminRoles_failLdapGroupsRole = Failed to load LDAP groups available for role. -view_adminRoles_failRoles = Failed to fetch roles. -view_adminRoles_globalPerms = Global Permissions -view_adminRoles_ldapGroups = LDAP Groups -view_adminRoles_ldapGroupsReadOnly = LDAP group data is read only -view_adminRoles_noItems = No items to show -view_adminRoles_noLdap = The LDAP security integration is not configured. To configure LDAP, go to <a {0}>{1}</a>. -view_adminRoles_permissions_autoselecting_configureRead_implied = Autodeselected CONFIGURE_WRITE permission, since lack of CONFIGURE_READ implies lack of it... -view_adminRoles_permissions_autoselecting_configureWrite_implied = Autoselected CONFIGURE_READ permission, since CONFIGURE_WRITE implies it... -view_adminRoles_permissions_autoselecting_manageInventory_implied = Autoselected unselected Resource permissions, since MANAGE_INVENTORY implies all Resource permissions... -view_adminRoles_permissions_autoselecting_manageSecurity_implied = Autoselected unselected permissions, since MANAGE_SECURITY implies all other permissions... -view_adminRoles_permissions_globalPermissions = Global Permissions -view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} read permission cannot be deselected, unless the {0} write permission, which implies the read permission, is deselected first. -view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} permission cannot be deselected, unless Manage Inventory, which implies all Resource permissions, is deselected first. -view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} permission cannot be deselected, unless the Manage Security permission, which implies all other permissions, is deselected first. -view_adminRoles_permissions_isAuthorized = Authorized? -view_adminRoles_permissions_isRead = Read? -view_adminRoles_permissions_isWrite = Write? -view_adminRoles_permissions_permDesc_manageBundles = can create, update, or delete provisioning bundles (viewing is implied for everyone) -view_adminRoles_permissions_permDesc_manageInventory = has all Resource permissions, as described below, for all Resources; can create, update, and delete groups; and can import auto-discovered or manually discovered Resources -view_adminRoles_permissions_permDesc_manageRepositories = can create, update, or delete repositories of any user (everyone can create their own repositories), can associate content sources to repositories. -view_adminRoles_permissions_permDesc_manageSecurity = can create, update, or delete users and roles (viewing is implied for everyone) -view_adminRoles_permissions_permDesc_manageSettings = can modify the RHQ Server configuration and perform any Server-related functionality -view_adminRoles_permissions_permReadDesc_configure = view Resource configuration and Resource configuration revision history -view_adminRoles_permissions_permReadDesc_control = (IMPLIED) view available operations and operation execution history -view_adminRoles_permissions_permReadDesc_createChildResources = (IMPLIED) view child Resource creation history -view_adminRoles_permissions_permReadDesc_deleteChildResources = (IMPLIED) view child Resource deletion history -view_adminRoles_permissions_permReadDesc_inventory = (IMPLIED) view Resource properties (name, description, version, etc.), connection settings, and connection settings history -view_adminRoles_permissions_permReadDesc_manageAlerts = (IMPLIED) view alert definitions and alert history -view_adminRoles_permissions_permReadDesc_manageContent = (IMPLIED) view installed and available packages; view package installation history -view_adminRoles_permissions_permReadDesc_manageEvents = (IMPLIED) view events -view_adminRoles_permissions_permReadDesc_manageMeasurements = (IMPLIED) view metric data and collection schedules -view_adminRoles_permissions_permWriteDesc_configure = update Resource configuration; delete Resource configuration revision history items -view_adminRoles_permissions_permWriteDesc_control = execute operations; delete operation execution history items -view_adminRoles_permissions_permWriteDesc_createChildResources = create new child Resources (for child Resources of types that are creatable) -view_adminRoles_permissions_permWriteDesc_deleteChildResources = uninventory resources; delete Resources (for Resources of types that are deletable) -view_adminRoles_permissions_permWriteDesc_inventory = update Resource name, version, description, and connection settings; delete connection settings history items -view_adminRoles_permissions_permWriteDesc_manageAlerts = create, update, and delete alert definitions; acknowledge and delete alert history items -view_adminRoles_permissions_permWriteDesc_manageContent = subscribe to content sources; install and uninstall packages -view_adminRoles_permissions_permWriteDesc_manageEvents = delete events -view_adminRoles_permissions_permWriteDesc_manageMeasurements = update metric collection schedules -view_adminRoles_permissions_perm_configure = Configure -view_adminRoles_permissions_perm_control = Control -view_adminRoles_permissions_perm_createChildResources = Create Child Resources -view_adminRoles_permissions_perm_deleteChildResources = Delete Child Resources -view_adminRoles_permissions_perm_inventory = Inventory -view_adminRoles_permissions_perm_manageAlerts = Manage Alerts -view_adminRoles_permissions_perm_manageBundles = Manage Bundles -view_adminRoles_permissions_perm_manageContent = Manage Content -view_adminRoles_permissions_perm_manageEvents = Manage Events -view_adminRoles_permissions_perm_manageInventory = Manage Inventory -view_adminRoles_permissions_perm_manageMeasurements = Manage Measurements -view_adminRoles_permissions_perm_manageRepositories = Manage Repositories -view_adminRoles_permissions_perm_manageSecurity = Manage Security -view_adminRoles_permissions_perm_manageSettings = Manage Settings +view_adminRoles_assignedGroups = 割り当てられたリソースグループ +view_adminRoles_assignedSubjects = 割り当てられたSubjects +view_adminRoles_failLdap = LDAPが構成されたかどうかの決定に失敗しました - LDAPが無いことを仮定します +view_adminRoles_failLdapGroups = 利用可能なLDAPグループを読み出すのに失敗しました - LDAPグループが無いことを仮定します +view_adminRoles_failLdapGroupsRole = ロールのために利用可能なLDAPグループをロードするのに失敗しました +view_adminRoles_failRoles = ロールの取り出しに失敗しました +view_adminRoles_globalPerms = グローバル権限 +view_adminRoles_ldapGroups = LDAPグループ +view_adminRoles_ldapGroupsReadOnly = LDAPグループデータは読み出し専用です +view_adminRoles_noItems = 表示するアイテムはありません +view_adminRoles_noLdap = LDAPセキュリティの統合は構成されていません。LDAPを構成するには、 <a {0}>{1}</a>に行ってください。 +view_adminRoles_permissions_autoselecting_configureRead_implied = CONFIGURE_WRITE権限が自動的に選択されました。なぜなら、CONFIGURE_READが無いことがそれを暗示しているからです。 +view_adminRoles_permissions_autoselecting_configureWrite_implied = CONFIGURE_READ権限が自動的に選択されました。なぜなら、CONFIGURE_WRITEがそれを暗示しているからです。 +view_adminRoles_permissions_autoselecting_manageInventory_implied = 未選択のリソース権限が自動的に選択されました。なぜなら、MANAGE_INVENTORYはすべてのリソース権限を暗示しているからです。 +view_adminRoles_permissions_autoselecting_manageSecurity_implied = 未選択の権限が自動的に選択されました。なぜなら、MANAGE_SECURITYは他のすべての権限を暗示しているからです。 +view_adminRoles_permissions_globalPermissions = グローバル権限 +view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} 読み取り権限は選択解除できませんでした。読み取り権限を暗示する {0} 書き込み権限が最初に選択解除されなければそれはできません。 +view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} 権限は選択解除できませんでした。他のすべてのリソースを暗示する管理インベントリが最初に選択解除されなければそれはできません。 +view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} 権限は選択解除できませんでした。他のすべての権限を暗示する管理セキュリティ権限が最初に選択解除されなければそれはできません。 +view_adminRoles_permissions_isAuthorized = 権限があるか? +view_adminRoles_permissions_isRead = 読み出しですか? +view_adminRoles_permissions_isWrite = 書き込みですか? +view_adminRoles_permissions_permDesc_manageBundles = (誰でも閲覧可能な)プロビジョニングバンドルの作成、更新、削除が可能です +view_adminRoles_permissions_permDesc_manageInventory = すべてのリソースについて、以下に示すように、すべてのリソース権限を持ちます。つまり、グループの作成、更新、削除、そして自動検出された、または手動で検出されたリソースのインポートができます +view_adminRoles_permissions_permDesc_manageRepositories = (自分自身のリポジトリを作成可能な)ユーザーのリポジトリの作成、更新、削除が可能です。 +view_adminRoles_permissions_permDesc_manageSecurity = (誰でも閲覧可能な)ユーザーとロールの作成、更新、削除 +view_adminRoles_permissions_permDesc_manageSettings = RHQサーバー構成の修正と任意のサーバー関連の機能の実行ができます +view_adminRoles_permissions_permReadDesc_configure = リソース構成とリソース構成リビジョン履歴の閲覧 +view_adminRoles_permissions_permReadDesc_control = 利用可能オペレーションとオペレーション実行履歴の(暗黙的な)閲覧 +view_adminRoles_permissions_permReadDesc_createChildResources = (暗黙的な)子リソースの作成履歴の閲覧 +view_adminRoles_permissions_permReadDesc_deleteChildResources = (暗黙的な)子リソースの削除履歴の閲覧 +view_adminRoles_permissions_permReadDesc_inventory = リソースプロパティ(名前、説明、バージョンなど)、コネクション設定、コネクション設定履歴の(暗黙的な)閲覧 +view_adminRoles_permissions_permReadDesc_manageAlerts = アラート定義とアラート履歴の(暗黙的な)閲覧 +view_adminRoles_permissions_permReadDesc_manageContent = (暗黙的な)インストールされて利用可能なパッケージ。パッケージインストール履歴の閲覧。 +view_adminRoles_permissions_permReadDesc_manageEvents = (暗黙的な)イベントの閲覧 +view_adminRoles_permissions_permReadDesc_manageMeasurements = メトリックデータと収集スケジュールの(暗黙的な)閲覧 +view_adminRoles_permissions_permWriteDesc_configure = リソース構成の更新。リソース構成リビジョン履歴の削除。 +view_adminRoles_permissions_permWriteDesc_control = オペレーションの実行。オペレーション実行履歴の削除。 +view_adminRoles_permissions_permWriteDesc_createChildResources = (作成可能なタイプの子リソースのための)新規子リソースの作成 +view_adminRoles_permissions_permWriteDesc_deleteChildResources = リソースのアンインベントリ。(削除可能なタイプのリソースのための)リソースの削除。 +view_adminRoles_permissions_permWriteDesc_inventory = リソースの名前、バージョン、説明、コネクション設定の更新。コネクション設定の履歴の削除。 +view_adminRoles_permissions_permWriteDesc_manageAlerts = アラート定義の作成、更新、削除。アラート履歴の確認と削除 +view_adminRoles_permissions_permWriteDesc_manageContent = コンテントソースへの登録。パッケージのインストールとアンインストール。 +view_adminRoles_permissions_permWriteDesc_manageEvents = イベントの削除 +view_adminRoles_permissions_permWriteDesc_manageMeasurements = メトリック収集スケジュールの更新 +view_adminRoles_permissions_perm_configure = 構成 +view_adminRoles_permissions_perm_control = 制御 +view_adminRoles_permissions_perm_createChildResources = 子リソースの作成 +view_adminRoles_permissions_perm_deleteChildResources = 子リソースの削除 +view_adminRoles_permissions_perm_inventory = インベントリ +view_adminRoles_permissions_perm_manageAlerts = アラートの管理 +view_adminRoles_permissions_perm_manageBundles = バンドルの管理 +view_adminRoles_permissions_perm_manageContent = コンテント管理 +view_adminRoles_permissions_perm_manageEvents = イベント管理 +view_adminRoles_permissions_perm_manageInventory = インベントリの管理 +view_adminRoles_permissions_perm_manageMeasurements = 測定の管理 +view_adminRoles_permissions_perm_manageRepositories = リポジトリの管理 +view_adminRoles_permissions_perm_manageSecurity = セキュリティの管理 +view_adminRoles_permissions_perm_manageSettings = 設定の管理 view_adminRoles_permissions_read = Read: -view_adminRoles_permissions_readAccessImplied = Read access for the {0} permission is implied and cannot be disabled. -view_adminRoles_permissions_resourcePermissions = Resource Permissions +view_adminRoles_permissions_readAccessImplied = [{0}] 権限のための読み取りアクセスを暗示されていて無効にできません +view_adminRoles_permissions_resourcePermissions = リソース権限 view_adminRoles_permissions_write = Write: -view_adminRoles_perms = Permissions -view_adminRoles_resourcePerms = Resource Permissions -view_adminRoles_roleAdded = Role [{0}] added. -view_adminRoles_roleDeleteFailed = Failed to delete role [{0}]. -view_adminRoles_roleDeleted = Role [{0}] deleted. -view_adminRoles_roleUpdateFailed = Failed to update role [{0}]. -view_adminRoles_roleUpdated = Role [{0}] updated. +view_adminRoles_perms = 権限 +view_adminRoles_resourcePerms = リソース権限 +view_adminRoles_roleAdded = ロール [{0}] が追加されました +view_adminRoles_roleDeleteFailed = ロール [{0}] の削除に失敗しました +view_adminRoles_roleDeleted = ロール [{0}] が削除されました +view_adminRoles_roleUpdateFailed = ロール [{0}] の更新に失敗しました. +view_adminRoles_roleUpdated = ロール [{0}] が更新されました view_adminSecurity_roles = ロール view_adminSecurity_users = ユーザー view_adminTemplates_disabledAlertTemplates = 無効なアラートテンプレート @@ -476,10 +476,10 @@ view_adminTemplates_enabledAlertTemplates = 有効なアラートテンプレー view_adminTemplates_enabledMetricTemplates = 有効なメトリックテンプレート view_adminTemplates_platformServices = プラットフォームサービス view_adminTemplates_platforms = プラットフォーム -view_adminTemplates_prompt_disabledAlertTemplates = Number of alert templates that are created but disabled on this resource type -view_adminTemplates_prompt_disabledMetricTemplates = Number of metric schedules that are disabled by default on this resource type -view_adminTemplates_prompt_enabledAlertTemplates = Number of alert templates that are enabled on this resource type -view_adminTemplates_prompt_enabledMetricTemplates = Number of metric schedules that are enabled by default on this resource type +view_adminTemplates_prompt_disabledAlertTemplates = このリソースタイプに関して作成されたけれど無効にされたアラートテンプレートの数 +view_adminTemplates_prompt_disabledMetricTemplates = このリソースタイプに関してデフォルトで無効にされたメトリックスケジュールの数 +view_adminTemplates_prompt_enabledAlertTemplates = このリソースタイプに関して有効にされたアラートテンプレートの数 +view_adminTemplates_prompt_enabledMetricTemplates = このリソースタイプに関してデフォルトで有効にされたメトリックスケジュールの数 view_adminTemplates_servers = サービス view_adminTopology_affinityGroups = アフィニティグループ view_adminTopology_agents = エージェント @@ -494,811 +494,806 @@ view_admin_configuration = 構成 view_admin_content = コンテント view_admin_downloads_agentDownload = エージェントのダウンロード view_admin_downloads_agent_buildNumber = エージェントビルド -view_admin_downloads_agent_help = This is the RHQ Agent Update Binary jar file. The purpose of this jar file is to allow you to install a fresh agent on a machine where an agent does not yet exist and to allow you to update an agent that is already installed on a machine. For more details, run this agent download jar with the --help command line option: java -jar <agent-download.jar> --help <h3>Agent Install</h3> java -jar <agent-download.jar> --install[=<new agent directory>] This command will install a new agent. If you do not specify the new agent directory, the default will be "." <h3>Agent Update</h3> java -jar <agent-download.jar> --update[=<old agent home>] This will update an existing agent that was already installed. If you do not specify the directory where the old, existing agent was installed, it will assumed to be "rhq-agent". +view_admin_downloads_agent_help = これはRHQ Agentの更新バイナリJARファイルです。このJARファイルの目的はユーザーがエージェントがまだ存在しないマシン上に新しいエージェントをインストールできるようにすることと、すでにインストール済みのエージェントを更新できるようにするためです。詳細は、このエージェントダウンロードJARで次のように--helpコマンドラインオプションをつけて実行してください。 java -jar <agent-download.jar> --help <h3>エージェントのインストール</h3> java -jar <agent-download.jar> --install[=<新しいエージェントディレクトリ>] このコマンドは新しいエージェントをインストールします。もし新しいディレクトリを指定しなければ、デフォルトは"."となります。 <h3>エージェントの更新</h3> java -jar <agent-download.jar> --update[=<古いエージェントディレクトリ>] これはすでにインストールされた既存のエージェントを更新します。もし古い、既存のエージェントがインストールされたディレクトリを指定しなかったなら、"rhq-agent"が仮定されます。 view_admin_downloads_agent_link_label = リンク view_admin_downloads_agent_link_value = エージェント {0} ({1}) のダウンロード -view_admin_downloads_agent_loadError = Cannot get agent version info +view_admin_downloads_agent_loadError = エージェントバージョン情報が取得できません view_admin_downloads_agent_md5 = エージェント MD5 view_admin_downloads_agent_version = エージェントバージョン view_admin_downloads_bundleDownload = バンドルデプロイヤのダウンロード -view_admin_downloads_bundle_help = This is the Bundle Deployer tool. It is for use by developers and packagers of RHQ bundles. This standalone tool allows you to test your bundles and their recipes from a console. -view_admin_downloads_bundle_link_label = Link -view_admin_downloads_bundle_link_value = Download Bundle Deployer {0} -view_admin_downloads_bundle_loadError = Cannot get bundle deployer info +view_admin_downloads_bundle_help = これはバンドルデプロイヤツールで、開発者とRHQバンドルによって使われます。このスタンドアロンツールを使うとバンドルやコンソールからのレシピをテストできるようにします。 +view_admin_downloads_bundle_link_label = リンク +view_admin_downloads_bundle_link_value = バンドルデプロイヤー {0} をダウンロード +view_admin_downloads_bundle_loadError = バンドルデプロイヤー情報が取得できません view_admin_downloads_cliDownload = コマンドラインクライアントのダウンロード -view_admin_downloads_cli_buildNumber = CLI Build -view_admin_downloads_cli_help = This is the Command Line Client tool, otherwise known as the CLI. It is a standalone tool that runs from within a console and provides a command line interface to the RHQ Server. You can invoke commands via the CLI as well as run scripts to perform automated tasks. See the documentation for more information on how to install and use the CLI. -view_admin_downloads_cli_link_label = Link -view_admin_downloads_cli_link_value = Download CLI {0} ({1}) -view_admin_downloads_cli_loadError = Cannot get CLI version info +view_admin_downloads_cli_buildNumber = CLIビルド +view_admin_downloads_cli_help = これはコマンドラインツールで、CLIとして知られているものです。コンソールから実行するスタンドアロンツールで、RHQサーバーに対してコマンドラインインタフェースを提供します。自動化されたタスクを実行するためにCLIやrunスクリプトを介してコマンドを呼び出すことが可能です。CLIのインストール方法と使い方についての詳細情報はドキュメントをご覧ください。 +view_admin_downloads_cli_link_label = リンク +view_admin_downloads_cli_link_value = CLI {0} ({1}) をダウンロード +view_admin_downloads_cli_loadError = CLIバージョン情報が取得できません view_admin_downloads_cli_md5 = CLI MD5 -view_admin_downloads_cli_version = CLI Version +view_admin_downloads_cli_version = CLIバージョン view_admin_downloads_connectorsDownload = コネクタのダウンロード -view_admin_downloads_connectors_help = Connectors are software that is needed in order for some products to be manageable by RHQ. You install connectors into some managed products so RHQ agents can talk to them. See the documentation for more information. -view_admin_downloads_connectors_loadError = Cannot get connectors info -view_admin_downloads_connectors_none = No connectors are available for download +view_admin_downloads_connectors_help = コネクターは製品がRHQによって管理可能であるために必要となるソフトウェアです。RHQエージェントが通信できるように、管理製品にコネクターをインストールします。詳細はドキュメントをご覧ください。 +view_admin_downloads_connectors_loadError = コネクター情報を取得できません +view_admin_downloads_connectors_none = ダウンロードのためのコネクターが見つかりません view_admin_landing = このセクションにおいて、RHQグローバル設定が管理されます。これはセキュリティ構成、プラグイン設定、RHQサーバーとエージェントの管理を含みます。 -view_admin_measTemplates_title = Template Metric Collection Schedules -view_admin_measTemplates_updateExisting_title = Update Existing Schedules -view_admin_measTemplates_updateExisting_tooltip = Check this box to update the collection schedules for the selected metrics on all existing resources of this type. If this is not checked, the template schedules will only be applied to new resources of this type that are added to inventory in the future. +view_admin_measTemplates_title = テンプレートメトリック収集スケジュール +view_admin_measTemplates_updateExisting_title = 既存スケジュールの更新 +view_admin_measTemplates_updateExisting_tooltip = このボックスをチェックすると、このタイプのすべてのリソースを対象に選択したメトリックスの収集スケジュールを更新します。もしこれがチェックされていなければ、テンプレートスケジュールが将来的にインベントリに追加されるこのタイプの新規リソースに適用されるだけです。 view_admin_security = セキュリティ -view_admin_systemSettings_AgentMaxQuietTimeAllowed_desc = If this amount of time passes without hearing from an agent, that quiet agent will be considered down. This value is specified in minutes. -view_admin_systemSettings_AgentMaxQuietTimeAllowed_name = Agent Max Quiet Time Allowed -view_admin_systemSettings_AlertPurge_desc = How old alert history items must be before being purged from the database. This is specified in days. -view_admin_systemSettings_AlertPurge_name = Delete Alerts Older Than -view_admin_systemSettings_AvailabilityPurge_desc = How old availability data must be before being purged from the database. This is specified in days. -view_admin_systemSettings_AvailabilityPurge_name = Delete Availability Data Older Than -view_admin_systemSettings_BaseURL_desc = A URL to the server GUI, used mainly within alert email notifications. -view_admin_systemSettings_BaseURL_name = GUI Console URL -view_admin_systemSettings_BaselineDataSet_desc = The amount of past measurement data that is used to determine a baseline. This is specified in days. -view_admin_systemSettings_BaselineDataSet_name = Baseline Dataset -view_admin_systemSettings_BaselineFrequency_desc = The frequency which the auto-calculation of baselines will be performed. If 0, baseline auto-calculation is disabled. This is specified in days. -view_admin_systemSettings_BaselineFrequency_name = Baseline Calculation Frequency -view_admin_systemSettings_DataMaintenance_desc = How often database maintenance is performed (for example, vacuuming if using Postgres). This is specified in hours. -view_admin_systemSettings_DataMaintenance_name = Database Maintenance Period -view_admin_systemSettings_DataReindex_desc = If enabled, certain database tables will be re-indexed periodically. -view_admin_systemSettings_DataReindex_name = Reindex Data Tables Nightly -view_admin_systemSettings_EnableAgentAutoUpdate_desc = Determines if the server will allow agents to auto-update themselves. You will not be able to download agent distributions from the server if this is disabled. -view_admin_systemSettings_EnableAgentAutoUpdate_name = Enable Agent Auto-Updates -view_admin_systemSettings_EnableDebugMode_desc = If enabled, the server will enter debug mode. -view_admin_systemSettings_EnableDebugMode_name = Enable Debug Mode -view_admin_systemSettings_EnableExperimentalFeatures_desc = If enabled, any experimental features that exist in the current product will be available. -view_admin_systemSettings_EnableExperimentalFeatures_name = Enable Experimental Features -view_admin_systemSettings_EventPurge_desc = How old event data must be before being purged from the database. This is specified in days. -view_admin_systemSettings_EventPurge_name = Delete Events Older Than -view_admin_systemSettings_JAASProvider_desc = Should LDAP be used to determine user identity? -view_admin_systemSettings_JAASProvider_name = Enable LDAP -view_admin_systemSettings_LDAPBaseDN_desc = The base of the directory tree to search for usernames and passwords while authenticating users, e.g. ou=People,dc=redhat,dc=com -view_admin_systemSettings_LDAPBaseDN_name = Search Base -view_admin_systemSettings_LDAPBindDN_desc = The username to connect to the LDAP server when querying the LDAP user database. This is typically the full LDAP distinguished name (DN) of a manager user, e.g. cn=Manager,dc=redhat,dc=com -view_admin_systemSettings_LDAPBindDN_name = Username -view_admin_systemSettings_LDAPBindPW_desc = The credentials of the user used to connect to the LDAP server when querying the LDAP user database. -view_admin_systemSettings_LDAPBindPW_name = Password -view_admin_systemSettings_LDAPFilter_desc = Any additional filters to apply when doing the LDAP search. This is useful if the population to authenticate can be identified via a given LDAP property, e.g. RHQUser=true -view_admin_systemSettings_LDAPFilter_name = Search Filter -view_admin_systemSettings_LDAPGroupFilter_desc = LDAP search filter that must return all LDAP groups available for authorization. This is used for LDAP group authorization. -view_admin_systemSettings_LDAPGroupFilter_name = Group Search Filter -view_admin_systemSettings_LDAPGroupMember_desc = LDAP search filter that is used in conjunction with the group search filter to determine user authorization. This is used for LDAP group authorization. -view_admin_systemSettings_LDAPGroupMember_name = Group Member Filter -view_admin_systemSettings_LDAPLoginProperty_desc = The LDAP property that contains the user name. Defaults to "cn". If multiple matches are found, the first entry found is used. -view_admin_systemSettings_LDAPLoginProperty_name = Login Property -view_admin_systemSettings_LDAPProtocol_desc = Should communication with the LDAP server be done over SSL? +view_admin_systemSettings_AgentMaxQuietTimeAllowed_desc = もしエージェントから何も受信しないでこの時間が経過したならば、そのエージェントはダウンしたものと見なされます。この値は分単位で指定されます。 +view_admin_systemSettings_AgentMaxQuietTimeAllowed_name = 許容される最大無通信時間 +view_admin_systemSettings_AlertPurge_desc = データベースから除去される前のアラートヒストリの保持時間。これは日単位で指定されます。 +view_admin_systemSettings_AlertPurge_name = 次より古いアラートを削除 +view_admin_systemSettings_AvailabilityPurge_desc = データベースから除去される前の可用性データの保持時間。これは日単位で指定されます。 +view_admin_systemSettings_AvailabilityPurge_name = 次より古い可用性データの削除 +view_admin_systemSettings_BaseURL_desc = サーバーGUIへのURL。主にアラートE-メール通知の使われます。 +view_admin_systemSettings_BaseURL_name = GUIコンソールURL +view_admin_systemSettings_BaselineDataSet_desc = ベースラインを決定するために使われる過去の測定データの量。これは日単位で指定されます。 +view_admin_systemSettings_BaselineDataSet_name = ベースラインデータセット +view_admin_systemSettings_BaselineFrequency_desc = ベースラインの自動景作の頻度が計算されます。もし0なら、ベースラインの自動景作は無効にされます。これは日単位で指定されます。 +view_admin_systemSettings_BaselineFrequency_name = ベースライン計算の頻度 +view_admin_systemSettings_DataMaintenance_desc = データベースの保守が実行される頻度(例えば、Postgresを使っているのであればであればバキュームなど)。これは時間単位で指定されます。 +view_admin_systemSettings_DataMaintenance_name = データベース保守期間 +view_admin_systemSettings_DataReindex_desc = もし有効であれば、データベーステーブルは定期的にインデックスが再生成されます。 +view_admin_systemSettings_DataReindex_name = データテーブルの夜間でのインデックス再生成 +view_admin_systemSettings_EnableAgentAutoUpdate_desc = サーバーがエージェントが自動更新することを許すかどうかを決定します。もしこれが無効にされているのであれば、サーバーからエージェントのディストリビューションをダウンロードすることはできません。 +view_admin_systemSettings_EnableAgentAutoUpdate_name = エージェントの自動更新を有効にする +view_admin_systemSettings_EnableDebugMode_desc = 有効であれば、サーバーはデバッグモードに入ります +view_admin_systemSettings_EnableDebugMode_name = デバッグモードを有効にする +view_admin_systemSettings_EnableExperimentalFeatures_desc = 有効であれば、現在の製品に含まれる任意の実験的機能が利用可能になります +view_admin_systemSettings_EnableExperimentalFeatures_name = 実験的機能を有効にする +view_admin_systemSettings_EventPurge_desc = データベースから除去される前のイベントデータの保持時間。これは日単位で指定されます。 +view_admin_systemSettings_EventPurge_name = 次より古いイベント削除 +view_admin_systemSettings_JAASProvider_desc = ユーザーIDを欠点するのにLDAPが使われるべきですか? +view_admin_systemSettings_JAASProvider_name = LDAPの有効化 +view_admin_systemSettings_LDAPBaseDN_desc = ユーザ認証の間にユーザー名とパスワードを検索するディレクトリツリーのベース。例: ou=People,dc=redhat,dc=com +view_admin_systemSettings_LDAPBaseDN_name = サーチベース +view_admin_systemSettings_LDAPBindDN_desc = LDAPユーザーデータベースの問い合わせ時にLDAPサーバーに接続するためのユーザー名。これは普通はマネージャーユーザーの完全なLDAP識別名 (DN) になる。例: cn=Manager,dc=redhat,dc=com +view_admin_systemSettings_LDAPBindDN_name = ユーザー名 +view_admin_systemSettings_LDAPBindPW_desc = LDAPユーザーデータベースの問い合わせ時にLDAPサーバーに接続するためのユーザーのクレデンシャル +view_admin_systemSettings_LDAPBindPW_name = パスワード +view_admin_systemSettings_LDAPFilter_desc = LDAPサーチ中に適用される追加可能な任意のフィルター。これは認証する人が指定されたLDAPプロパティを介して識別されるなら有用です。例: RHQUser=true +view_admin_systemSettings_LDAPFilter_name = サーチフィルター +view_admin_systemSettings_LDAPGroupFilter_desc = 認可のために利用可能なすべてのLDAPグループを返さなければならないDAPサーチフィルター +view_admin_systemSettings_LDAPGroupFilter_name = グループサーチフィルター +view_admin_systemSettings_LDAPGroupMember_desc = ユーザー認可を決定するためのグループサーチフィルターと一緒に使われるLDAPサーチフィルター +view_admin_systemSettings_LDAPGroupMember_name = グループメンバーフィルター +view_admin_systemSettings_LDAPLoginProperty_desc = ユーザー名を含むLDAPプロパティ。デフォルトは "cn"。もし複数のエントリがマッチしたら、最初に見つかったものが使われます。 +view_admin_systemSettings_LDAPLoginProperty_name = ログインプロパティ +view_admin_systemSettings_LDAPProtocol_desc = LDAPサーバーとの間はSSLを介して通信されるべきですか? view_admin_systemSettings_LDAPProtocol_name = SSL -view_admin_systemSettings_LDAPUrl_desc = URL to the LDAP Server +view_admin_systemSettings_LDAPUrl_desc = LDAPサーバーへのURL view_admin_systemSettings_LDAPUrl_name = LDAP URL -view_admin_systemSettings_RtDataPurge_desc = How old response time data must be before being purged from the database. This is specified in days. -view_admin_systemSettings_RtDataPurge_name = Delete Response Time Data Older Than -view_admin_systemSettings_TraitPurge_desc = How old measurement trait data must be before being purged from the database. This is specified in days. -view_admin_systemSettings_TraitPurge_name = Delete Measurement Traits Older Than -view_admin_systemSettings_cannotLoadServerDetails = Cannot load server details -view_admin_systemSettings_cannotLoadSettings = Cannot obtain the current system settings -view_admin_systemSettings_fixBeforeSaving = Please fix the invalid values before saving +view_admin_systemSettings_RtDataPurge_desc = データベースから除去される前の応答時間の保持時間。これは日単位で指定されます。 +view_admin_systemSettings_RtDataPurge_name = 次より古い応答時間の削除 +view_admin_systemSettings_TraitPurge_desc = データベースから除去される前の測定トレイトデータの保持時間。これは日単位で指定されます。 +view_admin_systemSettings_TraitPurge_name = 次より古い測定トレイトの削除 +view_admin_systemSettings_cannotLoadServerDetails = サーバー詳細をロードできません +view_admin_systemSettings_cannotLoadSettings = 現在のシステム設定を取得できません +view_admin_systemSettings_fixBeforeSaving = 保存前に無効な値を修正してください view_admin_systemSettings_group_baseline = 自動ベースライン構成プロパティ view_admin_systemSettings_group_dataMgr = データマネージャー構成プロパティ view_admin_systemSettings_group_general = 全体構成プロパティ -view_admin_systemSettings_group_ldap = LDAP 構成プロパティ -view_admin_systemSettings_saveFailure = Failed to save the system settings -view_admin_systemSettings_savedSettings = You successfully saved the system properties -view_admin_systemSettings_serverDetails = Server Details -view_admin_systemSettings_serverDetails_buildNumber = Build Number -view_admin_systemSettings_serverDetails_currentTable = Current Measurement Raw Table -view_admin_systemSettings_serverDetails_dbDriverName = Database Driver Name -view_admin_systemSettings_serverDetails_dbDriverVersion = Database Driver Version -view_admin_systemSettings_serverDetails_dbName = Database Product Name -view_admin_systemSettings_serverDetails_dbUrl = Database Connection URL -view_admin_systemSettings_serverDetails_dbVersion = Database Product Version -view_admin_systemSettings_serverDetails_installDir = Server Installation Directory -view_admin_systemSettings_serverDetails_nextRotation = Next Measurement Table Rotation -view_admin_systemSettings_serverDetails_time = Server Local Time -view_admin_systemSettings_serverDetails_tz = Server Time Zone +view_admin_systemSettings_group_ldap = LDAP構成プロパティ +view_admin_systemSettings_saveFailure = システム設定の保存に失敗しました +view_admin_systemSettings_savedSettings = システムプロパティの保存に成功しました +view_admin_systemSettings_serverDetails = サーバー詳細 +view_admin_systemSettings_serverDetails_buildNumber = ビルド番号 +view_admin_systemSettings_serverDetails_currentTable = 現在の測定用テーブル +view_admin_systemSettings_serverDetails_dbDriverName = データベースドライバー名 +view_admin_systemSettings_serverDetails_dbDriverVersion = データベースドライバーバージョン +view_admin_systemSettings_serverDetails_dbName = データベースプロダクト名 +view_admin_systemSettings_serverDetails_dbUrl = データベースコネクションURL +view_admin_systemSettings_serverDetails_dbVersion = データベースプロダクトバージョン +view_admin_systemSettings_serverDetails_installDir = サーバーインストールディレクトリ +view_admin_systemSettings_serverDetails_nextRotation = 次の測定テーブルの交代 +view_admin_systemSettings_serverDetails_time = サーバーローカル時刻 +view_admin_systemSettings_serverDetails_tz = サーバータイムゾーン view_admin_topology = トポロジー -view_alert_common_tab_conditions = Conditions -view_alert_common_tab_conditions_expression = Fire alert when -view_alert_common_tab_conditions_expression_tooltip = Determines if ANY or ALL of the conditions must evaluate to true in order for the entire condition set to be considered true. +view_alert_common_tab_conditions = 条件 +view_alert_common_tab_conditions_expression = アラート発火 +view_alert_common_tab_conditions_expression_tooltip = 全体の条件がtrueであると認められるために、条件の一部またはすべてがtrueと評価されなければならないかどうか決定します view_alert_common_tab_conditions_modal_title = 条件追加 -view_alert_common_tab_conditions_recovery_disabled = This alert caused its alert definition to be disabled -view_alert_common_tab_conditions_recovery_enabled = Triggered ''{0}'' to be re-enabled -view_alert_common_tab_conditions_text = Condition -view_alert_common_tab_conditions_type_availability = Availability Change -view_alert_common_tab_conditions_type_availability_down = Went down -view_alert_common_tab_conditions_type_availability_up = Came up -view_alert_common_tab_conditions_type_event = Event Detection -view_alert_common_tab_conditions_type_event_matching = with event source matching -view_alert_common_tab_conditions_type_metric_baseline = Metric Value Baseline +view_alert_common_tab_conditions_recovery_disabled = このアラートはそのアラート定義が無効化される原因となりました +view_alert_common_tab_conditions_recovery_enabled = トリガー ''{0}'' が再び有効化される +view_alert_common_tab_conditions_text = 条件 +view_alert_common_tab_conditions_type_availability = アベイラビリティの変化 +view_alert_common_tab_conditions_type_availability_down = 下降 +view_alert_common_tab_conditions_type_availability_up = 上昇 +view_alert_common_tab_conditions_type_event = イベントの検出 +view_alert_common_tab_conditions_type_event_matching = イベントソースが一致 +view_alert_common_tab_conditions_type_metric_baseline = メトリック値のベースライン view_alert_common_tab_conditions_type_metric_baseline_verb = of -view_alert_common_tab_conditions_type_metric_calltime_change = Call Time Value Changes +view_alert_common_tab_conditions_type_metric_calltime_change = 呼び出し時間の変化 view_alert_common_tab_conditions_type_metric_calltime_change_verb = by at least -view_alert_common_tab_conditions_type_metric_calltime_delta_grows = Grows -view_alert_common_tab_conditions_type_metric_calltime_delta_other = Changes -view_alert_common_tab_conditions_type_metric_calltime_delta_shrinks = Shrinks -view_alert_common_tab_conditions_type_metric_calltime_destination = with call destination matching -view_alert_common_tab_conditions_type_metric_calltime_threshold = Call Time Value Threshold -view_alert_common_tab_conditions_type_metric_change = Metric Value Change -view_alert_common_tab_conditions_type_metric_threshold = Metric Value Threshold -view_alert_common_tab_conditions_type_metric_trait_change = Trait Change -view_alert_common_tab_conditions_type_operation = Operation Execution -view_alert_common_tab_conditions_type_operation_status = with result status -view_alert_common_tab_conditions_type_resource_configuration = Resource Configuration Change -view_alert_common_tab_conditions_value = Value -view_alert_common_tab_dampening = Dampening -view_alert_common_tab_dampening_category_consecutive_count = Consecutive -view_alert_common_tab_dampening_category_consecutive_count_tooltip = An alert is triggered once every X occurrences the condition set is true consecutively. -view_alert_common_tab_dampening_category_duration_count = Time Period -view_alert_common_tab_dampening_category_duration_count_tooltip = An alert is triggered once every X occurrences the condition set is true within a given time period. -view_alert_common_tab_dampening_category_none = None -view_alert_common_tab_dampening_category_none_tooltip = Dampening is disabled. Every time the condition set is true, an alert will be triggered. -view_alert_common_tab_dampening_category_partial_count = Last N Evaluations -view_alert_common_tab_dampening_category_partial_count_tooltip = An alert is triggered once every X occurrences the condition set is true during the last N evaluations of the condition set. -view_alert_common_tab_dampening_consecutive_occurrences_label = Occurrences -view_alert_common_tab_dampening_consecutive_occurrences_label_tooltip = The number of times the condition set must be consecutively true before the alert is triggered -view_alert_common_tab_dampening_duration_occurrences_label = Occurrences -view_alert_common_tab_dampening_duration_occurrences_label_tooltip = The number of times the condition set must be true during the given time period before the alert is triggered. -view_alert_common_tab_dampening_duration_period_label = Time Period -view_alert_common_tab_dampening_duration_period_label_tooltip = The time span in which the condition set will be tested to see if the given number of occurrences are true. -view_alert_common_tab_dampening_partial_evalatuions_label = Evaluations -view_alert_common_tab_dampening_partial_evalatuions_label_tooltip = The total number of times the condition set will be tested to see if the given number of occurrences are true. -view_alert_common_tab_dampening_partial_occurrences_label = Occurrences -view_alert_common_tab_dampening_partial_occurrences_label_tooltip = The number of times the condition set must be true during the last N evaluations before the alert is triggered. -view_alert_common_tab_general = General Properties -view_alert_common_tab_invalid_condition_category = Invalid condition category - please report this as a bug: {0} -view_alert_common_tab_invalid_dampening_category = Invalid dampening category - please report this as a bug: {0} -view_alert_common_tab_invalid_time_units = Invalid time units - please report this as a bug: {0} -view_alert_common_tab_notifications = Notifications -view_alert_common_tab_notifications_message = Message -view_alert_common_tab_notifications_sender = Sender -view_alert_common_tab_notifications_status = Status -view_alert_common_tab_recovery = Recovery -view_alert_definition_condition_editor_avilability_option_down = Goes down -view_alert_definition_condition_editor_avilability_option_up = Comes up -view_alert_definition_condition_editor_avilability_tooltip = Specify the availability state change that will trigger the condition. -view_alert_definition_condition_editor_avilability_value = Availability -view_alert_definition_condition_editor_common_avg = Average -view_alert_definition_condition_editor_common_max = Maximum -view_alert_definition_condition_editor_common_min = Minimum -view_alert_definition_condition_editor_delete_confirm = Delete the selected alert condition(s)? -view_alert_definition_condition_editor_event_regex = Regular Expression -view_alert_definition_condition_editor_event_regex_tooltip = If specified, this is a regular expression that must match a collected event message in order to trigger the condition. -view_alert_definition_condition_editor_event_severity = Event Severity +view_alert_common_tab_conditions_type_metric_calltime_delta_grows = 上昇 +view_alert_common_tab_conditions_type_metric_calltime_delta_other = 変化 +view_alert_common_tab_conditions_type_metric_calltime_delta_shrinks = 縮小 +view_alert_common_tab_conditions_type_metric_calltime_destination = 呼び出しの宛先が一致 +view_alert_common_tab_conditions_type_metric_calltime_threshold = 呼び出し時間の閾値 +view_alert_common_tab_conditions_type_metric_change = メトリック値の変換 +view_alert_common_tab_conditions_type_metric_threshold = メトリック値の閾値 +view_alert_common_tab_conditions_type_metric_trait_change = トレイトの変化 +view_alert_common_tab_conditions_type_operation = オペレーションの実行 +view_alert_common_tab_conditions_type_operation_status = 結果ステータス付 +view_alert_common_tab_conditions_type_resource_configuration = リソース構成の変化 +view_alert_common_tab_conditions_value = 値 +view_alert_common_tab_dampening = 抑制 +view_alert_common_tab_dampening_category_consecutive_count = 連続 +view_alert_common_tab_dampening_category_consecutive_count_tooltip = 条件設定がX回連続してtrueであればアラートが引き起こされます。 +view_alert_common_tab_dampening_category_duration_count = 時間間隔 +view_alert_common_tab_dampening_category_duration_count_tooltip = アラートは与えられた時間内で条件設定がtrueであることがX回発生するたびに引き起こされます +view_alert_common_tab_dampening_category_none = なし +view_alert_common_tab_dampening_category_none_tooltip = ダンピングは無効です。その条件がtrueになるたびに、アラートが引き起こされます。 +view_alert_common_tab_dampening_category_partial_count = 直近のN個の評価 +view_alert_common_tab_dampening_category_partial_count_tooltip = アラートは直近のN回の条件の評価の間でで条件設定がtrueを満たすことがX回発生するたびに引き起こされます +view_alert_common_tab_dampening_consecutive_occurrences_label = 発生 +view_alert_common_tab_dampening_consecutive_occurrences_label_tooltip = アラートが引き起こされる前に条件設定が連続してtrueでなけらればならない回数 +view_alert_common_tab_dampening_duration_occurrences_label = 発生 +view_alert_common_tab_dampening_duration_occurrences_label_tooltip = アラートが引き起こされる前に与えられた時間内で条件設定が連続してtrueでなけらればならない回数 +view_alert_common_tab_dampening_duration_period_label = 時間間隔 +view_alert_common_tab_dampening_duration_period_label_tooltip = 与えられた発生回数がtrueであるかどうかを調べるために条件設定がテストされるタイムスパン +view_alert_common_tab_dampening_partial_evalatuions_label = 評価 +view_alert_common_tab_dampening_partial_evalatuions_label_tooltip = 与えられた発生回数がtrueであるかどうかを調べるために条件設定がテストされる合計回数 +view_alert_common_tab_dampening_partial_occurrences_label = 発生 +view_alert_common_tab_dampening_partial_occurrences_label_tooltip = アラートが引き起こされる前に直近N回の評価の間で条件設定がtrueでなければならない回数 +view_alert_common_tab_general = 一般プロパティ +view_alert_common_tab_invalid_condition_category = 無効な条件カテゴリ - どうかこれをバグとして報告してください: {0} +view_alert_common_tab_invalid_dampening_category = 無効なダンピングカテゴリ - どうかこれをバグとして報告してください: {0} +view_alert_common_tab_invalid_time_units = 無効な時間単位 - どうかこれをバグとして報告してください: {0} +view_alert_common_tab_notifications = 通知 +view_alert_common_tab_notifications_message = メッセージ +view_alert_common_tab_notifications_sender = センダー +view_alert_common_tab_notifications_status = ステータス +view_alert_common_tab_recovery = リカバリ +view_alert_definition_condition_editor_avilability_option_down = 下降する +view_alert_definition_condition_editor_avilability_option_up = 上昇する +view_alert_definition_condition_editor_avilability_tooltip = 条件のトリガーとなるアベイラビリティ状態の変化を指定します +view_alert_definition_condition_editor_avilability_value = アベイラビリティ +view_alert_definition_condition_editor_common_avg = 平均 +view_alert_definition_condition_editor_common_max = 最大 +view_alert_definition_condition_editor_common_min = 最小 +view_alert_definition_condition_editor_delete_confirm = 選択されたアラート定義を削除しますか? +view_alert_definition_condition_editor_event_regex = 正規表現 +view_alert_definition_condition_editor_event_regex_tooltip = もし指定されたなら、これは正規表現であり、この条件を引き起こすために収集されたイベントメッセージに一致しなければなりません。 +view_alert_definition_condition_editor_event_severity = イベント重大度 view_alert_definition_condition_editor_event_severity_debug = Debug view_alert_definition_condition_editor_event_severity_error = Error view_alert_definition_condition_editor_event_severity_fatal = Fatal view_alert_definition_condition_editor_event_severity_info = Info view_alert_definition_condition_editor_event_severity_warn = Warn -view_alert_definition_condition_editor_event_tooltip = Specify the event severity that an event message must be reported with in order to trigger this condition. If you specify an optional regular expression, the event message must also match that regular expression in order for the condition to trigger. -view_alert_definition_condition_editor_metric_baseline_percentage = Baseline Percentage -view_alert_definition_condition_editor_metric_baseline_percentage_tooltip = A collected metric value will trigger this condition when compared to this percentage of the selected baseline value using the selected comparator -view_alert_definition_condition_editor_metric_baseline_tooltip = Specify the baseline value that must be violated to trigger the condition. The value you specify is a percentage of the given baseline value. -view_alert_definition_condition_editor_metric_baseline_value = Baseline -view_alert_definition_condition_editor_metric_calltime_change_percentage = Percentage Change -view_alert_definition_condition_editor_metric_calltime_change_percentage_tooltip = A collected calltime value will trigger this condition when it differs by at least this percentage of the selected calltime limit value -view_alert_definition_condition_editor_metric_calltime_change_tooltip = Specify the calltime value that, when changed at least a specified amount, triggers the condition. You must specify which calltime limit to check (minimum, maximum or average calltime value) and the percentage of change that must occur. -view_alert_definition_condition_editor_metric_calltime_common_comparator = Comparator -view_alert_definition_condition_editor_metric_calltime_common_comparator_changes = Changes -view_alert_definition_condition_editor_metric_calltime_common_comparator_grows = Grows -view_alert_definition_condition_editor_metric_calltime_common_comparator_shrinks = Shrinks -view_alert_definition_condition_editor_metric_calltime_common_comparator_tooltip = How a collected calltime value should be compared to the given calltime limit -view_alert_definition_condition_editor_metric_calltime_common_limit = Call Time Limit -view_alert_definition_condition_editor_metric_calltime_common_limit_tooltip = The calltime limit value that is to be compared with the given value -view_alert_definition_condition_editor_metric_calltime_common_name = Call Time Metric -view_alert_definition_condition_editor_metric_calltime_common_regex = Regular Expression -view_alert_definition_condition_editor_metric_calltime_common_regex_tooltip = If specified, this is a regular expression that must match a call destination in order to trigger the condition. -view_alert_definition_condition_editor_metric_calltime_threshold_tooltip = Specify the calltime threshold value that, when violated, triggers the condition. The value you specify is an absolute value with an optional units specifier. You also must specify which calltime limit to compare the value with (minimum, maximum or average calltime value). -view_alert_definition_condition_editor_metric_calltime_threshold_value = Call Time Value -view_alert_definition_condition_editor_metric_calltime_threshold_value_tooltip = The threshold value of the metric that will trigger the condition when compared using the selected comparator. -view_alert_definition_condition_editor_metric_change_tooltip = Specify the metric whose value must change to trigger the condition. -view_alert_definition_condition_editor_metric_common_definition_not_found = Should have found metric definition - something is wrong -view_alert_definition_condition_editor_metric_threshold_comparator = Comparator -view_alert_definition_condition_editor_metric_threshold_comparator_equal = Equal to -view_alert_definition_condition_editor_metric_threshold_comparator_greater = Greater Than -view_alert_definition_condition_editor_metric_threshold_comparator_less = Less than -view_alert_definition_condition_editor_metric_threshold_comparator_tooltip = How a collected metric value should be compared to the given threshold value -view_alert_definition_condition_editor_metric_threshold_name = Metric -view_alert_definition_condition_editor_metric_threshold_tooltip = Specify the threshold value that, when violated, triggers the condition. The value you specify is an absolute value with an optional units specifier. -view_alert_definition_condition_editor_metric_threshold_value = Metric Value -view_alert_definition_condition_editor_metric_threshold_value_tooltip = The threshold value of the metric that will trigger the condition when compared using the selected comparator. -view_alert_definition_condition_editor_metric_trait_change_tooltip = Specify the trait whose value must change to trigger the condition. -view_alert_definition_condition_editor_metric_trait_change_value = Trait +view_alert_definition_condition_editor_event_tooltip = この条件を引き起こすためにイベントメッセージが報告される必要があるイベント重大度を指定します。もしオプションとなる正規表現を指定したなら、イベントメッセージはその条件が引き起こされるためにイベントメッセージも正規表現に一致しなければなりません。 +view_alert_definition_condition_editor_metric_baseline_percentage = ベースラインパーセンテージ +view_alert_definition_condition_editor_metric_baseline_percentage_tooltip = 選択された比較子(comparator)を使用して選択されたベースライン値のパーセンテージを比較するときに収集されたメトリック値はこの条件を引き起こします。 +view_alert_definition_condition_editor_metric_baseline_tooltip = 条件を引き起こすために違反されることが必要となるベースライン値を指定します。指定する値は、与えられたベースライン値のパーセンテージになります。 +view_alert_definition_condition_editor_metric_baseline_value = ベースライン +view_alert_definition_condition_editor_metric_calltime_change_percentage = パーセンテージの変化 +view_alert_definition_condition_editor_metric_calltime_change_percentage_tooltip = 少なくとも選択された呼び出し時間リミット値のパーセンテージと異なるとき、収集された呼び出し時間はこの条件を引き起こします +view_alert_definition_condition_editor_metric_calltime_change_tooltip = 条件を引き起こす、少なくとも指定された量の変化が起こったときの、呼び出し値を指定します。(最小、最大、平均の呼び出し時間の値)をチェックするための呼び出し時間のリミットの種別と発生に必要な変化のパーセンテージを指定しなければなりません。 +view_alert_definition_condition_editor_metric_calltime_common_comparator = コンパレータ +view_alert_definition_condition_editor_metric_calltime_common_comparator_changes = 変化 +view_alert_definition_condition_editor_metric_calltime_common_comparator_grows = 増大 +view_alert_definition_condition_editor_metric_calltime_common_comparator_shrinks = 縮小 +view_alert_definition_condition_editor_metric_calltime_common_comparator_tooltip = 収集された呼び出し時間の値は与えられた呼び出し時間のリミットとどのようにされるべきか +view_alert_definition_condition_editor_metric_calltime_common_limit = 呼び出し時間制限 +view_alert_definition_condition_editor_metric_calltime_common_limit_tooltip = 与えられた値と比較されるべき呼び出し時間リミットの値 +view_alert_definition_condition_editor_metric_calltime_common_name = 呼び出し時間メトリック +view_alert_definition_condition_editor_metric_calltime_common_regex = 正規表現 +view_alert_definition_condition_editor_metric_calltime_common_regex_tooltip = もし指定されるなら、これは正規表現であり、条件を引き起こすために呼び出しの宛先と一致する必要があります +view_alert_definition_condition_editor_metric_calltime_threshold_tooltip = 違反したときに条件を引き起こす呼び出し時間の閾値を指定します。指定する値はオプションの単位を伴う絶対値になります。(最小、最大、平均の呼び出し時間の値)と値を比較するため呼び出し時間のリミットの種別を指定しなければなりません。 +view_alert_definition_condition_editor_metric_calltime_threshold_value = 呼び出し時間の値 +view_alert_definition_condition_editor_metric_calltime_threshold_value_tooltip = 選択された比較子(comparator)を使って比較するとき条件が引き起こされるメトリックの閾値 +view_alert_definition_condition_editor_metric_change_tooltip = 条件を引き起こすために変更しなければならない値を持つメトリックを指定します +view_alert_definition_condition_editor_metric_common_definition_not_found = メトリック定義が見つかるべきです - 何かがおかしいです +view_alert_definition_condition_editor_metric_threshold_comparator = コンパレータ +view_alert_definition_condition_editor_metric_threshold_comparator_equal = 等しい +view_alert_definition_condition_editor_metric_threshold_comparator_greater = より大きい +view_alert_definition_condition_editor_metric_threshold_comparator_less = より少ない +view_alert_definition_condition_editor_metric_threshold_comparator_tooltip = 収集されたメトリック値が与えられた閾値と比較される方法 +view_alert_definition_condition_editor_metric_threshold_name = メトリック +view_alert_definition_condition_editor_metric_threshold_tooltip = 違反したときの条件のトリガーとなる閾値を指定します。指定する値はオプションとなる単位による絶対値です +view_alert_definition_condition_editor_metric_threshold_value = メトリック値 +view_alert_definition_condition_editor_metric_threshold_value_tooltip = メトリックの閾値は、選択されたコンパレータを使って比較されたときの条件のトリガーになります +view_alert_definition_condition_editor_metric_trait_change_tooltip = 条件を引き起こすために変更しなければならない値を持つトレイとを指定します +view_alert_definition_condition_editor_metric_trait_change_value = トレイト view_alert_definition_condition_editor_operation_status = オペレーションステータス view_alert_definition_condition_editor_operation_status_canceled = キャンセル済 view_alert_definition_condition_editor_operation_status_failure = 失敗 view_alert_definition_condition_editor_operation_status_inprogress = 処理中 view_alert_definition_condition_editor_operation_status_success = 成功 -view_alert_definition_condition_editor_operation_tooltip = Specify the result that must occur when the selected operation is executed in order to trigger the condition. +view_alert_definition_condition_editor_operation_tooltip = 条件を引き起こすために選択されたが実行されるとき発生しなければならない結果を指定します view_alert_definition_condition_editor_operation_value = オペレーション -view_alert_definition_condition_editor_option_availability = Availability Change -view_alert_definition_condition_editor_option_event = Event Detection -view_alert_definition_condition_editor_option_label = Condition Type -view_alert_definition_condition_editor_option_metric_baseline = Measurement Baseline Threshold -view_alert_definition_condition_editor_option_metric_calltime_change = Call Time Value Change -view_alert_definition_condition_editor_option_metric_calltime_threshold = Call Time Value Threshold -view_alert_definition_condition_editor_option_metric_change = Measurement Value Change -view_alert_definition_condition_editor_option_metric_threshold = Measurement Absolute Value Threshold -view_alert_definition_condition_editor_option_metric_trait_change = Trait Value Change -view_alert_definition_condition_editor_option_operation = Operation Execution -view_alert_definition_condition_editor_option_resource_configuration = Resource Configuration Change -view_alert_definition_condition_editor_resource_configuration_tooltip = This condition is triggered when the resource configuration changes. -view_alert_definition_for_group = View Group Definition -view_alert_definition_for_type = View Template -view_alert_definition_notification_cliScript_editor_anotherUser = Another User -view_alert_definition_notification_cliScript_editor_existingScript = Existing Script -view_alert_definition_notification_cliScript_editor_loadFailed = Loading the CLI Notification Editor Failed. -view_alert_definition_notification_cliScript_editor_newScriptVersion = Version -view_alert_definition_notification_cliScript_editor_repository = Repository -view_alert_definition_notification_cliScript_editor_script = Script -view_alert_definition_notification_cliScript_editor_selectRepo = Select the repository where the script should reside -view_alert_definition_notification_cliScript_editor_selectRepoFirst = Select a repository first. -view_alert_definition_notification_cliScript_editor_thisUser = Myself -view_alert_definition_notification_cliScript_editor_uploadNewScript = Upload New Script -view_alert_definition_notification_cliScript_editor_verifyAuthentication = Verify -view_alert_definition_notification_cliScript_editor_whichUser = User To Run The Script As -view_alert_definition_notification_editor_delete_confirm = Are you sure you want to delete the selected alert notifications? -view_alert_definition_notification_editor_field_configuration = Configuration -view_alert_definition_notification_editor_field_configuration_loadFailed = Failed to get notification configuration preview -view_alert_definition_notification_editor_field_configuration_not_loaded = Unknown -view_alert_definition_notification_editor_field_sender = Sender -view_alert_definition_notification_editor_loadFailed = Cannot get alert senders -view_alert_definition_notification_editor_loadFailed_single = Cannot get alert sender configuration definition -view_alert_definition_notification_editor_none_available = No alert senders available -view_alert_definition_notification_editor_saveFailed = Cannot save the notification configuration -view_alert_definition_notification_editor_sender = Notification Sender +view_alert_definition_condition_editor_option_availability = アベイラビリティの変化 +view_alert_definition_condition_editor_option_event = イベントの検出 +view_alert_definition_condition_editor_option_label = 条件タイプ +view_alert_definition_condition_editor_option_metric_baseline = 測定ベースラインの閾値 +view_alert_definition_condition_editor_option_metric_calltime_change = 呼び出し時間の変化 +view_alert_definition_condition_editor_option_metric_calltime_threshold = 呼び出し時間の閾値 +view_alert_definition_condition_editor_option_metric_change = 測定値の変化 +view_alert_definition_condition_editor_option_metric_threshold = 測定絶対値の閾値 +view_alert_definition_condition_editor_option_metric_trait_change = トレイト値の変化 +view_alert_definition_condition_editor_option_operation = オペレーションの実行 +view_alert_definition_condition_editor_option_resource_configuration = リソース構成の変化 +view_alert_definition_condition_editor_resource_configuration_tooltip = この条件はリソース構成が変更されると引き起こされます +view_alert_definition_for_group = ビューグループ定義 +view_alert_definition_for_type = ビューテンプレート +view_alert_definition_notification_cliScript_editor_anotherUser = 別のユーザー +view_alert_definition_notification_cliScript_editor_existingScript = 既存のスクリプト +view_alert_definition_notification_cliScript_editor_loadFailed = CLI通知エディタのロードに失敗しました +view_alert_definition_notification_cliScript_editor_newScriptVersion = バージョン +view_alert_definition_notification_cliScript_editor_repository = リポジトリ +view_alert_definition_notification_cliScript_editor_script = スクリプト +view_alert_definition_notification_cliScript_editor_selectRepo = スクリプトが置かれているリポジトリを選択してください +view_alert_definition_notification_cliScript_editor_selectRepoFirst = リポジトリを最初に選択してください +view_alert_definition_notification_cliScript_editor_thisUser = 自分自身 +view_alert_definition_notification_cliScript_editor_uploadNewScript = 新規スクリプトのアップロード +view_alert_definition_notification_cliScript_editor_verifyAuthentication = 懸賞 +view_alert_definition_notification_cliScript_editor_whichUser = スクリプトを実行するユーザー +view_alert_definition_notification_editor_delete_confirm = 選択されたアラート通知を削除してもよろしいですか? +view_alert_definition_notification_editor_field_configuration = 構成 +view_alert_definition_notification_editor_field_configuration_loadFailed = 通知構成プレビューの取得に失敗しました +view_alert_definition_notification_editor_field_configuration_not_loaded = 未知 +view_alert_definition_notification_editor_field_sender = 送信者 +view_alert_definition_notification_editor_loadFailed = アラート送信者を取得できません +view_alert_definition_notification_editor_loadFailed_single = アラート送信者構成定義を取得できません +view_alert_definition_notification_editor_none_available = アラート送信者が利用できません +view_alert_definition_notification_editor_saveFailed = 通知の構成を保存できません +view_alert_definition_notification_editor_sender = 通知送信者 view_alert_definition_notification_editor_title_add = 通知の追加 view_alert_definition_notification_editor_title_edit = 通知の編集 -view_alert_definition_notification_operation_editor_common_operation = Operation -view_alert_definition_notification_operation_editor_mode_relative = Relative Resource -view_alert_definition_notification_operation_editor_mode_specific = Specific Resource -view_alert_definition_notification_operation_editor_mode_this = This Resource +view_alert_definition_notification_operation_editor_common_operation = オペレーション +view_alert_definition_notification_operation_editor_mode_relative = 関連リソース +view_alert_definition_notification_operation_editor_mode_specific = 特定リソース +view_alert_definition_notification_operation_editor_mode_this = このリソース view_alert_definition_notification_operation_editor_mode_title = リソース選択モード -view_alert_definition_notification_operation_editor_mode_unknown = UNKNOWN OPTION - THIS IS A BUG -view_alert_definition_notification_operation_editor_operations_loadFailed = Failed to load the list of available operations -view_alert_definition_notification_operation_editor_operations_no_parameters = This operation does not take any parameters -view_alert_definition_notification_operation_editor_relative_ancestor = Start Search From -view_alert_definition_notification_operation_editor_relative_ancestor_loadFailed = Cannot get type ancestry -view_alert_definition_notification_operation_editor_relative_ancestor_root = Root Ancestor Type -view_alert_definition_notification_operation_editor_relative_ancestor_tooltip = Select the top of the type hierarchy from which to search its descendant tree for the Filter By type -view_alert_definition_notification_operation_editor_relative_descendant = Then Filter By -view_alert_definition_notification_operation_editor_relative_descendant_filter_tooltip = A specific name to uniquely identify a resource when more than one resource of the selected type might exist. This is optional if there will only ever be one resource of the resource type in the selected type hierarchy. -view_alert_definition_notification_operation_editor_relative_descendant_loadFailed = Cannot get type descendants -view_alert_definition_notification_operation_editor_relative_descendant_tooltip = The resource type to search for under the root type defined in the Start Search From selection. -view_alert_definition_notification_operation_editor_specific_pick_button = Pick -view_alert_definition_notification_operation_editor_specific_pick_error_invalid = Please pick a resource -view_alert_definition_notification_operation_editor_specific_pick_error_no_operation = Please pick a resource that has one or more operations -view_alert_definition_notification_operation_editor_specific_pick_text = Pick a resource... -view_alert_definition_notification_operation_editor_specific_resource = Resource -view_alert_definition_notification_role_editor_loadFailed = Cannot determine current roles - starting empty -view_alert_definition_notification_role_editor_restoreFailed = Cannot use current roles - starting empty -view_alert_definition_notification_role_editor_saveFailed = Cannot save the selected roles -view_alert_definition_notification_user_editor_loadFailed = Cannot determine current users - starting empty -view_alert_definition_notification_user_editor_restoreFailed = Cannot use current users - starting empty -view_alert_definition_notification_user_editor_saveFailed = Cannot save the selected users -view_alert_definition_recovery_editor_disable_when_fired = Disable When Fired -view_alert_definition_recovery_editor_disable_when_fired_tooltip = Indicates if this alert will be disabled after it fires. Once disabled, the alert can be manually re-enabled or a recovery alert can be set up to automatically re-enable it. If this alert is a recovery alert itself, this setting cannot be turned on. -view_alert_definition_recovery_editor_loadFailed = Cannot build recovery menu -view_alert_definition_recovery_editor_none_available = None -view_alert_definition_recovery_editor_recovery_alert = Recover Alert -view_alert_definition_recovery_editor_recovery_alert_tooltip = The target alert that will be recovered (i.e. re-enabled) after this alert triggers. Do not select an alert here if you are not defining a recovery alert. -view_alert_definitions_create_failure = Alert definition creation failed -view_alert_definitions_create_success = Alert definition successfully created -view_alert_definitions_delete_confirm = Delete the selected alert definition(s)? -view_alert_definitions_delete_failure = Failed to deleted the selected alert definitions -view_alert_definitions_delete_success = Successfully deleted {0} alert definitions -view_alert_definitions_disable_confirm = Disable the selected alert definition(s)? -view_alert_definitions_disable_failure = Failed to disable the selected alert definitions -view_alert_definitions_disable_success = Successfully disabled {0} alert definitions -view_alert_definitions_enable_confirm = Enable the selected alert definition(s)? -view_alert_definitions_enable_failure = Failed to enable the selected alert definitions -view_alert_definitions_enable_success = Successfully enabled {0} alert definitions -view_alert_definitions_loadFailed = Failed to fetch alert definition data -view_alert_definitions_loadFailed_single = Failed to fetch data for alert definition with id {0} +view_alert_definition_notification_operation_editor_mode_unknown = 未知のオプション - これはバグです +view_alert_definition_notification_operation_editor_operations_loadFailed = 利用可能なオペレーションのリストをロードするのに失敗しました +view_alert_definition_notification_operation_editor_operations_no_parameters = この操作は一つもパラメータを取りません +view_alert_definition_notification_operation_editor_relative_ancestor = 検索を開始 +view_alert_definition_notification_operation_editor_relative_ancestor_loadFailed = タイプの祖先を取得できません +view_alert_definition_notification_operation_editor_relative_ancestor_root = ルートの祖先タイプ +view_alert_definition_notification_operation_editor_relative_ancestor_tooltip = タイプ階層のトップを選択します。それはタイプによるフィルターのために子孫のツリーを検索する元となります +view_alert_definition_notification_operation_editor_relative_descendant = 次によるフィルター +view_alert_definition_notification_operation_editor_relative_descendant_filter_tooltip = 選択したタイプに対応する複数のリソースが存在するときリソースをユニークに識別する具体的な名前。これは選択したタイプ階層においてそのリソースタイプの唯一のリソースしか存在しない場合はオプションです。 +view_alert_definition_notification_operation_editor_relative_descendant_loadFailed = タイプの子孫を取得できません +view_alert_definition_notification_operation_editor_relative_descendant_tooltip = 検索の開始セクションで定義されるルートタイプの下で検索するリソースタイプ +view_alert_definition_notification_operation_editor_specific_pick_button = 選択 +view_alert_definition_notification_operation_editor_specific_pick_error_invalid = リソースを選択してください +view_alert_definition_notification_operation_editor_specific_pick_error_no_operation = 一つ以上のオペレーションを持つリソースを選択してください +view_alert_definition_notification_operation_editor_specific_pick_text = リソースを選択する... +view_alert_definition_notification_operation_editor_specific_resource = リソース +view_alert_definition_notification_role_editor_loadFailed = 現在のロールを決定できません - 空から開始します +view_alert_definition_notification_role_editor_restoreFailed = 現在のロールを利用できません - 空から開始します +view_alert_definition_notification_role_editor_saveFailed = 選択されたロールを保存できません +view_alert_definition_notification_user_editor_loadFailed = 現在のユーザーを決定できません - 空から開始します +view_alert_definition_notification_user_editor_restoreFailed = 現在のユーザーを使用できません - 空から開始します +view_alert_definition_notification_user_editor_saveFailed = 選択したユーザーを保存できません +view_alert_definition_recovery_editor_disable_when_fired = 発火時間を無効にする +view_alert_definition_recovery_editor_disable_when_fired_tooltip = このアラートが発火した後に無効にされるべきか指定します。一度無効にされると、そのアラートは手動で再度有効にするか、または自動的に再度有効にするためのリカバリアラートを設定できます。 +view_alert_definition_recovery_editor_loadFailed = リカバリメニューを構築できません +view_alert_definition_recovery_editor_none_available = なし +view_alert_definition_recovery_editor_recovery_alert = アラートのリカバリ +view_alert_definition_recovery_editor_recovery_alert_tooltip = アラートが引き起こされた後にリカバリされる(つまり、再度有効化)ターゲットアラート。リカバリアラートを定義するのではないのならここでアラートを選択しないでください。 +view_alert_definitions_create_failure = アラート定義の作成に失敗しました +view_alert_definitions_create_success = アラート定義の作成に成功しました +view_alert_definitions_delete_confirm = 選択されたアラート定義を削除しますか? +view_alert_definitions_delete_failure = 選択されたアラート定義を削除するのに失敗しました +view_alert_definitions_delete_success = {0} アラート定義を削除するのに成功しました +view_alert_definitions_disable_confirm = 選択されたアラート定義を無効にしますか? +view_alert_definitions_disable_failure = 選択されたアラート定義を無効にするのに失敗しました +view_alert_definitions_disable_success = {0} アラート定義を無効にするのに成功しました +view_alert_definitions_enable_confirm = 選択されたアラート定義をにしますか? +view_alert_definitions_enable_failure = 選択されたアラート定義を有効にするのに失敗しました +view_alert_definitions_enable_success = {0} アラート定義を有効にするのに成功しました +view_alert_definitions_loadFailed = アラート定義データを取り出すのに失敗しました +view_alert_definitions_loadFailed_single = ID {0} の付いたアラート定義のデータを取り出すのに失敗しました view_alert_definitions_table_title_group = グループアラート定義 view_alert_definitions_table_title_resource = リソースアラート定義 -view_alert_definitions_update_failure = Alert definition update failed -view_alert_definitions_update_success = Alert definition successfully updated -view_alert_details_field_ack_at = Acknowledged at -view_alert_details_field_ack_by = Acknowledged by -view_alert_details_field_recovery_info = Recovery Info -view_alert_details_loadFailed = Failed to fetch alert details -view_alerts_ack_confirm = Acknowledge the selected alert(s)? -view_alerts_ack_confirm_all = Acknowledge all alerts from this source? -view_alerts_ack_failure = Failed to acknowledge alerts with id''s: {0} -view_alerts_ack_failure_all = Failed to acknowledge all alerts from this source -view_alerts_ack_success = Successfully acknowledged {0} alerts -view_alerts_delete_confirm = Delete the selected alert(s)? -view_alerts_delete_confirm_all = Delete all alerts from this source? -view_alerts_delete_failure = Failed to delete alerts with id''s: {0} -view_alerts_delete_failure_all = Failed to delete all alerts from this source -view_alerts_delete_success = Successfully deleted {0} alerts +view_alert_definitions_update_failure = アラート定義の更新に失敗しました +view_alert_definitions_update_success = アラート定義の更新に成功しました +view_alert_details_field_ack_at = 次の場所で確認済みです +view_alert_details_field_ack_by = 次の人によって確認済みです +view_alert_details_field_recovery_info = リカバリ情報 +view_alert_details_loadFailed = アラートの詳細を取り出すのに失敗しました +view_alerts_ack_confirm = 選択されたアラートを確認しますか? +view_alerts_ack_confirm_all = このソースからすべてのアラートを確認しますか? +view_alerts_ack_failure = ID {0} の付いたアラートを確認するのに失敗しました +view_alerts_ack_failure_all = このソースからすべてのアラートを確認するのに失敗しました +view_alerts_ack_success = {0} アラートの確認に成功しました +view_alerts_delete_confirm = 選択されたアラートを削除しますか? +view_alerts_delete_confirm_all = このソースからすべてのアラートを削除しますか? +view_alerts_delete_failure = ID {0} の付いたアラートを削除するのに失敗しました +view_alerts_delete_failure_all = このソースからすべてのアラートを削除するの失敗しました +view_alerts_delete_success = {0} アラートを削除するのに成功しました view_alerts_field_ack_status = ステータス view_alerts_field_ack_status_ack = 確認 ({0}) -view_alerts_field_ack_status_ackHover = Acknowledged by {0} at {1} +view_alerts_field_ack_status_ackHover = {1} において {0} によって確認されました view_alerts_field_ack_status_noAck = 未確認 -view_alerts_field_ack_status_noAckHover = Not yet Acknowledged +view_alerts_field_ack_status_noAckHover = まだ確認されていません view_alerts_field_ack_subject = 確認サブジェクト view_alerts_field_ack_time = 確認時刻 view_alerts_field_condition_text = 条件テキスト -view_alerts_field_condition_text_many = Multiple Conditions -view_alerts_field_condition_text_none = No Conditions -view_alerts_field_condition_value = Condition Value -view_alerts_field_created_time = 生成時刻 +view_alerts_field_condition_text_many = 複数条件 +view_alerts_field_condition_text_none = 条件なし +view_alerts_field_condition_value = 条件値 +view_alerts_field_created_time = 作成時刻 view_alerts_field_enabled = 有効 view_alerts_field_modified_time = 修正時刻 view_alerts_field_name = 名前 view_alerts_field_parent = 親 view_alerts_field_priority = 優先度 -view_alerts_field_protected = Protected -view_alerts_field_protected_tooltip = If true, this definition is protected from being changed by the parent definition. In other words, the parent definition settings will not override this definition. -view_alerts_loadFailed = Failed to fetch alerts data +view_alerts_field_protected = 保護されている +view_alerts_field_protected_tooltip = もしtrueなら、この定義は親定義による変更から保護されています。他の言葉で言えば、その親定義設定はこの定義を上書きしません。 +view_alerts_loadFailed = アラートデータを取り出すのにしました view_alerts_table_filter_priority = 優先度フィルター view_alerts_table_title_group = グループアラート履歴 view_alerts_table_title_resource = リソースアラート履歴 view_autoDiscoveryQ_committed = コミット済み -view_autoDiscoveryQ_confirmSelect = Also select the platform children? +view_autoDiscoveryQ_confirmSelect = プラットフォームの子も選択しますか? view_autoDiscoveryQ_deleted = 削除済み -view_autoDiscoveryQ_field_discoveryTime = Discovery Time -view_autoDiscoveryQ_field_inventoryStatus = Inventory Status -view_autoDiscoveryQ_field_key = Resource Key -view_autoDiscoveryQ_field_name = Resource Name -view_autoDiscoveryQ_field_parentId = Parent ID +view_autoDiscoveryQ_field_discoveryTime = 発見時刻 +view_autoDiscoveryQ_field_inventoryStatus = インベントリステータス +view_autoDiscoveryQ_field_key = リソースキー +view_autoDiscoveryQ_field_name = リソース名 +view_autoDiscoveryQ_field_parentId = 親ID view_autoDiscoveryQ_ignore = 無視 -view_autoDiscoveryQ_ignoreFailure = Failed to ignore resources -view_autoDiscoveryQ_ignoreSuccessful = You have successfully ignored the selected resources. +view_autoDiscoveryQ_ignoreFailure = リソースを無視するのに失敗しました +view_autoDiscoveryQ_ignoreSuccessful = 選択したリソースを無視するのに成功しました view_autoDiscoveryQ_ignored = 無視済み view_autoDiscoveryQ_import = インポート -view_autoDiscoveryQ_importFailure = Failed to import resources -view_autoDiscoveryQ_importSuccessful = You have successfully imported the selected resources. -view_autoDiscoveryQ_loadFailure = Failed to load the inventory discovery queue +view_autoDiscoveryQ_importFailure = リソースのインポートに失敗しました +view_autoDiscoveryQ_importSuccessful = 選択したリソースのインポートに成功しました。 +view_autoDiscoveryQ_loadFailure = インベントリディスカバリキューをロードするのに失敗しました view_autoDiscoveryQ_new = 新規 view_autoDiscoveryQ_newAndIgnored = 新規かつ無視済み -view_autoDiscoveryQ_noItems = No items to show -view_autoDiscoveryQ_noperm = (You are not authorized to view the auto-discovery queue) -view_autoDiscoveryQ_showStatus = Show +view_autoDiscoveryQ_noItems = 表示する項目がありません +view_autoDiscoveryQ_noperm = (自動ディスカバリキューを閲覧する権限がありません) +view_autoDiscoveryQ_showStatus = 表示 view_autoDiscoveryQ_title = 自動リカバリキュー -view_autoDiscoveryQ_unignore = 無視をしない -view_autoDiscoveryQ_unignoreFailure = Failed to unignore resources -view_autoDiscoveryQ_unignoreSuccessful = You have successfully unignored the selected resources. +view_autoDiscoveryQ_unignore = 無視解除 +view_autoDiscoveryQ_unignoreFailure = リソースを無視解除のに失敗しました +view_autoDiscoveryQ_unignoreSuccessful = 選択したリソースの無視解除に成功しました view_autoDiscoveryQ_uninventoried = インベントリ登録をしない -view_bundleVersion_loadFailure = Failed to load bundle version data +view_bundleVersion_loadFailure = バンドルバージョンデータをロードするのに失敗しました view_bundle_bundle = バンドル -view_bundle_bundleDeployment = Bundle Deployment -view_bundle_bundleDeployments = Bundle Deployments -view_bundle_bundleDestinations = Bundle Destinations -view_bundle_bundleFiles = Bundle Files -view_bundle_bundleType = Bundle Type -view_bundle_bundleVersion = Bundle Version -view_bundle_bundleVersions = Bundle Versions +view_bundle_bundleDeployment = バンドルデプロイ +view_bundle_bundleDeployments = バンドルデプロイ +view_bundle_bundleDestinations = バンドル宛先 +view_bundle_bundleFiles = バンドルファイル +view_bundle_bundleType = バンドルタイプ +view_bundle_bundleVersion = バンドルバージョン +view_bundle_bundleVersions = バンドルバージョン view_bundle_bundles = バンドル -view_bundle_createWizard_bundleDistro = Bundle Distribution -view_bundle_createWizard_cancelFailure = Failed to fully cancel the creation of bundle [{0}], version = [{1}] - the bundle may still exist in the database -view_bundle_createWizard_cancelSuccessful = Canceled the creation of bundle [{0}], version = [{1}] -view_bundle_createWizard_clickToUploadRecipe = Click to load a recipe file -view_bundle_createWizard_createFailure = Failed to create the bundle -view_bundle_createWizard_createSuccessful = You have successfully created a bundle named [{0}] with a version of [{1}] -view_bundle_createWizard_enterRecipe = Please supply a valid recipe -view_bundle_createWizard_enterUrl = Please enter a valid URL where the bundle distribution file can be downloaded from -view_bundle_createWizard_failedToUploadDistroFile = Failed to upload bundle distribution file -view_bundle_createWizard_failedToUploadFile = Failed to upload bundle file -view_bundle_createWizard_loadBundleFileFailure = Cannot obtain bundle file information from server -view_bundle_createWizard_noAdditionalFilesNeeded = No additional files need to be uploaded for this bundle -view_bundle_createWizard_noBundleTypesAvail = No bundle types are available -view_bundle_createWizard_noBundleTypesSupported = No bundle types are supported - you must deploy a valid plugin that supports bundle deployments -view_bundle_createWizard_provideBundleDistro = Provide a Bundle Distribution -view_bundle_createWizard_recipeOption = Recipe -view_bundle_createWizard_title = バンドル生成 -view_bundle_createWizard_uploadInProgress = Upload is in progress... This can take several minutes for large files -view_bundle_createWizard_uploadOption = Upload -view_bundle_createWizard_uploadStepName = Upload Bundle Files +view_bundle_createWizard_bundleDistro = バンドル配布 +view_bundle_createWizard_cancelFailure = バンドル [{0}], バージョン = [{1}] の作成の完全なキャンセルに失敗しました - バンドルはデータベースにまだ残っているかもしれません +view_bundle_createWizard_cancelSuccessful = バンドル [{0}], バージョン = [{1}] の作成をキャンセルしました +view_bundle_createWizard_clickToUploadRecipe = レシピファイルのロードするためにクリックしてください +view_bundle_createWizard_createFailure = バンドルを作成するのに失敗しました +view_bundle_createWizard_createSuccessful = バージョン [{1}] の [{0}] という名前のバンドルの作成に成功しました +view_bundle_createWizard_enterRecipe = 正しいレシピを提供してください +view_bundle_createWizard_enterUrl = バンドル配布ファイルをダウンロードできる正しいURLを入力してください +view_bundle_createWizard_failedToUploadDistroFile = バンドル配布ファイルのアップロードに失敗しました +view_bundle_createWizard_failedToUploadFile = バンドルファイルのアップロードに失敗しました +view_bundle_createWizard_loadBundleFileFailure = サーバーからバンドルファイル情報の取得ができません +view_bundle_createWizard_noAdditionalFilesNeeded = このバンドルのためにアップロードされる必要がある追加ファイルはありません +view_bundle_createWizard_noBundleTypesAvail = バンドルタイプが利用できません +view_bundle_createWizard_noBundleTypesSupported = バンドルタイプは一つもサポートされていません - バンドルデプロイメントをサポートする正しいプラグインをデプロイしなければなりません +view_bundle_createWizard_provideBundleDistro = バンドル配布の提供 +view_bundle_createWizard_recipeOption = レシピ +view_bundle_createWizard_title = バンドル作成 +view_bundle_createWizard_uploadInProgress = アップロード中です... この操作は大きいファイルの場合には数分かかることもありません +view_bundle_createWizard_uploadOption = アップロード +view_bundle_createWizard_uploadStepName = バンドルファイルのアップロード view_bundle_createWizard_urlOption = URL -view_bundle_createWizard_windowTitle = Bundle Creation Wizard -view_bundle_createWizard_youMustChooseOne = You must choose one option in order to create a bundle! -view_bundle_deleteConfirm = Are you sure you want to delete this bundle? All versions, destinations and deployments for this bundle will also be deleted. -view_bundle_deploy = Deploy -view_bundle_deployDir = Deploy Directory -view_bundle_deployWizard_deployStep = Deploy Bundle to Destination Platforms -view_bundle_deployWizard_deploying = Deploying... -view_bundle_deployWizard_deploymentCreated = Created Deployment... -view_bundle_deployWizard_deploymentCreatedDetail = You have created the deployment [{0}] with the description [{1}] -view_bundle_deployWizard_deploymentCreatedDetail_concise = You have created the deployment [{0}] -view_bundle_deployWizard_deploymentScheduled = Bundle Deployment Scheduled! -view_bundle_deployWizard_deploymentScheduledDetail = You have scheduled the bundle deployment [{0}] to the destination group [{1}] -view_bundle_deployWizard_deploymentScheduledDetail_concise = You have scheduled the bundle deployment -view_bundle_deployWizard_destinationCreatedDetail = You have created the destination [{0}] with the description [{1}] -view_bundle_deployWizard_destinationCreatedDetail_concise = You have created the destination [{0}] -view_bundle_deployWizard_error_1 = Failed to delete new deployment on Cancel -view_bundle_deployWizard_error_10 = Failed to create destination, it may already exist. (Note, for an existing destination deploy from the Destination view) -view_bundle_deployWizard_error_11 = Failed to find defined deployments. -view_bundle_deployWizard_error_12 = Failed to find defined bundles. -view_bundle_deployWizard_error_2 = Failed to delete new destination on Cancel -view_bundle_deployWizard_error_3 = Failed to Schedule Deployment! -view_bundle_deployWizard_error_4 = Failed to schedule deployment: {0} -view_bundle_deployWizard_error_5 = Failed to Create Deployment! -view_bundle_deployWizard_error_6 = Failed to create deployment: {0} -view_bundle_deployWizard_error_7 = Failed to get deployment name. -view_bundle_deployWizard_error_8 = You must select a valid resource group from the drop down -view_bundle_deployWizard_error_9 = Failed to delete new destination in nextPage -##view_bundle_deployWizard_error_noBundleConfig = Failed to obtain bundle target information. Is the group you selected a valid compatible group that can be targeted for bundle deployments? -view_bundle_deployWizard_getConfigSkip = No configuration needed for this bundle version. -view_bundle_deployWizard_getConfigStep = Set Deployment Configuration -view_bundle_deployWizard_getDestStep = New Destination -##view_bundle_deployWizard_getDest_deployDir = Deployment Directory -##view_bundle_deployWizard_getDest_deployDir_help = The directory where the bundle will be deployed. This directory will be the same for all deployments on all resources but it is relative to the destination base directory location. This means that the absolute directory may have a different path on the different target resources depending on where the base location is on all the different target resources. -##view_bundle_deployWizard_getDest_desc = Destination Description -##view_bundle_deployWizard_getDest_destBaseDirName = Base Location -##view_bundle_deployWizard_getDest_group_help = The group whose members will be the destination targets for all bundle deployments. Only compatible groups that contain resources that support bundle deployments are selectable. -##view_bundle_deployWizard_getDest_name = Destination Name -##view_bundle_deployWizard_getDest_name_help = The name of the destination, which will identify a particular group of resources and the destination directory on those resources for a particular bundle. -view_bundle_deployWizard_getInfoStep = Provide Deployment Information -view_bundle_deployWizard_getInfo_clean = Clean Deployment? (wipe deploy directory on destination platform) -view_bundle_deployWizard_getInfo_deploymentDesc = Deployment Description -view_bundle_deployWizard_getInfo_deploymentName = Deployment Name -view_bundle_deployWizard_getOptionsStep = Deploy Options -view_bundle_deployWizard_getOptions_deployLater = Deploy Later -view_bundle_deployWizard_getOptions_deployNow = Deploy Now -view_bundle_deployWizard_getOptions_deployTime = Deployment Time -view_bundle_deployWizard_selectBundleStep = Select Deployment Bundle -view_bundle_deployWizard_selectBundle_single = Select only a single bundle for deployment. -view_bundle_deployWizard_selectVersionStep = Select Deployment Bundle Version -view_bundle_deployWizard_selectVersion_latest = Latest Version [{0}] -view_bundle_deployWizard_selectVersion_live = Live Version [{0}] -view_bundle_deployWizard_selectVersion_select = Select Version from List: -view_bundle_deployWizard_title = バンドルデプロイウィザード -view_bundle_deploy_action = Action -view_bundle_deploy_backButton = Back to Destination -view_bundle_deploy_clickForError = Click the icon for the error message -view_bundle_deploy_deleteConfirm = Are you sure you want to delete this bundle deployment? -view_bundle_deploy_deleteFailure = Failed to delete the bundle deployment [{0}] -view_bundle_deploy_deleteSuccessful = You successfully deleted the bundle deployment [{0}] -view_bundle_deploy_deployedBy = Deployed By -view_bundle_deploy_deploymentPlatforms = Deployment Resource -view_bundle_deploy_installDetails = Install Details -view_bundle_deploy_loadBundleFailure = Failed to find bundle -view_bundle_deploy_loadDeployFailure = Failed to load bundle deployments -view_bundle_deploy_loadFailure = Failed to load bundle deployment -view_bundle_deploy_name = Deployment Name -view_bundle_deploy_selectARow = Select a row to show installation details -view_bundle_deploy_tagUpdateFailure = Failed to update bundle deployment tags -view_bundle_deploy_tagUpdateSuccessful = You have successfully updated the bundle deployment tags -view_bundle_deploy_time = Deployment Time -view_bundle_deployed = Deployed -view_bundle_deployments = Deployments -view_bundle_dest_backToBundle = Back to Bundle -##view_bundle_dest_baseDirName = Base Location -view_bundle_dest_created = Created -view_bundle_dest_deleteConfirm = Are you sure you want to delete this bundle destination? This only deletes it from the database; all bundle content that was deployed to this destination on remote machines will remain. -view_bundle_dest_deleteFailure = Failed to delete the bundle destination [{0}] -view_bundle_dest_deleteSuccessful = You successfully deleted the bundle destination [{0}] -view_bundle_dest_deployDir = Deploy Directory -view_bundle_dest_group = Group -view_bundle_dest_lastDeployedVersion = Last Deployed Version -view_bundle_dest_lastDeploymentDate = Last Deployment Date -view_bundle_dest_lastDeploymentStatus = Last Deployment Status -view_bundle_dest_loadFailure = Failed to load bundle destinations -view_bundle_dest_loadFailureVersionInfo = Failed to load bundle destination deployed version information -view_bundle_dest_purgeConfirm = This will purge the bundle content from all remote machines. Are you sure you want to do this? -view_bundle_dest_purgeFailure = Failed to purge the bundle destination [{0}] from some or all of the remote machines. -view_bundle_dest_purgeSuccessful = You successfully purged the bundle destination [{0}] from all of the remote machines. -view_bundle_dest_revertConfirm = This will revert all remote machines back to the previous bundle deployment. Are you sure you want to do this? -view_bundle_dest_tagUpdateFailure = Failed to update bundle destination tags -view_bundle_dest_tagUpdateSuccessful = You have successfully updated the bundle destination tags -view_bundle_destinations = Destinations -view_bundle_fileListView_fileSize = File Size -view_bundle_fileListView_loadFailure = Failed to load bundle file data +view_bundle_createWizard_windowTitle = バンドル作成ウィザード +view_bundle_createWizard_youMustChooseOne = バンドルを作成するためのオプションを選択しなければなりません +view_bundle_deleteConfirm = このバンドルを削除してもよろしいですか? このバンドルのすべてのバージョン、宛先、デプロイも削除されます。 +view_bundle_deploy = デプロイ +view_bundle_deployDir = デプロイディレクトリ +view_bundle_deployWizard_deployStep = 宛先プラットフォームへのバンドルのデプロイ +view_bundle_deployWizard_deploying = デプロイ中... +view_bundle_deployWizard_deploymentCreated = 作成されたデプロイメント... +view_bundle_deployWizard_deploymentCreatedDetail = ディスクリプション [{1}] の付いたデプロイメント [{0}] を作成しました +view_bundle_deployWizard_deploymentCreatedDetail_concise = デプロイメント [{0}] を作成しました +view_bundle_deployWizard_deploymentScheduled = バンドルデプロイがスケジュールされました! +view_bundle_deployWizard_deploymentScheduledDetail = バンドルデプロイメント [{0}] を宛先グループ [{1}] にスケジュールしました +view_bundle_deployWizard_deploymentScheduledDetail_concise = バンドルデプロイメントがスケジュールされました +view_bundle_deployWizard_destinationCreatedDetail = ディスクリプション [{1}] の付いたデプロイメント [{0}] を作成しました +view_bundle_deployWizard_destinationCreatedDetail_concise = 宛先 [{0}] を作成しました +view_bundle_deployWizard_error_1 = キャンセルについての新しいデプロイメントの削除に失敗しました +view_bundle_deployWizard_error_10 = 宛先の作成に失敗しました。それはすでに存在するかもしれません。 (注意：宛先ビューから既存の宛先デプロイのため) +view_bundle_deployWizard_error_11 = 定義済みデプロイメントの検索に失敗しました +view_bundle_deployWizard_error_12 = 定義済みバンドルの検索に失敗しました +view_bundle_deployWizard_error_2 = キャンセルについての新しい宛先の削除に失敗しました +view_bundle_deployWizard_error_3 = デプロイメントのスケジュールに失敗しました! +view_bundle_deployWizard_error_4 = デプロイメントのスケジュールに失敗しました: {0} +view_bundle_deployWizard_error_5 = デプロイメントの作成に失敗しました! +view_bundle_deployWizard_error_6 = デプロイメントの作成に失敗しました: {0} +view_bundle_deployWizard_error_7 = デプロイメント名の取得に失敗しました +view_bundle_deployWizard_error_8 = ドロップダウンから正しいリソースグループを選択しなければなりません +view_bundle_deployWizard_error_9 = 次ページでの新しい宛先の削除に失敗しました +view_bundle_deployWizard_getConfigSkip = このバンドルバージョンには構成は必要ありません +view_bundle_deployWizard_getConfigStep = デプロイメント構成の設定 +view_bundle_deployWizard_getDestStep = 新しい宛先 +view_bundle_deployWizard_getDest_deployDir = ルートデプロイディレクトリ (宛先プラットフォーム上での) +view_bundle_deployWizard_getDest_desc = 宛先の説明 +view_bundle_deployWizard_getDest_name = 宛先名 +view_bundle_deployWizard_getInfoStep = デプロイ情報の提供 +view_bundle_deployWizard_getInfo_clean = クリーンデプロイですか? (宛先プラットフォーム上でのデプロイディレクトリを掃除する) +view_bundle_deployWizard_getInfo_deploymentDesc = デプロイの説明 +view_bundle_deployWizard_getInfo_deploymentName = デプロイ名 +view_bundle_deployWizard_getOptionsStep = デプロイオプション +view_bundle_deployWizard_getOptions_deployLater = 後でデプロイする +view_bundle_deployWizard_getOptions_deployNow = 今すぐデプロイする +view_bundle_deployWizard_getOptions_deployTime = デプロイ時刻 +view_bundle_deployWizard_selectBundleStep = デプロイバンドルの選択 +view_bundle_deployWizard_selectBundle_single = デプロイのために単一バンドルだけを選択してください +view_bundle_deployWizard_selectVersionStep = バンドルバージョンを選択してください +view_bundle_deployWizard_selectVersion_latest = 最新バージョン [{0}] +view_bundle_deployWizard_selectVersion_live = 動作バージョン [{0}] +view_bundle_deployWizard_selectVersion_select = リストからバージョンを選択してください: +view_bundle_deployWizard_title = バンドルデプロイのウィザード +view_bundle_deploy_action = アクション +view_bundle_deploy_backButton = 宛先に戻る +view_bundle_deploy_clickForError = エラーメッセージのアイコンをクリックしてください +view_bundle_deploy_deleteConfirm = このバンドルデプロイを削除してもよろしいですか? +view_bundle_deploy_deleteFailure = バンドルデプロイ [{0}] の削除に失敗しました +view_bundle_deploy_deleteSuccessful = バンドルデプロイ [{0}] の削除に成功しました +view_bundle_deploy_deployedBy = 次によってデプロイされた +view_bundle_deploy_deploymentPlatforms = デプロイプラットフォーム +view_bundle_deploy_installDetails = 詳細のインストール +view_bundle_deploy_loadBundleFailure = バンドルの検索に失敗しました +view_bundle_deploy_loadDeployFailure = バンドルデプロイのロードに失敗しました +view_bundle_deploy_loadFailure = バンドルデプロイのロードに失敗しました +view_bundle_deploy_name = デプロイ名 +view_bundle_deploy_operatingSystem = オペレーティングシステム +view_bundle_deploy_selectARow = インストールの詳細を表示するために行を選択してください +view_bundle_deploy_tagUpdateFailure = バンドルデプロイタブの更新に失敗しました +view_bundle_deploy_tagUpdateSuccessful = バンドルデプロイタグの更新に成功しました +view_bundle_deploy_time = デプロイ名 +view_bundle_deployed = デプロイ +view_bundle_deployments = デプロイ +view_bundle_dest_backToBundle = バンドルへ戻る +view_bundle_dest_created = 作成された +view_bundle_dest_deleteConfirm = このバンドル宛先を削除してもよろしいですか? これはデータベースから削除するだけです。つまり、リモートマシンのこの宛先にデプロイされたすべてのバンドルの内容は残り続けます +view_bundle_dest_deleteFailure = バンドル宛先 [{0}] の削除に失敗しました +view_bundle_dest_deleteSuccessful = バンドル宛先 [{0}] の削除に成功しました +view_bundle_dest_deployDir = デプロイディレクトリ +view_bundle_dest_group = グループ +view_bundle_dest_lastDeployedVersion = 最後にデプロイされたバージョン +view_bundle_dest_lastDeploymentDate = 最後のデプロイされたい日付 +view_bundle_dest_lastDeploymentStatus = 最後にデプロイされたステータス +view_bundle_dest_loadFailure = バンドルの宛先をロードするのに失敗しました +view_bundle_dest_loadFailureVersionInfo = デプロイされたバージョン情報のロードに失敗しました +view_bundle_dest_purgeConfirm = この操作はすべてのリモートマシンからバンドルコンテントを除去します。よろしいですか? +view_bundle_dest_purgeFailure = リモートマシンの一部あるいはすべてからのバンドル宛先 [{0}] の除去に失敗しました +view_bundle_dest_purgeSuccessful = リモートマシンの一部あるいはすべてからのバンドル宛先 [{0}] の除去に成功しました +view_bundle_dest_revertConfirm = これはすべてのリモートマシンを以前のバンドルデプロイメントへ戻します。これをしてもよろしいですか? +view_bundle_dest_tagUpdateFailure = バンドル宛先タグの更新に失敗しました +view_bundle_dest_tagUpdateSuccessful = バンドル宛先タグの更新に成功しました +view_bundle_destinations = 宛先 +view_bundle_fileListView_fileSize = ファイルサイズ +view_bundle_fileListView_loadFailure = バンドルファイルデータをロードするのに失敗しました view_bundle_fileListView_md5 = MD5 view_bundle_fileListView_sha256 = SHA256 -view_bundle_files = Files +view_bundle_files = ファイル view_bundle_latestVersion = 最新バージョン -view_bundle_list_backToAll = Back to All Bundles -view_bundle_list_deleteConfirm = Are you sure you want to delete the selected bundles? -view_bundle_list_deleteFailure = Failed to delete the bundle [{0}] -view_bundle_list_deleteSuccessful = You successfully deleted the bundle [{0}] -view_bundle_list_deletesFailure = Failed to delete the bundles -view_bundle_list_deletesSuccessful = You successfully deleted the bundles -view_bundle_list_destinationsCount = Destinations Count -view_bundle_list_error1 = Failed to load bundle to deploy [{0}] -view_bundle_list_error2 = Failed to get a single bundle to deploy [{0}] -view_bundle_list_error3 = Failed to load bundle -view_bundle_list_loadFailure = Failed to load the bundle to be deployed [{0}] -view_bundle_list_loadWithLatestFailure = Failed to load bundle with the latest version data -view_bundle_list_singleLoadFailure = Failed to get a single bundle to be deployed [{0}] -view_bundle_list_tagUpdateFailure = Failed to update bundle tags -view_bundle_list_tagUpdateSuccessful = You have successfully updated the bundle tags -view_bundle_list_versionsCount = Versions Count -view_bundle_purge = Purge -view_bundle_recipe = Recipe -view_bundle_resDeployDS_loadFailure = Failed to load bundle resource deployments -view_bundle_revert = Revert -view_bundle_revertWizard_confirmStep_confirmation = Reverting Live Deployment to Previous Deployment. Click "Next" to continue... -view_bundle_revertWizard_confirmStep_failedToFindLiveDeployment = Failed to find live deployment; cannot revert -view_bundle_revertWizard_confirmStep_liveDeployment = Live Deployment -view_bundle_revertWizard_confirmStep_name = Revert Deployment Confirmation -view_bundle_revertWizard_confirmStep_noLiveDeployment = No live deployment was found for the destination [{0}] -view_bundle_revertWizard_confirmStep_noLiveDeployment_concise = No live deployment was found for the destination -view_bundle_revertWizard_confirmStep_noPriorDeployment = The live deployment [{0}] cannot be reverted because there is no prior deployment for the destination [{1}] -view_bundle_revertWizard_confirmStep_noPriorDeployment_concise = The live deployment cannot be reverted because there is no prior deployment -view_bundle_revertWizard_confirmStep_prevDeployment = Previous Deployment -view_bundle_revertWizard_getInfoStep_cleanDeploy = Clean Deployment? (this will delete an old, existing deploy directory prior to starting the revert deployment) -view_bundle_revertWizard_getInfoStep_getNameFailure = Failed to get revert deployment name -view_bundle_revertWizard_getInfoStep_name = Provide Revert Information -view_bundle_revertWizard_getInfoStep_revertDeployDesc = Revert Deploy Description -view_bundle_revertWizard_getInfoStep_revertDeployDescFull = [REVERT From]\n{0}\n\n[REVERT To]\n{1} -view_bundle_revertWizard_getInfoStep_revertDeployName = Revert Deploy Name -view_bundle_revertWizard_revertStep_name = Deploy Bundle to Destination Platforms -view_bundle_revertWizard_revertStep_reverting = Reverting... -view_bundle_revertWizard_revertStep_scheduled = You have successfully scheduled the revert deployment! -view_bundle_revertWizard_revertStep_scheduledDetails = You have successfully scheduled to revert the bundle deployment [{0}] from resource group [{1}] -view_bundle_revertWizard_revertStep_scheduledFailure = Failed to schedule revert deployment! +view_bundle_list_backToAll = すべてのバンドルへ戻る +view_bundle_list_deleteConfirm = スケジュールされたバンドルを削除してもよろしいですか? +view_bundle_list_deleteFailure = バンドル [{0}] の削除に失敗しました +view_bundle_list_deleteSuccessful = バンドル [{0}] の削除に成功しました +view_bundle_list_deletesFailure = バンドルの削除に失敗しました +view_bundle_list_deletesSuccessful = バンドルの削除に成功しました +view_bundle_list_destinationsCount = 宛先数 +view_bundle_list_error1 = [{0}] をデプロイするためのバンドルのロードに失敗しました +view_bundle_list_error2 = [{0}] をデプロイするための単一バンドルの取得に失敗しました +view_bundle_list_error3 = バンドルのロードに失敗しました +view_bundle_list_loadFailure = デプロイされるバンドル [{0}] のロードに失敗しました +view_bundle_list_loadWithLatestFailure = 最新バージョンデータを持つバンドルのロードに失敗しました +view_bundle_list_singleLoadFailure = デプロイされる単一バンドル [{0}] の取得に失敗しました +view_bundle_list_tagUpdateFailure = バンドルタグの更新に失敗しました +view_bundle_list_tagUpdateSuccessful = バンドルタグの更新に成功しました +view_bundle_list_versionsCount = バージョン数 +view_bundle_purge = 除去 +view_bundle_recipe = リシピ +view_bundle_resDeployDS_loadFailure = バンドルリソースデプロイのロードに失敗しました +view_bundle_revert = 取り消す +view_bundle_revertWizard_confirmStep_confirmation = 動作中のデプロイを以前のデプロイへ取り消し中です。継続するには"次へ"をクリックしてください。 +view_bundle_revertWizard_confirmStep_failedToFindLiveDeployment = 動作中のデプロイが見つかりません。取り消しができません。 +view_bundle_revertWizard_confirmStep_liveDeployment = 動作中のデプロイ +view_bundle_revertWizard_confirmStep_name = 取り消しデプロイ確認 +view_bundle_revertWizard_confirmStep_noLiveDeployment = その宛先 [{0}] 用の動作中のデプロイは見つかりませんでした +view_bundle_revertWizard_confirmStep_noLiveDeployment_concise = その宛先用の動作中のデプロイは見つかりませんでした +view_bundle_revertWizard_confirmStep_noPriorDeployment = 以前のデプロイ [{1}] が存在しないので動作中のデプロイ [{0}] は取り消すことができませんでした +view_bundle_revertWizard_confirmStep_noPriorDeployment_concise = 以前のデプロイが存在しないので動作中のデプロイは取り消すことができませんでした +view_bundle_revertWizard_confirmStep_prevDeployment = 以前のデプロイ +view_bundle_revertWizard_getInfoStep_cleanDeploy = デプロイを削除しますか? (これは古い、既存のデプロイディレクトリを取り消しデプロイを開始する前に削除します) +view_bundle_revertWizard_getInfoStep_getNameFailure = 取り消しデプロイ名の取得に失敗しました +view_bundle_revertWizard_getInfoStep_name = 取り消し情報の提供 +view_bundle_revertWizard_getInfoStep_revertDeployDesc = デプロイ記述の取り消し +view_bundle_revertWizard_getInfoStep_revertDeployDescFull = [取り消し前]\n{0}\n\n[取り消し後]\n{1} +view_bundle_revertWizard_getInfoStep_revertDeployName = デプロイ名の取り消し +view_bundle_revertWizard_revertStep_name = 宛先プラットフォームへバンドルをデプロイ +view_bundle_revertWizard_revertStep_reverting = 取り消し中... +view_bundle_revertWizard_revertStep_scheduled = デプロイの取り消しのスケジュールに成功しました。 +view_bundle_revertWizard_revertStep_scheduledDetails = リソースグループ [{1}] からバンドルデプロイ [{0}] の取り消しのスケジュールに成功しました +view_bundle_revertWizard_revertStep_scheduledFailure = デプロイの取り消しのスケジュールに失敗しました view_bundle_revertWizard_title = バンドル取り消し view_bundle_revertWizard_windowTitle = バンドル取り消しウィザード -view_bundle_tree_loadFailure = Failed to load bundle data -view_bundle_version_backToBundle = Back to Bundle -view_bundle_version_bundleVersionTagUpdateFailure = Failed to update bundle version tags -view_bundle_version_bundleVersionTagUpdateSuccessful = You have successfully updated the bundle version tags -view_bundle_version_deleteConfirm = Are you sure you want to delete this bundle version? -view_bundle_version_deleteFailure = Failed to delete the bundle version [{0}] -view_bundle_version_deleteSuccessful = You successfully deleted the bundle version [{0}] -view_bundle_version_loadFailure = Failed to load bundle version +view_bundle_tree_loadFailure = バンドルデータのロードに失敗しました +view_bundle_version_backToBundle = バンドルへ戻る +view_bundle_version_bundleVersionTagUpdateFailure = バンドルバージョンタグの更新に失敗しました +view_bundle_version_bundleVersionTagUpdateSuccessful = バンドルバージョンタグの更新に成功しました +view_bundle_version_deleteConfirm = このバンドルバージョンを削除してもよろしいですか? +view_bundle_version_deleteFailure = このバンドルバージョン [{0}] を削除するのに失敗しました +view_bundle_version_deleteSuccessful = バンドルバージョン [{0}] の削除に成功しました +view_bundle_version_loadFailure = バンドルバージョンのロードに失敗しました view_bundle_versions = バージョン -view_configCompare_comparingConfigs = Comparing Configurations -view_configCompare_configCompare = Configuration Comparison -view_configEdit_addItem = Add Item to List -view_configEdit_confirm_1 = Are you sure you want to delete the selected properties from the set? -view_configEdit_confirm_2 = Are you sure you want to delete this row? -view_configEdit_confirm_3 = Are you sure you want to delete the [{0}] selected [{1}]? -view_configEdit_editRow = Edit Row -view_configEdit_enterPropName = Enter the name of the property to be added. -view_configEdit_error_1 = Configuration is not supported by this Resource. -view_configEdit_error_2 = Connection settings are not supported by this Resource. -view_configEdit_error_3 = Cannot add property named [{0}]. The property name is already used in the set. -view_configEdit_files = Files -view_configEdit_hideAll = Hide All +view_configCompare_comparingConfigs = 構成の比較 +view_configCompare_configCompare = 構成の比較 +view_configEdit_addItem = リストに項目を追加 +view_configEdit_confirm_1 = その集まりから選択されたプロパティを削除してもよろしいですか? +view_configEdit_confirm_2 = この行を削除してもよろしいですか? +view_configEdit_confirm_3 = [{1}] が選択された [{0}] を削除してもよろしいですか? +view_configEdit_editRow = 行の編集 +view_configEdit_enterPropName = 追加するプロパティの名前を入力してください +view_configEdit_error_1 = 構成はこのリソースでサポートされていません +view_configEdit_error_2 = 接続設定はこのリソースでサポートされていません +view_configEdit_error_3 = [{0}] という名前のプロパティを追加できません。プロパティ名はその集まりですでに使われています。 +view_configEdit_files = ファイル +view_configEdit_hideAll = すべて隠す view_configEdit_jumpToSection = セクションへのジャンプ -view_configEdit_msg_1 = Added property [{0}] to the set. -view_configEdit_msg_2 = Removed properties from the set. -view_configEdit_msg_3 = [{0} {1}] deleted from list. -view_configEdit_msg_4 = Item added to list. -view_configEdit_properties = Properties -view_configEdit_tooltip_1 = Delete the selected items from the list. -view_configEdit_tooltip_2 = Add an item to the list. -view_configEdit_viewRow = View Row -view_configurationDetails_allPropertiesValid = All configuration properties have valid values, so the configuration can now be saved. -view_configurationDetails_configNotUpdatedDueToNoChange = Configuration was not updated, since the new configuration is equivalent to the current configuration. -view_configurationDetails_error_updateFailure = Failed to update configuration. -view_configurationDetails_messageConcise = Configuration updated - current version is {0}. -view_configurationDetails_messageDetailed = Configuration updated to version {0} for Resource [{1}]. -view_configurationDetails_noPermission = You do not have permission to edit this Resource''s configuration. -view_configurationDetails_somePropertiesInvalid = The following configuration properties have invalid values: {0}. The values must be corrected before the configuration can be saved. -view_configurationHistoryDetails_error_loadFailure = Unable to load configuration history. -view_configurationHistoryList_cannotDeleteCurrent = One of the selected history items represents the current configuration - you cannot delete it. -view_configurationHistoryList_cannotDeleteGroupItems = One or more selected configuration history items are part of a group configuration update. You must purge that parent group history item before you can delete its individual resource history items. -view_configurationHistoryList_delete_failure = Failed to delete the configuration history items. -view_configurationHistoryList_delete_success = You successfully deleted the selected configuration history items. -view_configurationHistoryList_rollback = Rollback -view_configurationHistoryList_rollback_failure = Failed to rollback the configuration. The original configuration is still in effect. -view_configurationHistoryList_rollback_success = You successfully rolled back the configuration to the selected past configuration. -view_configurationHistoryList_table_clickStatusIcon = Click the status icon for full details -view_configurationHistoryList_table_statusFailure = This configuration update failed -view_configurationHistoryList_table_statusInprogress = This configuration update is still in progress -view_configurationHistoryList_table_statusNochange = No changes were made to this configuration -view_configurationHistoryList_table_statusSuccess = This configuration update was successful +view_configEdit_msg_1 = プロパティ [{0}] をセットに追加しました +view_configEdit_msg_2 = セットからプロパティを取り除きました +view_configEdit_msg_3 = [{0} {1}] がリストから削除されました +view_configEdit_msg_4 = リストに追加されたアイテム +view_configEdit_properties = プロパティ +view_configEdit_tooltip_1 = リストから選択されたアイテムが削除します +view_configEdit_tooltip_2 = リストにアイテムを追加します +view_configEdit_viewRow = 行の閲覧 +view_configurationDetails_allPropertiesValid = すべての構成プロパティは正しい値なので、この構成は保存可能です +view_configurationDetails_configNotUpdatedDueToNoChange = 構成は更新されませんでした。なぜなら新しい構成は現在の構成と同一だからです +view_configurationDetails_error_updateFailure = 構成の更新に失敗しました +view_configurationDetails_messageConcise = 構成は更新されました - 現在のバージョンは {0} です +view_configurationDetails_messageDetailed = リソース [{1}] の構成はバージョン {0} へ更新されました +view_configurationDetails_noPermission = このリソースの構成を編集する権限がありません +view_configurationDetails_somePropertiesInvalid = 次の構成プロパティは不正な値： {0} です。この値は構成が保存される前に訂正されなければなりません。 +view_configurationHistoryDetails_error_loadFailure = 構成履歴をロードできません +view_configurationHistoryList_cannotDeleteCurrent = 選択された履歴の中に現在の構成が含まれています - 削除できません +view_configurationHistoryList_cannotDeleteGroupItems = 選択された構成履歴はグループ構成の更新を含みます。個別のリソース履歴を削除できるようにする前に親のグループ履歴を除去しなければなりません +view_configurationHistoryList_delete_failure = 構成履歴の削除に失敗しました +view_configurationHistoryList_delete_success = 選択された構成履歴の削除に成功しました +view_configurationHistoryList_rollback = ロールバック +view_configurationHistoryList_rollback_failure = 構成のロールバックに失敗しました。オリジナルの構成はまだ有効です。 +view_configurationHistoryList_rollback_success = 選択された過去の構成に構成をロールバックすることに成功しました。 +view_configurationHistoryList_table_clickStatusIcon = 詳細はステータスアイコンをクリックしてください +view_configurationHistoryList_table_statusFailure = この構成の更新は失敗しました +view_configurationHistoryList_table_statusInprogress = この構成の更新はまだ進行中です +view_configurationHistoryList_table_statusNochange = この構成は何も変更されていません +view_configurationHistoryList_table_statusSuccess = この構成の更新は成功しました view_configurationHistoryList_title = 構成履歴 -view_connectionSettingsDetails_allPropertiesValid = All connection settings have valid values, so the settings can now be saved. -view_connectionSettingsDetails_error_updateFailure = Failed to update connection settings. -##view_connectionSettingsDetails_messageConcise_updateSuccess = Connection settings update initiated. -##view_connectionSettingsDetails_messageDetailed_updateSuccess = Connection settings update initiated for Resource [{0}].\n -view_connectionSettingsDetails_noPermission = You do not have permission to edit this Resource''s connection settings. -view_connectionSettingsDetails_somePropertiesInvalid = The following connection settings have invalid values: {0}. The values must be corrected before the settings can be saved. -view_core_error_1 = New Alerts lookup failed -view_core_loggedOut = Logged out -view_core_noRecentAlerts = There are no recent alerts to report -view_core_recentAlerts = There are [{0}] recent alerts - click to go to the recent alerts report +view_connectionSettingsDetails_allPropertiesValid = すべてのコネクション設定は正しい値ですので、その設定は保存可能です +view_connectionSettingsDetails_error_updateFailure = コネクション設定の更新に失敗しました +view_connectionSettingsDetails_messageConcise_updateSuccess = コネクション設定が更新されました +view_connectionSettingsDetails_messageDetailed_updateSuccess = リソース [{0} のためのコネクション設定が更新されました +view_connectionSettingsDetails_noPermission = このリソースのコネクション設定を編集する権限がありません +view_connectionSettingsDetails_somePropertiesInvalid = 次のコネクション設定は不正な値: {0} です。設定を保存する前に訂正しなければなりません。 +view_core_error_1 = 新規アラートの参照に失敗しました +#view_core_loggedInAs = Logged in as {0} +view_core_loggedOut = ログアウト +view_core_noRecentAlerts = レポートすべき最近のアラートは存在しません +view_core_recentAlerts = [{0}] 個の最近のアラートがありました - 最近のアラートレポートへクリックしてください view_core_uncaught = グローバルにキャッチされない例外 -view_dashboardManager_deleteFail = Failed to delete dashboard. -view_dashboardManager_deleted = Successfully deleted dashboard {0} -view_dashboardManager_error = Failed to save dashboard to server -view_dashboardManager_saved = Saved dashboard {0} to server -view_dashboardManager_success = Saved dashboard -view_dashboard_favorites_error1 = Failed to load favorite Resources. -view_dashboardsManager_error1 = Failed to add new dashboard -view_dashboardsManager_message_title_details = <h1>RHQへようこそ2</h1>\nRHQプロジェクトは抽象化されたプラグインベースのシステム管理スイートで、複数のプロダクトやプラットフォームに対してコア機能を横断的に適用できる拡張可能で、統合化されたシステム管理を提供します。このプロジェクトはレイヤ化されたモジュールによって設計されていて、デプロイのための柔軟なアーキテクチャを提供します。それは企業全体に対する監査と履歴の管理を提供するコアとなるユーザーインタフェースを導入します。サーバー/エージェントアーキテクチャはリモートでの管理と特定プロダクトのサポートを実現するプラグインを提供します。 \n このデフォルトのダッシュボードは上の「編集モード」ボタンをすることで編集可能です。 -view_dashboards_confirm1 = Are you sure you want to delete -view_dashboards_portlets_refresh_fail1 = Failed to update interval for portlets that auto-refresh -view_dashboards_portlets_refresh_fail2 = Failed to disable reload for portlets that auto-refresh -view_dashboards_portlets_refresh_multiple_min = {0} minutes -view_dashboards_portlets_refresh_none = No Refresh -view_dashboards_portlets_refresh_one_min = 1 minute -view_dashboards_portlets_refresh_success1 = Updated interval for portlets that auto-refresh -view_dashboards_portlets_refresh_success2 = Stopping reload for portlets that auto-refresh +view_dashboardManager_deleteFail = ダッシュボードの削除に失敗しました +view_dashboardManager_deleted = ダッシュボード {0} の削除に成功しました +view_dashboardManager_error = ダッシュボードをサーバーへ保存するのに失敗しました +view_dashboardManager_saved = ダッシュボード {0} をサーバーへ保存しました +view_dashboardManager_success = ダッシュボードを保存しました +view_dashboard_favorites_error1 = 好みのリソースをロードするのに失敗しました +view_dashboardsManager_error1 = 新しいダッシュボードを追加するのに失敗しました +view_dashboardsManager_message_title_details = <h1>RHQへようこそ</h1>\nRHQプロジェクトは抽象化されたプラグインベースのシステム管理スイートで、複数のプロダクトやプラットフォームに対してコア機能を横断的に適用できる拡張可能で、統合化されたシステム管理を提供します。このプロジェクトはレイヤ化されたモジュールによって設計されていて、デプロイのための柔軟なアーキテクチャを提供します。それは企業全体に対する監査と履歴の管理を提供するコアとなるユーザーインタフェースを導入します。サーバー/エージェントアーキテクチャはリモートでの管理と特定プロダクトのサポートを実現するプラグインを提供します。 \n このデフォルトのダッシュボードは上の「編集モード」ボタンをすることで編集可能です。 +view_dashboards_confirm1 = 削除してもよろしいですか +view_dashboards_portlets_refresh_fail1 = 自動リフレッシュするポートレットのリフレッシュ間隔の更新に失敗しました +view_dashboards_portlets_refresh_fail2 = 自動リフレッシュするポートレットのリロードの無効化に失敗しました +view_dashboards_portlets_refresh_multiple_min = {0} 分 +view_dashboards_portlets_refresh_none = リフレッシュなし +view_dashboards_portlets_refresh_one_min = 1 分 +view_dashboards_portlets_refresh_success1 = ポートレットの自動リフレッシュ間隔を更新しました +view_dashboards_portlets_refresh_success2 = 自動リフレッシュするポートレットのリロードを停止しています view_dashboards_title = ダッシュボード -view_dynagroup_children = DynaGroup Children +view_dynagroup_children = 動的グループの子 view_dynagroup_compatible = Compatible -view_dynagroup_definitionAlreadyExists = A group definition already exists with this name -view_dynagroup_definitionCreated = You have successfully created a group definition named [{0}] -view_dynagroup_definitionLoadFailure = Failed to load group definitions -view_dynagroup_definitions = DynaGroup Definitions -view_dynagroup_deleteFailureSelection = Failed to delete the selected group definitions -view_dynagroup_deleteSuccessfulSelection = You have successfully deleted [{0}] group definitions -view_dynagroup_editing = Editing [{0}] -view_dynagroup_exprBuilder_addExpression = Add Expression -view_dynagroup_exprBuilder_comparisonType = Comparison Type -view_dynagroup_exprBuilder_comparisonType_contains = contains -view_dynagroup_exprBuilder_comparisonType_endsWith = ends with -view_dynagroup_exprBuilder_comparisonType_equals = equals -view_dynagroup_exprBuilder_comparisonType_startsWith = starts with -view_dynagroup_exprBuilder_comparisonType_tooltip = Comparison Type -view_dynagroup_exprBuilder_definingPlugin = Defining Plugin -view_dynagroup_exprBuilder_definingPlugin_tooltip = The plugin to search -view_dynagroup_exprBuilder_expression = Expression -view_dynagroup_exprBuilder_expressionType = Expression Type -view_dynagroup_exprBuilder_expressionType_pluginConfig = Plugin Configuration -view_dynagroup_exprBuilder_expressionType_resource = Resource -view_dynagroup_exprBuilder_expressionType_resourceCategory = Resource Category -view_dynagroup_exprBuilder_expressionType_resourceConfig = Resource Configuration -view_dynagroup_exprBuilder_expressionType_resourceType = Resource Type -view_dynagroup_exprBuilder_expressionType_tooltip = The type of property this expression switches on: Resource: A resource property such as its name or version Resource Type: Search for resources of a specific type Resource Category: Search for resources by category: platform, server, service Trait: Resources that have selected values for a monitored trait Plugin Configuration: Search by the plugin component configuration setting of the component Resource Configuration: Search by the configuration setting of the managed resource -view_dynagroup_exprBuilder_expressionType_trait = Trait -view_dynagroup_exprBuilder_expression_tooltip = This is the full expression that is represented by the selections in the form below. This text will be added to your group definition expression text when you click the "Add Expression" button. +view_dynagroup_definitionAlreadyExists = すでにこの名前のグループ定義が存在します +view_dynagroup_definitionCreated = グループ定義名 [{0}] の作成に成功しました +view_dynagroup_definitionLoadFailure = グループ定義のロードに失敗しました +view_dynagroup_definitions = 動的グループの定義 +view_dynagroup_deleteFailureSelection = 選択されたグループ定義の削除に失敗しました +view_dynagroup_deleteSuccessfulSelection = [{0}] グループ定義の削除に成功しました +view_dynagroup_editing = [{0}] を編集中 +view_dynagroup_exprBuilder_addExpression = 式の追加 +view_dynagroup_exprBuilder_comparisonType = 比較タイプ +view_dynagroup_exprBuilder_comparisonType_contains = を含む +view_dynagroup_exprBuilder_comparisonType_endsWith = で終わる +view_dynagroup_exprBuilder_comparisonType_equals = 等しい +view_dynagroup_exprBuilder_comparisonType_startsWith = で開始する +view_dynagroup_exprBuilder_comparisonType_tooltip = 比較タイプ +view_dynagroup_exprBuilder_definingPlugin = 定義プラグイン +view_dynagroup_exprBuilder_definingPlugin_tooltip = 検索のためのプラグイン +view_dynagroup_exprBuilder_expression = 式 +view_dynagroup_exprBuilder_expressionType = 式のタイプ +view_dynagroup_exprBuilder_expressionType_pluginConfig = プラグイン構成 +view_dynagroup_exprBuilder_expressionType_resource = リソース +view_dynagroup_exprBuilder_expressionType_resourceCategory = リソースカテゴリ +view_dynagroup_exprBuilder_expressionType_resourceConfig = リソース構成 +view_dynagroup_exprBuilder_expressionType_resourceType = リソースタイプ +view_dynagroup_exprBuilder_expressionType_tooltip = この式のプロパティは以下のものに切り替わります。 リソース: 名前やバージョンといったリソースプロパティ リソースタイプ: 特定タイプのリソースの検索 リソースカテゴリ: プラットフォーム、サーバー、サービスといったカテゴリによるリソース検索 トレイト: モニタされたトレイトのために選択された値を持つリソース プラグイン構成: コンポーネントのプラグインコンポーネント構成設定による検索 リソース構成: 管理リソースの構成設定による検索 +view_dynagroup_exprBuilder_expressionType_trait = トレイト +view_dynagroup_exprBuilder_expression_tooltip = これは以下のフォーム内の選択によって表現される完全な式です。このテキストは、"式の追加"ボタンをクリックすると、グループ定義式のテキストに追加されます。 view_dynagroup_exprBuilder_groupBy = Group by -view_dynagroup_exprBuilder_groupBy_tooltip = GroupBy will cause the system to pivot on the values from the entered expressions creating a separate group for each value. For example, GroupBy on the cluster name to create a group for each cluster with all cluster members in it. -view_dynagroup_exprBuilder_noPlugins = --No plugins-- -view_dynagroup_exprBuilder_noProperties = --No properties-- -view_dynagroup_exprBuilder_noResourceTypes = --No resource types-- -view_dynagroup_exprBuilder_pluginLoadFailure = Cannot get the list of plugins -view_dynagroup_exprBuilder_propLoadFailure = Cannot get list of properties -view_dynagroup_exprBuilder_propertyName = Property Name -view_dynagroup_exprBuilder_propertyName_tooltip = The name of the property to query. This is defined by the expression type as well as the resource type. -view_dynagroup_exprBuilder_resTypeLoadFailure = Cannot get list of resource types for plugin [{0}] -view_dynagroup_exprBuilder_resource = Resource -view_dynagroup_exprBuilder_resourceType = Resource Type -view_dynagroup_exprBuilder_resourceType_tooltip = The type of resource -view_dynagroup_exprBuilder_resource_child = Child -view_dynagroup_exprBuilder_resource_grandparent = Grandparent -view_dynagroup_exprBuilder_resource_greatGrandparent = GreatGrandparent -view_dynagroup_exprBuilder_resource_greatGreatGrandparent = GreatGreatGrandparent -view_dynagroup_exprBuilder_resource_parent = Parent -view_dynagroup_exprBuilder_resource_resource = Resource -view_dynagroup_exprBuilder_resource_tooltip = Choose the level of the resource you wish to select. For example, select "parent" will find resources whose parent resource matches the rest of the expression. -##view_dynagroup_exprBuilder_savedExpression = Saved Expression -view_dynagroup_exprBuilder_title = Expression Builder -view_dynagroup_exprBuilder_unset = Unset -view_dynagroup_exprBuilder_unset_tooltip = Unset will find all of the values that have a null value in the database. This is not possible using the "=" operator because of how databases store and query data. -view_dynagroup_exprBuilder_value_tooltip = The string value for the expression to query -view_dynagroup_expression = Expression -view_dynagroup_expressionBuilderIconTooltip = Expression Builder... -view_dynagroup_expressionSet = Expression Set -view_dynagroup_lastCalculationTime = Last Calculation Time -view_dynagroup_loadDefinitionFailure = Failed to load group definition [{0}] -view_dynagroup_loadDefinitionMissing = There is no group definition with the ID of [{0}] -view_dynagroup_mixed = Mixed -view_dynagroup_newGroupDefinition = New Group Definition -view_dynagroup_nextCalculationTime = Next Calculation Time -view_dynagroup_permDenied = You do not have permission to view group definitions -view_dynagroup_recalcFailure = Failed to recalculated this group definition -view_dynagroup_recalcFailureSelection = Failed to recalculated the selected group definitions -view_dynagroup_recalcSuccessful = You have successfully recalculated this group definition -view_dynagroup_recalcSuccessfulSelection = You have successfully recalculated [{0}] group definitions -view_dynagroup_recalculate = Recalculate -view_dynagroup_recalculationInterval = Recalculation Interval (ms) -view_dynagroup_recursive = Recursive -view_dynagroup_saveAndRecalculate = Save & Recalculate -view_dynagroup_saveFailure = Failed to save the group definition named [{0}] -view_dynagroup_saveSuccessful = You have successfully saved the group definition named [{0}] -view_dynagroup_singleSaveFailure = An error occurred - there should have been one created, but instead there were [{0}] created -view_dynagroup_template_customExpression = Custom Expression... -view_dynagroup_template_downedResources = All resources currently down -view_dynagroup_template_jbossas4_clusters = JBossAS 4 - Clusters -view_dynagroup_template_jbossas4_earClusters = JBossAS 4 - Clustered EARs -view_dynagroup_template_jbossas4_hostingApp = JBossAS 4 - All hosting any version of "my" app -view_dynagroup_template_jbossas4_nonsecured = JBossAS 4 - All non-secured -view_dynagroup_template_jbossas4_uniqueVersions = JBossAS 4 - Unique versions -view_dynagroup_template_jbossas5_clusters = JBossAS 5/6 - Clusters -view_dynagroup_template_platforms = Platform resources in inventory -view_dynagroup_template_uniqueResourceTypes = Unique resource types in inventory -view_groupConfigEdit_member = Member -view_groupConfigEdit_noListProps = List properties are not currently supported for group configurations. -view_groupConfigEdit_setAll = Set all values to: -view_groupConfigEdit_tooltip_1 = Member values differ - click icon to edit them. -view_groupConfigEdit_unset = Unset -view_groupConfigEdit_valsDiff = member values differ -view_groupConfigEdit_valsDiffForProp = Member Values for Property [{0}] -view_groupCreateWizard_createFailure = Failed to create the resource group -view_groupCreateWizard_createStepName = Group Settings -view_groupCreateWizard_createStep_recursive = Recursive -view_groupCreateWizard_createSuccessful_concise = You have created a new resource group. [<a href="{0}">View Group</a>] -view_groupCreateWizard_createSuccessful_full = You have created a new [{0}] resource group with the name [{1}] that contains [{2}] member resources -view_groupCreateWizard_membersStepName = Select Members -view_groupCreateWizard_title = グループ生成 -view_groupCreateWizard_windowTitle = グループ生成 -view_groupInventoryMembers_button_updateMembership = Update Membership... -view_groupInventoryMembers_title_updateMembership = Update Membership -view_group_detail_failLoad = Failed to load group for group with ID [{0}] -view_group_detail_failLoadComp = Failed to load group composite for group with ID [{0}] -view_group_detail_failRecursiveChange = Failed to update the recursive setting for group [{0}] -view_group_detail_recursiveChange = You successfully changed the recursive setting for group [{0}] -view_group_inventory_activity_no_recent_metrics = This group has no recent metrics -view_group_meas_schedules_title = Group Metric Collection Schedules -view_group_membership_failFetch = Failed to fetch Resource Group -view_group_membership_saveFailure = Failed to update membership of group [{0}] -view_group_membership_saveSuccessful = You have updated the membership of group [{0}] -view_group_operationScheduleDetails_failedToLoadMembers = Failed to load group member Resources. -view_group_operationScheduleDetails_field_execute = Execute -view_group_operationScheduleDetails_field_haltOnFailure = Halt on Failure? -view_group_operationScheduleDetails_memberResource = Member Resource -view_group_operationScheduleDetails_value_parallel = in parallel -view_group_operationScheduleDetails_value_sequential = in the order specified below (drag and drop member Resources to change order) -view_group_pluginConfig_edit_currentGroupProperties = Current Group Properties -view_group_pluginConfig_edit_invalid = The following connection setting properties have invalid values and must be corrected before the connection settings can be saved: [{0}] -view_group_pluginConfig_edit_noperm = You do not have permission to edit this group connection settings -view_group_pluginConfig_edit_saveFailure = Failed to initiate group connection setting update for [{0}] compatible group named [{1}] -view_group_pluginConfig_edit_saveInitiated_concise = The group connection setting updates have been initiated -view_group_pluginConfig_edit_saveInitiated_full = The group connection setting updates have been initiated for the [{0}] compatible group named [{1}] -view_group_pluginConfig_edit_saveTooltip = Update the connection settings of all group members -view_group_pluginConfig_edit_valid = All connection setting properties have valid values, so the connection settings can now be saved -view_group_pluginConfig_members_fetchFailure = Failed to get plugin config update history for members of group [{0}] -view_group_pluginConfig_members_fetchFailureConn = Failed to retrieve member connection settings for [{0}] -view_group_pluginConfig_members_fetchFailureConnInProgress = A group plugin configuration update is currently in progress. You must wait until the update is finished before you can view the group settings. -view_group_pluginConfig_members_statusDetails = Status Details -view_group_pluginConfig_members_statusFailure = This configuration update failed for an unknown reason -view_group_pluginConfig_members_statusInprogress = This configuration update is still in progress -view_group_pluginConfig_members_statusNochange = No changes were made to this configuration -view_group_pluginConfig_members_statusSuccess = This configuration update was successful -view_group_pluginConfig_members_title = Group Connection Settings Member Histories -view_group_pluginConfig_table_clickStatusIcon = Click the status icon for full details -view_group_pluginConfig_table_deleteFailure = Failed to delete group plugin config history -view_group_pluginConfig_table_deleteSuccessful = You have deleted [{0}] history items -view_group_pluginConfig_table_failFetch = Failed to get group plugin config history -view_group_pluginConfig_table_msg1 = View Member History for status of each individual resource -view_group_pluginConfig_table_statusDetails = Status Details -view_group_pluginConfig_table_statusFailure = This group configuration update failed -view_group_pluginConfig_table_statusInprogress = This group configuration update is still in progress -view_group_pluginConfig_table_statusNochange = No changes were made to this group configuration -view_group_pluginConfig_table_statusSuccess = This group configuration update was successful -view_group_pluginConfig_table_title = Group Connection Settings History -view_group_pluginConfig_table_viewMemberHistory = View Member History -view_group_pluginConfig_table_viewSettings = View Settings -view_group_pluginConfig_view_groupProperties = Group Properties -view_group_pluginConfig_view_noperm = You do not have permissions to see the connection settings -view_group_resConfig_edit_invalid = The following configuration properties have invalid values and must be corrected before the configuration can be saved: [{0}] -view_group_resConfig_edit_loadFail = Failed to retrieve member Resource configurations for [{0}] -view_group_resConfig_edit_noperm = You do not have permission to edit this group configuration -view_group_resConfig_edit_saveFailure = Failed to initiate group configuration update for [{0}] compatible group named [{1}] -view_group_resConfig_edit_saveInitiated_concise = The group configuration updates have been initiated -view_group_resConfig_edit_saveInitiated_full = The group configuration updates have been initiated for the [{0}] compatible group named [{1}] -view_group_resConfig_edit_saveTooltip = Update the configurations of all group members -view_group_resConfig_edit_valid = All configuration properties have valid values, so the configuration can now be saved -view_group_resConfig_members_fetchFailure = Failed to get resource config update history for members of group [{0}] -view_group_resConfig_members_fetchFailureConfig = Failed to retrieve member resource configuration settings for [{0}] -view_group_resConfig_members_fetchFailureConfigInProgress = A group resource configuration update is currently in progress. You must wait until the update is finished before you can view the group settings. -view_group_resConfig_members_statusDetails = Status Details -view_group_resConfig_members_statusFailure = This configuration update failed for an unknown reason -view_group_resConfig_members_statusInprogress = This configuration update is still in progress -view_group_resConfig_members_statusNochange = No changes were made to this configuration -view_group_resConfig_members_statusSuccess = This configuration update was successful -view_group_resConfig_members_title = Group Resource Configuration Member Histories -view_group_resConfig_table_clickStatusIcon = Click the status icon for full details -view_group_resConfig_table_deleteFailure = Failed to delete group resource config history -view_group_resConfig_table_deleteSuccessful = You have deleted [{0}] history items -view_group_resConfig_table_failFetch = Failed to get group resource config history -view_group_resConfig_table_msg1 = View Member History for status of each individual resource -view_group_resConfig_table_statusDetails = Status Details -view_group_resConfig_table_statusFailure = This group configuration update failed -view_group_resConfig_table_statusInprogress = This group configuration update is still in progress -view_group_resConfig_table_statusNochange = No changes were made to this group configuration -view_group_resConfig_table_statusSuccess = This group configuration update was successful -view_group_resConfig_table_title = Group Resource Configuration History -view_group_resConfig_table_viewMemberHistory = View Member History -view_group_resConfig_table_viewSettings = View Settings -view_group_resConfig_view_groupProperties = Group Properties -view_group_resConfig_view_noperm = You do not have permissions to see the resource configuration settings -view_group_summary_compatible = Compatible -view_group_summary_descUpdateFailure = Failed to change the description of the resource group with ID [{0}] -view_group_summary_descUpdateSuccessful = You have changed the description of this resource group -view_group_summary_dynamic = Dynamic -view_group_summary_dynamicNote = Dynamic group names and descriptions are managed, and therefore are not editable -view_group_summary_groupDefinition = Group Definition -view_group_summary_memberCount = Member Count -view_group_summary_memberType = Member Type -view_group_summary_mixed = Mixed -view_group_summary_nameUpdateFailure = Failed to change the name of the resource group with ID [{0}] - could not change from [{1}] to [{2}] -view_group_summary_nameUpdateSuccessful = You have changed the name of the resource group with ID [{0}] from [{1}] to [{2}] -view_group_summary_recursive = Recursive +view_dynagroup_exprBuilder_groupBy_tooltip = GroupByはシステムが入力式からの値についてピボット解析ができるようにします。例えば、クラスター名によるGroupByによって、すべてのクラスターメンバーをその中に含むようなクラスタのグループを作成します。 +view_dynagroup_exprBuilder_noPlugins = --プラグインなし-- +view_dynagroup_exprBuilder_noProperties = --プラグインなし-- +view_dynagroup_exprBuilder_noResourceTypes = --リソースタイプなし-- +view_dynagroup_exprBuilder_pluginLoadFailure = プラグインのリストの取得ができません +view_dynagroup_exprBuilder_propLoadFailure = プロパティのリストの取得ができません +view_dynagroup_exprBuilder_propertyName = プロパティ名 +view_dynagroup_exprBuilder_propertyName_tooltip = 問い合わせ用のプロパティ名。これはリソースタイプと同様に式タイプによって定義されます。 +view_dynagroup_exprBuilder_resTypeLoadFailure = プラグイン [{0}] のリソースタイプのリストの取得ができません +view_dynagroup_exprBuilder_resource = リソース +view_dynagroup_exprBuilder_resourceType = リソースタイプ +view_dynagroup_exprBuilder_resourceType_tooltip = リソースタイプ +view_dynagroup_exprBuilder_resource_child = 子 +view_dynagroup_exprBuilder_resource_grandparent = 祖父母 +view_dynagroup_exprBuilder_resource_greatGrandparent = 曾祖父母 +view_dynagroup_exprBuilder_resource_greatGreatGrandparent = 曾祖父母の親 +view_dynagroup_exprBuilder_resource_parent = 親 +view_dynagroup_exprBuilder_resource_resource = リソース +view_dynagroup_exprBuilder_resource_tooltip = リソースのレベルを望みのものに選択してください。例えば、"親"を選択すると、親リソースが式の残りの部分に一致するようなリソースを発見できます。 +view_dynagroup_exprBuilder_title = 式ビルダー +view_dynagroup_exprBuilder_unset = 設定解除 +view_dynagroup_exprBuilder_unset_tooltip = 設定解除はデータベース内のnull値を持つ値をのすべてを発見します。これはデータベースストアと問い合わせデータの理由により"="オペレータを使うことは可能ではありません。 +view_dynagroup_exprBuilder_value_tooltip = 問い合わせ式のための文字列値 +view_dynagroup_expression = 式 +view_dynagroup_expressionBuilderIconTooltip = 式ビルダー... +view_dynagroup_expressionSet = 式セット +view_dynagroup_lastCalculationTime = 最終計算時刻 +view_dynagroup_loadDefinitionFailure = グループ定義 [{0}] をロードするのに失敗しました +view_dynagroup_loadDefinitionMissing = [{0}] というIDのグループ定義は存在しません +view_dynagroup_mixed = 混在 +view_dynagroup_newGroupDefinition = 新規グループ定義 +view_dynagroup_nextCalculationTime = 次回の検索時刻 +view_dynagroup_permDenied = グループ定義を閲覧する権限がありません +view_dynagroup_recalcFailure = このグループ定義の再計算に失敗しました +view_dynagroup_recalcFailureSelection = 選択されたグループ定義を再計算するのに失敗しました +view_dynagroup_recalcSuccessful = このグループ定義の再計算が成功しました +view_dynagroup_recalcSuccessfulSelection = [{0}] グループ定義の再計算が成功しました +view_dynagroup_recalculate = 再計算 +view_dynagroup_recalculationInterval = 再計算間隔 (ms) +view_dynagroup_recursive = 再帰 +view_dynagroup_saveAndRecalculate = 保存 & 再計算 +view_dynagroup_saveFailure = グループ定義名 [{0}] の保存に失敗しました +view_dynagroup_saveSuccessful = グループ定義名 [{0}] の保存に成功しました +view_dynagroup_singleSaveFailure = エラーが発生しました - 一つ作成されるべきでしたが、代わりに [{0}] 個作られました +view_dynagroup_template_customExpression = カスタム式... +view_dynagroup_template_downedResources = すべてのリソースが現在ダウンしています +view_dynagroup_template_jbossas4_clusters = JBossAS 4 - クラスタ +view_dynagroup_template_jbossas4_earClusters = JBossAS 4 - クラスタ化 EARs +view_dynagroup_template_jbossas4_hostingApp = JBossAS 4 - ホスティングしている"自分の"アプリケーションのすべて +view_dynagroup_template_jbossas4_nonsecured = JBossAS 4 - セキュアでないすべて +view_dynagroup_template_jbossas4_uniqueVersions = JBossAS 4 - ユニークバージョン +view_dynagroup_template_jbossas5_clusters = JBossAS 5/6 - クラスタ +view_dynagroup_template_platforms = インベントリ内のプラットフォームリソース +view_dynagroup_template_uniqueResourceTypes = インベントリ内のユニークリソースタイプ +view_groupConfigEdit_member = メンバー +view_groupConfigEdit_noListProps = グループ構成に現在サポートされていないプロパティのリスト +view_groupConfigEdit_setAll = すべての値を設定: +view_groupConfigEdit_tooltip_1 = メンバー値の違い - 編集するためにアイコンをクリックします +view_groupConfigEdit_unset = 設定解除 +view_groupConfigEdit_valsDiff = メンバー値の違い +view_groupConfigEdit_valsDiffForProp = プロパティ [{0}] のためのメンバー値 +view_groupCreateWizard_createFailure = リソースグループの作成に失敗しました +view_groupCreateWizard_createStepName = グループ設定 +view_groupCreateWizard_createStep_recursive = 再帰 +view_groupCreateWizard_createSuccessful_concise = 新規のリソースグループを作成しました。 [<a href="{0}">グループの閲覧</a>] +view_groupCreateWizard_createSuccessful_full = [{2}] メンバーリソースを含む名前 [{1}] の新規 [{0}] リソースグループを作成しました。 +view_groupCreateWizard_membersStepName = メンバーの選択 +view_groupCreateWizard_title = グループ作成 +view_groupCreateWizard_windowTitle = グループ作成 +view_groupInventoryMembers_button_updateMembership = メンバーシップの更新... +view_groupInventoryMembers_title_updateMembership = メンバーシップの更新 +view_group_detail_failLoad = ID [{0}] の付いたグループのロードに失敗しました +view_group_detail_failLoadComp = ID [{0}] の付いたグループグループ合成のロードに失敗しました +view_group_detail_failRecursiveChange = グループ [{0}] の再帰設定の更新に失敗しました +view_group_detail_recursiveChange = グループ [{0}] の再帰設定の変更に成功しました +view_group_inventory_activity_no_recent_metrics = このグループは最近のメトリックスはありません +view_group_meas_schedules_title = グループメトリック収集スケジュール +view_group_membership_failFetch = リソースグループのフェッチに失敗しました +view_group_membership_saveFailure = グループ [{0}] のメンバーシップの更新に失敗しました +view_group_membership_saveSuccessful = グループ [{0}] のメンバーシップを更新しました +view_group_operationScheduleDetails_failedToLoadMembers = グループメンバーリソースのロードに失敗しました +view_group_operationScheduleDetails_field_execute = 実行 +view_group_operationScheduleDetails_field_haltOnFailure = 障害による停止? +view_group_operationScheduleDetails_memberResource = メンバーリソース +view_group_operationScheduleDetails_value_parallel = 並行実行 +view_group_operationScheduleDetails_value_sequential = 以下に示した順で (メンバーリソースをドラッグ&ドロップして順番を変更) +view_group_pluginConfig_edit_currentGroupProperties = 現在のグループプロパティ +view_group_pluginConfig_edit_invalid = 次のコネクション設定プロパティには不正な値が設定されていますので、コネクション設定が保存されるまえに修正される必要があります: [{0}] +view_group_pluginConfig_edit_noperm = このグループコネクション設定を編集する権限がありません +view_group_pluginConfig_edit_saveFailure = グループ名 [{1}] と互換性のある [{0}] のためのグループ設定更新の開始に失敗しました +view_group_pluginConfig_edit_saveInitiated_concise = グループコネクション設定の更新が開始されました +view_group_pluginConfig_edit_saveInitiated_full = グループコネクション設定の更新はグループ名 [{1}] と互換性のある [{0}] のために開始されました +view_group_pluginConfig_edit_saveTooltip = すべてのグループメンバーのコネクション設定を更新します +view_group_pluginConfig_edit_valid = すべてのコネクション設定プロパティには正しい値が設定されていますので、コネクション設定は保存できます +view_group_pluginConfig_members_fetchFailure = グループ [{0}] のメンバーのためのプラグイン構成更新履歴の取得に失敗しました +view_group_pluginConfig_members_fetchFailureConn = [{0}] のためのメンバーコネクション設定の取り出しに失敗しました +view_group_pluginConfig_members_fetchFailureConnInProgress = グループプラグイン構成の更新は現在進行中です。グループ設定を閲覧する前に更新が完了するまで待ってください。 +view_group_pluginConfig_members_statusDetails = ステータスの詳細 +view_group_pluginConfig_members_statusFailure = この構成の更新は未知の理由により失敗しました +view_group_pluginConfig_members_statusInprogress = この構成の更新はまだ進行中です +view_group_pluginConfig_members_statusNochange = この構成には変更はありませんでした +view_group_pluginConfig_members_statusSuccess = この構成の更新は成功しました +view_group_pluginConfig_members_title = グループコネクション設定のメンバー履歴 +view_group_pluginConfig_table_clickStatusIcon = 詳細はステータスアイコンをクリックしてください +view_group_pluginConfig_table_deleteFailure = グループプラグイン構成履歴の削除に失敗しました +view_group_pluginConfig_table_deleteSuccessful = [{0}] の履歴を削除しました +view_group_pluginConfig_table_failFetch = グループプラグイン履歴の取得に失敗しました +view_group_pluginConfig_table_msg1 = 個々のリソースのステータスのためのメンバー履歴を見てください +view_group_pluginConfig_table_statusDetails = ステータスの詳細 +view_group_pluginConfig_table_statusFailure = このグループ構成の更新は失敗しました +view_group_pluginConfig_table_statusInprogress = このグループ構成の更新は進行中です +view_group_pluginConfig_table_statusNochange = このグループ構成には変更はありませんでした +view_group_pluginConfig_table_statusSuccess = このグループ構成の更新は成功しました +view_group_pluginConfig_table_title = グループコネクション設定履歴 +view_group_pluginConfig_table_viewMemberHistory = メンバー履歴の閲覧 +view_group_pluginConfig_table_viewSettings = 設定の閲覧 +view_group_pluginConfig_view_groupProperties = グループプロパティ +view_group_pluginConfig_view_noperm = コネクション設定を見る権限がありません +view_group_resConfig_edit_invalid = 次の構成プロパティは不正な値を含むのでその構成を保存する前に修正されなければなりません: [{0}] +view_group_resConfig_edit_loadFail = [{0}] のためのメンバーリソース構成を取り出すのに失敗しました +view_group_resConfig_edit_noperm = このグループ構成を編集する権限がありません +view_group_resConfig_edit_saveFailure = [{1}] という名前と互換性のある [{0}] のためのグループ構成の更新の開始に失敗しました +view_group_resConfig_edit_saveInitiated_concise = グループ構成の更新は初期化されました +view_group_resConfig_edit_saveInitiated_full = [{1}] という名前と互換性のある [{0}] のためのグループ構成の更新が開始されました +view_group_resConfig_edit_saveTooltip = すべてのグループメンバーの構成を更新します +view_group_resConfig_edit_valid = すべての構成プロパティは正しい値ですので、その構成は保存可能です +view_group_resConfig_members_fetchFailure = グループ [{0}] のメンバーのためのリソース構成更新履歴の取得に失敗しました +view_group_resConfig_members_fetchFailureConfig = [{0}] のためのメンバーリソース構成設定の取り出しに失敗しました +view_group_resConfig_members_fetchFailureConfigInProgress = グループリソース構成の更新が現在進行中です。グループ設定を見る前に更新が終了するのをお待ちください +view_group_resConfig_members_statusDetails = ステータスの詳細 +view_group_resConfig_members_statusFailure = この構成の更新は未知の理由で失敗しました。 +view_group_resConfig_members_statusInprogress = この構成の更新はまだ進行中です +view_group_resConfig_members_statusNochange = この構成には変更はありません +view_group_resConfig_members_statusSuccess = この構成の更新は成功しました +view_group_resConfig_members_title = グループリソース構成のメンバー履歴 +view_group_resConfig_table_clickStatusIcon = 詳細はステータスアイコンをクリックしてください +view_group_resConfig_table_deleteFailure = グループリソース構成履歴の削除に失敗しました +view_group_resConfig_table_deleteSuccessful = [{0}] の履歴の削除をしました +view_group_resConfig_table_failFetch = グループ構成履歴の取得に失敗しました +view_group_resConfig_table_msg1 = 個々のリソースのステータスはメンバー履歴を閲覧してください +view_group_resConfig_table_statusDetails = スタータスの詳細 +view_group_resConfig_table_statusFailure = このグループ構成の更新が失敗しました +view_group_resConfig_table_statusInprogress = このグループ構成の更新はまだ進行中です +view_group_resConfig_table_statusNochange = このグループ構成に対する変更はありません +view_group_resConfig_table_statusSuccess = このグループ構成の更新は成功しました +view_group_resConfig_table_title = グループリソース構成履歴 +view_group_resConfig_table_viewMemberHistory = メンバー履歴の閲覧 +view_group_resConfig_table_viewSettings = 閲覧設定 +view_group_resConfig_view_groupProperties = グループプロパティ +view_group_resConfig_view_noperm = リソース構成設定を見るための権限はありません +view_group_summary_compatible = 互換性 +view_group_summary_descUpdateFailure = ID [{0}] を持つリソースグループの説明を変更できませんでした +view_group_summary_descUpdateSuccessful = このリソースグループの説明を変更しました +view_group_summary_dynamic = 動的 +view_group_summary_dynamicNote = 動的グループ名と説明は管理されための編集可能です +view_group_summary_groupDefinition = グループ定義 +view_group_summary_memberCount = メンバー数 +view_group_summary_memberType = メンバータイプ +view_group_summary_mixed = 混在 +view_group_summary_nameUpdateFailure = ID [{0}] を持つリソースグループ名の変更に失敗しました - [{1}] から [{2}] への変更ができませんでした +view_group_summary_nameUpdateSuccessful = ID [{0}] を持つリソースグループを [{1}] から [{2}] への変更しました +view_group_summary_recursive = 再帰 view_helpTop_description = このセクションはドキュメンテーション、チュートリアル、バージョン、その他のヘルプ情報を提供します。 view_help_section_product = プロダクト view_help_section_product_about = RHQについて @@ -1307,119 +1302,119 @@ view_inventory_allGroups = すべてのグループ view_inventory_allResources = すべてのリソース view_inventory_collectionInterval = コレクション間隔 view_inventory_dynagroupDefs = 動的グループ定義 -view_inventory_eventDetails_loadFailed = An error occurred loading the event details -view_inventory_eventHistory_deleteFailed = Failed to deleted selected events for [{0}] -view_inventory_eventHistory_deleteSuccessful = You have successfully deleted [{0}] events for [{1}] -view_inventory_eventHistory_details = Details -view_inventory_eventHistory_detailsFilter = Details Filter -view_inventory_eventHistory_groupEventHistory = Group Event History -view_inventory_eventHistory_purgeFailed = Failed to purge events for [{0}] -view_inventory_eventHistory_purgeSuccessful = You have successfully purged [{0}] events for [{1}] -view_inventory_eventHistory_resourceEventHistory = Resource Event History -view_inventory_eventHistory_severity = Severity -view_inventory_eventHistory_severityFilter = Severity Filter -view_inventory_eventHistory_sourceFilter = Source Filter -view_inventory_eventHistory_sourceLocation = Source Location -view_inventory_eventHistory_timestamp = Timestamp +view_inventory_eventDetails_loadFailed = イベントの詳細をロード中にエラーが発生しました +view_inventory_eventHistory_deleteFailed = [{0}] のために選択されたイベントの削除に失敗しました +view_inventory_eventHistory_deleteSuccessful = [{1}] のための [{0}] イベントの削除に成功しました +view_inventory_eventHistory_details = 詳細 +view_inventory_eventHistory_detailsFilter = 詳細フィルター +view_inventory_eventHistory_groupEventHistory = グループイベント履歴 +view_inventory_eventHistory_purgeFailed = Failed to purge events for [{0}] のためのイベントの除去に失敗しました。 +view_inventory_eventHistory_purgeSuccessful = [{1}] のための [{0}] イベントの除去に成功しました +view_inventory_eventHistory_resourceEventHistory = リソースイベント履歴 +view_inventory_eventHistory_severity = 重大度 +view_inventory_eventHistory_severityFilter = 重大度フィルター +view_inventory_eventHistory_sourceFilter = ソースフィルター +view_inventory_eventHistory_sourceLocation = ソース位置 +view_inventory_eventHistory_timestamp = タイムスタンプ view_inventory_groups = グループ -view_inventory_groups_children = Children -view_inventory_groups_deleteFailed = Failed to delete the selected resource groups -view_inventory_groups_deleteSuccessful = You have successfully deleted the selected resource groups -view_inventory_groups_descendants = Descendants -view_inventory_groups_loadFailed = Failed to load group composite data -view_inventory_groups_resourceGroups = Resource Groups -view_inventory_mixed = mixed +view_inventory_groups_children = 子 +view_inventory_groups_deleteFailed = 選択されたリソースグループの削除に失敗しました +view_inventory_groups_deleteSuccessful = 選択されたリソースグループの削除に成功しました +view_inventory_groups_descendants = 子孫 +view_inventory_groups_loadFailed = グループ合成データのロードに失敗しました +view_inventory_groups_resourceGroups = リソースグループ +view_inventory_mixed = 混成 view_inventory_platforms = プラットフォーム view_inventory_problemGroups = 問題グループ -view_inventory_resource_loadFailed = Resource with id [{0}] does not exist or is not accessible -view_inventory_resources_deleteConfirm = Are you sure you want to delete the selected resources? -view_inventory_resources_deleteFailed = Failed to delete the selected resources -view_inventory_resources_deleteSuccessful = You have successfully deleted the selected resources -view_inventory_resources_loadFailed = Failed to load resource composite data +view_inventory_resource_loadFailed = ID [{0}] をT持つリソースは存在しないか、アクセスできません +view_inventory_resources_deleteConfirm = 選択されたリソースを削除したいですか? +view_inventory_resources_deleteFailed = 選択されたリソースの削除に失敗しました +view_inventory_resources_deleteSuccessful = 選択されたリソースの削除に成功しました +view_inventory_resources_loadFailed = リソース合成データのロードに失敗しました view_inventory_resources_title = リソース view_inventory_resources_title_children = 子リソース view_inventory_resources_title_members = メンバーリソース -view_inventory_resources_uninventoryConfirm = Are you sure you want to uninventory the selected resources? Note that if a selected resource still exists, then it will get rediscovered during its agent''s next discovery scan. -view_inventory_resources_uninventoryFailed = Failed to uninventory the selected resources -view_inventory_resources_uninventorySuccessful = You have successfully uninventoried the selected resources +view_inventory_resources_uninventoryConfirm = 選択したリソースをアンインベントリしてもよろしいですか? もし選択したリソースがまだ存在しているなら、そのエージェントの次回のディスカバリスキャンの間にそれは再発見されます。 +view_inventory_resources_uninventoryFailed = 選択されたリソースのアンインベントリに失敗しました +view_inventory_resources_uninventorySuccessful = 選択されたリソースのアンインベントリに成功しました view_inventory_sectionHelp = このセクションにおいて、新規に発見されたリソース、インベントリに登録されたリソース、グループの表示と管理がおこなわれます。 view_inventory_servers = サーバー view_inventory_services = サービス -view_inventory_summary_agent_error1 = Failed to locate agent managing resource id -view_inventory_summary_agent_error2 = Failed to ping agent managing resource id -view_inventory_summary_agent_error3 = You do not have permission to view details for this Agent. -view_inventory_summary_agent_fullEnpoint = Full Endpoint -view_inventory_summary_agent_fullEnpoint_err1 = !No remote endpoint associated with this resource! -view_inventory_summary_agent_last_title = Last Received Availability Report -view_inventory_summary_agent_status_title = Agent Communications Status -view_inventory_summary_agent_title = Agent Managing this Resource +view_inventory_summary_agent_error1 = エージェント管理リソースIDの発見に失敗しました +view_inventory_summary_agent_error2 = エージェントリソースIDのpingに失敗しました +view_inventory_summary_agent_error3 = このエージェントのための詳細を見る権限がありません +view_inventory_summary_agent_fullEnpoint = フルエンドポイント +view_inventory_summary_agent_fullEnpoint_err1 = !このリソースに関連するリモートエンドポイントはありません! +view_inventory_summary_agent_last_title = 最後に受信したアベイラビリティリポート +view_inventory_summary_agent_status_title = エージェント通信ステータス +view_inventory_summary_agent_title = このリソースを管理するエージェント view_inventory_unavailableServers = 利用不能サーバー -view_leftNav_unknownPage = Unknown page name [{0}] for section [{1}] - URL is invalid. -view_login_invalidEmail = Invalid e-mail address +view_leftNav_unknownPage = セクション [{1}] の未知のページ名 [{0}] - URLは不正です +view_login_invalidEmail = 不正なE-メールアドレス view_login_login = ログイン view_login_logout = ログアウト -view_login_noBackend = The backend datasource is unavailable. -view_login_noLdap = Note: Optional retrieval of ldap details unsuccessful. Manual entry is required. -view_login_noUser = The username or password provided does not match our records. +view_login_noBackend = バックエンドデータソースは利用できません +view_login_noLdap = 注意：LDAP詳細の任意の取り出しは成功しませんでした。手動での入力が要求されます +view_login_noUser = 入力されたユーザー名またはパスワードは記録されたものと一致しません view_login_prompt = ログインしてください -view_login_registerLater = (Cancel - Complete registration later.) -view_login_registerLdapSuccess = Successfully registered the new LDAP User. -view_login_registerUser = Register User +view_login_registerLater = (キャンセル - 登録を後で完成させてください) +view_login_registerLdapSuccess = 新しいLDAPユーザーの登録に成功しました +view_login_registerUser = ユーザの登録 view_login_welcome = ようこそ -view_login_welcomeMsg = Welcome to RHQ! Enter/update the following fields to complete your registration process. Once you click "OK", you will be logged in. -view_measureRange_last = Time Range - Previous -view_measureRange_simple = Simple... -view_measureRange_start = Time Range - Start -view_measureTable_chartMetricValues = Chart Selected Metrics -view_measureTable_getLive = Get Live Value -view_measureTable_getLive_failure = Cannot get live values for those metrics. Make sure the agent is running and the managed resource is up. +view_login_welcomeMsg = RHQへようこそ! 登録を完成させるために次のフィールドを入力/更新してください。 "OK"をクリックしたら、ログインします。 +view_measureRange_last = 時間の範囲 - 直前 +view_measureRange_simple = シンプル... +view_measureRange_start = 時間の範囲 - 開始 +view_measureTable_chartMetricValues = 選択されたメトリックスを図に描く +view_measureTable_getLive = 動作中の値の取得 +view_measureTable_getLive_failure = これらのメトリックスの動作中の値を取得できませんでした。エージェントは実行中で管理リソースは作動中であることを確認してください。 view_measureTable_live_title = ライブデータ -view_measure_nan = --no data available-- +view_measure_nan = --データは存在しません-- view_measurementOob_title = 疑わしいメトリックス view_menuBar_logout = ログアウト -view_messageCenter_clearAllMessages = Clear All Messages -view_messageCenter_lastNMessages = Last {0} Messages -view_messageCenter_maxMessages = Max Messages -view_messageCenter_messageBarShowDetails = Show Details -view_messageCenter_messageDetail = Detail -view_messageCenter_messageSeverity = Severity -view_messageCenter_messageTime = Time +view_messageCenter_clearAllMessages = すべてのメッセージをクリア +view_messageCenter_lastNMessages = 最新の {0} メッセージ +view_messageCenter_maxMessages = 最大メッセージ +view_messageCenter_messageBarShowDetails = 詳細表示 +view_messageCenter_messageDetail = 詳細 +view_messageCenter_messageSeverity = 重大度 +view_messageCenter_messageTime = 時間 view_messageCenter_messageTitle = メッセージセンター -view_messageCenter_noRecentMessages = No Recent Messages -view_messageCenter_stackTraceFollows = --- STACK TRACE FOLLOWS --- -view_metric_traits = Traits -view_metric_viewTraitHistory = Value History for Trait [{0}] +view_messageCenter_noRecentMessages = 最近のメッセージはありません +view_messageCenter_stackTraceFollows = --- スタックトレース --- +view_metric_traits = トレイト +view_metric_viewTraitHistory = トレイト [{0}] のための値の履歴 view_operationHistoryDetails_dateCompleted = 完了日 view_operationHistoryDetails_dateSubmitted = 発行日 -view_operationHistoryDetails_error_fetchFailure = Failure loading operation history. -view_operationHistoryDetails_noResults = This operation does not return any results. +view_operationHistoryDetails_error_fetchFailure = オペレーション履歴のロードに失敗 +view_operationHistoryDetails_noResults = このオペレーションは値を返しません view_operationHistoryDetails_operation = オペレーション view_operationHistoryDetails_parameters = パラメータ view_operationHistoryDetails_requestor = 要求者 view_operationHistoryDetails_results = 結果 view_operationHistoryDetails_status = ステータス -view_operationHistoryList_button_forceDelete = Force Delete -view_operationHistoryList_button_runOperation = Run Operation -view_operationHistoryList_notYetStarted = not yet started +view_operationHistoryList_button_forceDelete = 強制削除 +view_operationHistoryList_button_runOperation = オペレーションの実行 +view_operationHistoryList_notYetStarted = まだ開始していません view_operationHistoryList_title = オペレーション履歴 -view_operationScheduleDetails_enterParametersBelow = Enter parameters below... -view_operationScheduleDetails_fieldDefault_description = Select an operation to see its description. -view_operationScheduleDetails_fieldDefault_parameters = Select an operation to see its parameters. -view_operationScheduleDetails_fieldHelp_description = an optional description of this scheduled operation (e.g. nightly maintenance app server restart) -view_operationScheduleDetails_fieldHelp_timeout = a time duration - if specified, if the duration elapses before a scheduled operation execution has completed, the RHQ Server will timeout the operation and consider it to have failed; note, it is usually not possible to abort the underlying managed resource operation if it was already initiated +view_operationScheduleDetails_enterParametersBelow = 以下にパラメーターを入力してください... +view_operationScheduleDetails_fieldDefault_description = 説明を見るとためオペレーションを選択してください +view_operationScheduleDetails_fieldDefault_parameters = パラメーターを見るためオペレーションを選択してください +view_operationScheduleDetails_fieldHelp_description = このスケジュールされたオペレーションのための任意の説明 (例、夜間保守のためのアプリサーバー再起動） +view_operationScheduleDetails_fieldHelp_timeout = 時間間隔 - もし指定されていて、その間隔がスケジュールされたオペレーション実行が完了する前に経過してしまったならば、RHQサーバーはそのオペレーションをタイムアウトにし、それを失敗させることを検討します。注意：通常はすでに開始させられた根本の管理リソースオペレーションをアボートすることは不可能です。 view_operationScheduleDetails_field_description = 説明 view_operationScheduleDetails_field_parameters = パラメータ view_operationScheduleDetails_field_timeout = タイムアウト -view_operationScheduleDetails_noParameters = This operation does not take any parameters. +view_operationScheduleDetails_noParameters = このオペレーションはパラメーターを取りません view_operationScheduleDetails_operationSchedule = オペレーションスケジュール -view_portlet_autodiscovery_setting_platforms = discovered platforms -view_portlet_configure_definitionDesc = The configuration settings for the portlet. -view_portlet_configure_definitionTitle = Portlet Configuration -view_portlet_configure_needed = Click the Settings button to configure this portlet. -view_portlet_configure_notNeeded = Configuration is not necessary for this portlet. +view_portlet_autodiscovery_setting_platforms = 発見されたプラットフォーム +view_portlet_configure_definitionDesc = ポートレットのための構成設定 +view_portlet_configure_definitionTitle = ポートレット構成 +view_portlet_configure_needed = 設定ボタンを押してこのポートレットを構成してください +view_portlet_configure_notNeeded = 構成はこのポートレットには必要ありません view_portlet_defaultName_autodiscovery = ディスカバリキュー view_portlet_defaultName_favoriteResources = お気に入りリソース -view_portlet_defaultName_groupMetric = Resource Group Metric Graph +view_portlet_defaultName_groupMetric = リソースグループメトリックグラフ view_portlet_defaultName_group_alerts = グループ: アラート view_portlet_defaultName_group_bundles = グループ: バンドルデプロイ view_portlet_defaultName_group_config_updates = グループ: 構成の更新 @@ -1436,7 +1431,7 @@ view_portlet_defaultName_platformSummary = プラットフォーム利用率 view_portlet_defaultName_problemResources = アラートまたは利用できないリソース view_portlet_defaultName_recentAlerts = 最近のアラート view_portlet_defaultName_recentlyAddedResources = 最近追加されたリソース -view_portlet_defaultName_resourceMetric = Resource Metric Graph +view_portlet_defaultName_resourceMetric = リソースメトリックグラフ view_portlet_defaultName_resource_alerts = リソース: アラート view_portlet_defaultName_resource_bundles = リソース: バンドルデプロイ view_portlet_defaultName_resource_config_updates = リソース: 構成の更新 @@ -1446,149 +1441,149 @@ view_portlet_defaultName_resource_oobs = リソース: OOB メトリックス view_portlet_defaultName_resource_operations = リソース: オペレーション view_portlet_defaultName_resource_pkg_hisory = リソース: パッケージ履歴 view_portlet_defaultName_tagCloud = タグ数 -view_portlet_factory_invalidPortlet = This is an obsolete portlet that is no longer valid. Please delete it. -view_portlet_graph_configure_metricDefinition_graph = The metric definition id to graph -view_portlet_graph_configure_resource_graph = The resource to graph -view_portlet_help_autodiscovery = This portlet allows import or ignore of newly discovered resources. Imported resources are added to inventory for monitoring and management. Ignored resources are not imported and are hidden from view unless explicitly unignored. -view_portlet_help_bundle_deps = This portlet shows relevant bundle deployments based on display criteria configured. -view_portlet_help_config_updates = This portlet displays recent configuration changes consistent with configuration settings. -view_portlet_help_eventcounts = This portlet displays Event counts consistent with display criteria configured. -view_portlet_help_favoriteResources = This portlet displays the current user''s favorite resources. -view_portlet_help_graph = This portlet displays the resource metric graph. -view_portlet_help_inventorySummary = This portlet displays a short summary of the current user''s viewable inventory and metric collection rate. -view_portlet_help_mashup = This portlet displays the returned content of a remote HTTP request (via an iframe). -view_portlet_help_message = This portlet displays a static HTML message. The message property must be configured. -view_portlet_help_metrics = This portlet graphs relevant recent metric data based on display criteria configured. -view_portlet_help_none = There is no help available for this portlet. -view_portlet_help_oobs = This portlet displays OOB(Out of Bound) metric conditions. -view_portlet_help_operations = This portlet displays the most recently executed operations for the current user''s inventory. -view_portlet_help_operations_criteria = This portlet displays Operations consistent with display criteria configured. -view_portlet_help_pkg_history = This portlet shows relevant package history based on display criteria configured. -view_portlet_help_platformSummary = This portlet displays utilization data (such as current CPU and memory usage) for platform resources that are accessible by the current user. -view_portlet_help_problemResources = This portlet displays the current user''s alerted or unavailable resources. -view_portlet_help_recentAlerts = This portlet displays alerts recently fired on the current user''s viewable inventory. -view_portlet_help_recentlyAdded = This portlet displays resources that have recently been imported into inventory. -view_portlet_help_scheduledOperations = This portlet displays the next scheduled operations for the current user''s inventory. -view_portlet_help_tagCloud = This portlet displays the relative tag counts for the current user''s inventory. -view_portlet_inventory_error1 = Failed to retrieve inventory summary -view_portlet_inventory_tooltip_collapse = Click to hide details for this resource. -view_portlet_inventory_tooltip_expand = Click to show more details for this resource. -view_portlet_message_title = The message to display. -view_portlet_operations_config_completed = completed operations -view_portlet_operations_config_completed_enable = Whether to enable completed operations results grouping for dashboard. -view_portlet_operations_config_completed_maximum = Maximum number of Completed operations to display. -view_portlet_operations_config_scheduled_enable = Whether to enable scheduled operations results grouping for dashboard. -view_portlet_operations_config_scheduled_maximum = Maximum number of Scheduled operations to display. -view_portlet_operations_config_show_last = show Last -view_portlet_operations_config_show_next = show Next -view_portlet_operations_disabled = (Results currently disabled. Change settings to enable results. -view_portlet_platform_platform_error_1 = Failed to load platform metrics -view_portlet_platform_type_error_1 = Could not load type data -view_portlet_problemResources_config_display_maximum = Maximum number of Problem resources to display. -view_portlet_problemResources_config_display_range = Show problem resources going back this many hours. -view_portlet_problemResources_config_display_range2 = From {0} to {1} -view_portlet_problemResources_maxDisplaySetting = maximum resources. -view_portlet_recentAlerts_config_members = Select Members -view_portlet_recentAlerts_config_priority_label = priority Alerts, -view_portlet_recentAlerts_config_when = within the past -view_portlet_recentAlerts_fail_msg = Failed to load resources assigned for alert filtering. -view_portlet_recentlyAdded_error1 = Failed to load recently added resources -view_portlet_recentlyAdded_setting_addedPlatforms = recently added platforms +view_portlet_factory_invalidPortlet = これは有効ではない古いポートレットです。削除してください。 +view_portlet_graph_configure_metricDefinition_graph = グラフを描くためのメトリック定義 ID +view_portlet_graph_configure_resource_graph = グラフ化するリソース +view_portlet_help_autodiscovery = このポートレットは新規に発見されたリソースをインポートするか、もしくは無視することができます。インポートされたリソースはモニタリングや管理のためにインベントリに追加することができます。無視されたリソースはインポートされず、明示的に無視を解除しない限りはビューから隠されます。 +view_portlet_help_bundle_deps = このポートレットは構成されたディスプレイクライテリアをベースにした関連するバンドルデプロイを表示します +view_portlet_help_config_updates = このポートレットは構成設定と一致した最近の構成変更を表示します +view_portlet_help_eventcounts = このポートレットは構成されたディスプレイクライテリアに一致するイベント数を表示します +view_portlet_help_favoriteResources = このポートレットは現在ユーザーのお気に入りリソースを表示します +view_portlet_help_graph = このポートレットはリソースメトリックグラフを表示します +view_portlet_help_inventorySummary = このポートレットは現在ユーザーの閲覧可能なインベントリとメトリック収集率のショートサマリーを表示します +view_portlet_help_mashup = このポートレットは(iframeを介して)リモートHTTPリクエストが返した内容を表示します +view_portlet_help_message = このポートレットは静的なHTMLメッセージを表示します。 message プロパティの構成が必要です。 +view_portlet_help_metrics = このポートレットは構成されたディスプレイクライテリアをベースにして関連するメトリックデータのグラフを描きます +view_portlet_help_none = このポートレット用のヘルプは利用できません +view_portlet_help_oobs = このポートレットは OOB(Out of Bound) メトリック条件を表示します +view_portlet_help_operations = このポートレットは現在ユーザのインベントリのために最も最近に実行されたオペレーションを表示します +view_portlet_help_operations_criteria = このポートレットは構成されたディスプレイクライテリアに一致するオペレーションを表示します +view_portlet_help_pkg_history = このポートレットは構成されたディスプレイクライテリアをベースに関連するパッケージ履歴を表示します +view_portlet_help_platformSummary = このポートレットは現在ユーザーによってアクセスあれたプラットフォームリソースのための(現在のCPUとメモリ使用などの）使用データを表示します +view_portlet_help_problemResources = このポートレットは現在ユーザーが変更した、または利用できないリソースを表示します +view_portlet_help_recentAlerts = このポートレットは現在のユーザーが閲覧可能なインベントリ上で発生したアラートを表示します +view_portlet_help_recentlyAdded = このポートレットはインベントリに最近インポートされたリソースを表示します +view_portlet_help_scheduledOperations = このポートレットは現在のユーザーのインベントリのために次にスケジュールされたオペレーションを表示します +view_portlet_help_tagCloud = このポートレットは現在ユーザーのインベントリーのための関連タグの数を表示します +view_portlet_inventory_error1 = インベントリサマリーの取り出しに失敗しました +view_portlet_inventory_tooltip_collapse = クリックするとこのリソースの詳細を隠します +view_portlet_inventory_tooltip_expand = クリックするとこのリソースの詳細を表示します +view_portlet_message_title = 表示するメッセージ +view_portlet_operations_config_completed = 完了したオペレーション +view_portlet_operations_config_completed_enable = ダッシュボードのためにグループ化された完了したオペレーション結果を有効にするかどうか +view_portlet_operations_config_completed_maximum = 完了したオペレーションの最大表示数 +view_portlet_operations_config_scheduled_enable = ダッシュボードのためにグループ化されたスケジュール済みオペレーションを有効にするかどうか +view_portlet_operations_config_scheduled_maximum = スケジュール済みオペレーションの最大表示数 +view_portlet_operations_config_show_last = 最後を表示 +view_portlet_operations_config_show_next = 次を表示 +view_portlet_operations_disabled = (結果は現在無効にされていいます。結果を有効にするには設定を変更してください。 +view_portlet_platform_platform_error_1 = プラットフォームメトリックスのロードに失敗しました +view_portlet_platform_type_error_1 = タイプデータのロードができませんでした +view_portlet_problemResources_config_display_maximum = 問題リソースの最大表示数 +view_portlet_problemResources_config_display_range = ここから数時間遡って問題リソースを表示 +view_portlet_problemResources_config_display_range2 = {0} から {1} まで +view_portlet_problemResources_maxDisplaySetting = 最大リソース +view_portlet_recentAlerts_config_members = メンバーの選択 +view_portlet_recentAlerts_config_priority_label = 優先アラート +view_portlet_recentAlerts_config_when = 次の時間以内で +view_portlet_recentAlerts_fail_msg = アラートフィルタリングのために割り当てられたリソースをロードするのに失敗しました +view_portlet_recentlyAdded_error1 = 最近追加されたリソースをロードするのに失敗しました +view_portlet_recentlyAdded_setting_addedPlatforms = 最近追加されたプラットフォーム view_portlet_results_empty = 指定されたクライテリアの結果は見つかりません view_remoteAgentInstall_agentStatus = エージェントのステータス view_remoteAgentInstall_agentStatusDefault = -ステータスの更新ボタンをクリックしてください- view_remoteAgentInstall_buttonFindAgent = エージェントの発見 view_remoteAgentInstall_connInfo = 接続情報 -view_remoteAgentInstall_error_1 = Error occurred while trying to find agent install path -view_remoteAgentInstall_error_2 = Could not find an agent installed when looking in common locations -view_remoteAgentInstall_error_3 = Could not find an agent installed at or under [{0}] -view_remoteAgentInstall_error_4 = Failed to install agent -view_remoteAgentInstall_error_5 = Failed to start agent -view_remoteAgentInstall_error_6 = Failed to stop agent +view_remoteAgentInstall_error_1 = エージェントのインストールパスを探している間にエラーが発生しました +view_remoteAgentInstall_error_2 = 共通の場所で探しているときにエージェントを見つけることができませんでした +view_remoteAgentInstall_error_3 = [{0}] 以下にインストールされたエージェント見つけることができませんでした +view_remoteAgentInstall_error_4 = エージェントのインストールに失敗しました +view_remoteAgentInstall_error_5 = エージェントの開始に失敗しました +view_remoteAgentInstall_error_6 = エージェントの停止に失敗しました view_remoteAgentInstall_installAgent = エージェントのインストール view_remoteAgentInstall_installInfo = エージェントのインストール情報 view_remoteAgentInstall_installPath = エージェントのインストールパス view_remoteAgentInstall_owner = オーナー -view_remoteAgentInstall_promptHost = The host where the agent is or will be installed -view_remoteAgentInstall_promptInstallPath = Where the agent is or will be installed. If you aren''t sure where an agent is installed, enter a parent directory and click the ''Find Agent'' button to scan that directory and below. If you enter an empty path, common locations are searched on the host for an agent install. -view_remoteAgentInstall_promptPassword = The credentials that are used to authenticate the user on the host via SSH -view_remoteAgentInstall_promptPort = The port the SSH server is listening to. If not specified, the default is 22 -view_remoteAgentInstall_promptUser = The name of the user whose credentials are passed to the host via SSH -view_remoteAgentInstall_result = Result -view_remoteAgentInstall_resultCode = ResultCode +view_remoteAgentInstall_promptHost = エージェントがインストールされている、あるいはこれからインストールされるホスト +view_remoteAgentInstall_promptInstallPath = エージェントがインストールされている、あるいはこれからインストールされる場所。どこにインストールされるか確信がないなら、親ディレクトリを入力して、''エージェントの発見''ボタンをクリックしそのディレクトリ以下をスキャンしてください。空のパスを入力したなら、エージェントをインストールするホスト上の共通の場所が探索されます。 +view_remoteAgentInstall_promptPassword = SSHを介してホスト上のユーザーを認証するために使われるクレデンシャル +view_remoteAgentInstall_promptPort = SSHサーバーがリスンするポート。指定されなければ、デフォルトは22です。 +view_remoteAgentInstall_promptUser = SSHを介してホストに渡されるクレデンシャルを保持するユーザーの名前 +view_remoteAgentInstall_result = 結果 +view_remoteAgentInstall_resultCode = 結果コード view_remoteAgentInstall_startAgent = エージェントの起動 -view_remoteAgentInstall_startAgentResults = Agent start results: [{0}] +view_remoteAgentInstall_startAgentResults = エージェント開始結果: [{0}] view_remoteAgentInstall_step = ステップ view_remoteAgentInstall_stopAgent = エージェントの停止 -view_remoteAgentInstall_stopAgentResults = Agent stop results: [{0}] -view_remoteAgentInstall_success = Agent installation complete +view_remoteAgentInstall_stopAgentResults = エージェント停止結果: [{0}] +view_remoteAgentInstall_success = エージェントインストールの完了 view_remoteAgentInstall_updateStatus = スタータスの更新 view_reportsTop_description = このセクションはグローバルレポートへのアクセスを提供します。 view_reportsTop_title = レポート view_reports_alertDefinitions = アラート定義 -view_reports_alertDefinitions_parentHover = Click to go to the parent alert definition -view_reports_alertDefinitions_resTypeLoadError = Cannot get the template resource type - unable to view the alert template. -view_reports_inventorySummary_failFetch = Failed to get inventory summary +view_reports_alertDefinitions_parentHover = クリックすると親のアラート定義へ行きます +view_reports_alertDefinitions_resTypeLoadError = テンプレートリソースタイプを取得できません - アラートテンプレートの閲覧ができません +view_reports_inventorySummary_failFetch = インベントリサマリーの取得に失敗しました view_reports_platforms = プラットフォーム利用率 view_reports_subsystems = サブシステム -view_resourceResourceGroupList_error_fetchFailure = Failed to fetch Resource''s groups. -view_resourceResourceGroupList_error_updateFailure = Failed to update assigned Resource groups. -view_resourceResourceGroupList_message_updateSuccess = Group membership updated for [{0}]. -view_resource_inventory_activity_changed_by = Changed by +view_resourceResourceGroupList_error_fetchFailure = リソースのグループの取り出しに失敗しました +view_resourceResourceGroupList_error_updateFailure = 割り当てられたリソースグループの更新に失敗しました +view_resourceResourceGroupList_message_updateSuccess = [{0}] のために更新されたグループメンバーシップ. +view_resource_inventory_activity_changed_by = 更新者 view_resource_inventory_activity_criteria_no_recent_events = 表示クライテリアに基づくイベントはありません -view_resource_inventory_activity_no_recent_alerts = No recent alerts -view_resource_inventory_activity_no_recent_bundle_deploy = No recent bundle deployments -view_resource_inventory_activity_no_recent_config_history = No configuration change history -view_resource_inventory_activity_no_recent_events = No events in the last 24 hours -view_resource_inventory_activity_no_recent_metrics = This resource has no recent metrics +view_resource_inventory_activity_no_recent_alerts = 最近のアラートはありません +view_resource_inventory_activity_no_recent_bundle_deploy = 最近のバンドルデプロイメントはありません +view_resource_inventory_activity_no_recent_config_history = 構成変更履歴はありません +view_resource_inventory_activity_no_recent_events = 直近24時間以内にイベントはありません +view_resource_inventory_activity_no_recent_metrics = このリソースには最近のメトリックはありません view_resource_inventory_activity_no_recent_oob = OOBの条件はみつかりません -view_resource_inventory_activity_no_recent_operations = No recent operation history -view_resource_inventory_activity_no_recent_pkg_history = No recent package history -view_resource_inventory_childhistory_createdChild = Created Child -view_resource_inventory_childhistory_deletedChild = Deleted Child -view_resource_inventory_childhistory_filterTitle = Past N Days -view_resource_inventory_childhistory_status_invalidArtifact = Invalid Artifact -view_resource_inventory_childhistory_status_invalidConfig = Invalid Configuration -view_resource_monitor_availability_loadFailed = Failed to load availability history -view_resource_monitor_calltime_average = Average -view_resource_monitor_calltime_count = Count -view_resource_monitor_calltime_destination = Call Destination -view_resource_monitor_calltime_editFailed = Call time data can not be edited -view_resource_monitor_calltime_loadFailed = Could not load call time data -view_resource_monitor_calltime_lookupFailed = Could not load resource for call time -view_resource_monitor_calltime_maximum = Maximum -view_resource_monitor_calltime_minimum = Minimum -view_resource_monitor_calltime_title = Call Time Data -view_resource_monitor_calltime_total = Total -view_resource_monitor_detailed_graph_label = Detailed Graph -view_resource_monitor_graph_instructions = Point your mouse to a data point on the chart -view_resource_monitor_graph_live_tooltip = Click for a live graph of current values -view_resource_monitor_graphs_loadFailed = Failed to load graph data -view_resource_monitor_graphs_lookupFailed = Failed to find resource for graph -view_resource_monitor_graphs_noneAvailable = No graphs available -view_resource_monitor_schedules_title = Resource Metric Collection Schedules +view_resource_inventory_activity_no_recent_operations = 最近のオペレーション履歴はありません +view_resource_inventory_activity_no_recent_pkg_history = 最近のパッケージ履歴はありません +view_resource_inventory_childhistory_createdChild = 作成さrせた子 +view_resource_inventory_childhistory_deletedChild = 削除された子 +view_resource_inventory_childhistory_filterTitle = 過去 N 日 +view_resource_inventory_childhistory_status_invalidArtifact = 不正な生成物 +view_resource_inventory_childhistory_status_invalidConfig = 不正な構成 +view_resource_monitor_availability_loadFailed = アベイラビリティ履歴のロードに失敗しました +view_resource_monitor_calltime_average = 平均 +view_resource_monitor_calltime_count = 数 +view_resource_monitor_calltime_destination = 呼び出しの宛先 +view_resource_monitor_calltime_editFailed = 呼び出し時間データは編集できません +view_resource_monitor_calltime_loadFailed = 呼び出し時間データをロードできません +view_resource_monitor_calltime_lookupFailed = 呼び出し時間のためのリソースをロードできません +view_resource_monitor_calltime_maximum = 最大 +view_resource_monitor_calltime_minimum = 最小 +view_resource_monitor_calltime_title = 呼び出し時間データ +view_resource_monitor_calltime_total = 合計 +view_resource_monitor_detailed_graph_label = 詳細化グラフ +view_resource_monitor_graph_instructions = マウスで図の上のデータを指し示してください +view_resource_monitor_graph_live_tooltip = クリックをすると現在の値の活動中のグラフが表示されます +view_resource_monitor_graphs_loadFailed = グラフデータのロードに失敗しました +view_resource_monitor_graphs_lookupFailed = グラフのためのリソースの発見に失敗しました +view_resource_monitor_graphs_noneAvailable = 利用できるグラフはありません +view_resource_monitor_schedules_title = リソースメトリック収集スケジュール view_resource_monitor_table_alerts = アラート -view_resource_monitor_table_avg = Average -view_resource_monitor_table_last = Last -view_resource_monitor_table_max = Maximum -view_resource_monitor_table_min = Minimum -view_resource_title_component_errors_tooltip = Shows managed component errors. Click for details -view_resource_title_tagUpdateFailed = Failed to update resource tags -view_searchBar_defaultPattern = name your pattern -view_searchBar_error_selectSavedSearch = ''Error selecting saved search'' -view_searchBar_query = Query +view_resource_monitor_table_avg = 平均 +view_resource_monitor_table_last = 最後 +view_resource_monitor_table_max = 最大 +view_resource_monitor_table_min = 最小 +view_resource_title_component_errors_tooltip = 管理コンポーネントエラーの表示。詳細はクリックしてください +view_resource_title_tagUpdateFailed = リソースタグの更新に失敗しました +view_searchBar_defaultPattern = パターンを名前を付けてください +view_searchBar_error_selectSavedSearch = ''保存された検索の選択中のエラー'' +view_searchBar_query = 問い合わせ view_searchBar_resourceGroups = リソースグループ view_searchBar_resources = リソース -view_searchBar_welcomeMessage = search for {0}s -view_searchGUI_loginStatus = Unable to determine login status, check server status -view_selector_assigned = Assigned {0} -view_selector_available = Available {0} -view_subTab_error_disabled = Cannot select disabled subTab [{0}]. -view_summaryDashboard_resetConfirm = Reset to default summary dashboard (lose local changes)? -view_summaryOverviewForm_error_descriptionChangeFailure = Failed to change description of Resource with id {0} from [{1}] to [{2}]. -view_summaryOverviewForm_error_locationChangeFailure = Failed to change location of Resource with id {0} from [{1}] to [{2}]. -view_summaryOverviewForm_error_nameChangeFailure = Failed to change name of Resource with id {0} from [{1}] to [{2}]. -view_summaryOverviewForm_error_traitsLoadFailure = Failed to load traits for {0}. +view_searchBar_welcomeMessage = {0} のための検索 +view_searchGUI_loginStatus = ログインステータスが確定できません。サーバーの状態を調べてください +view_selector_assigned = 割り当てられた {0} +view_selector_available = 利用可能な {0} +view_subTab_error_disabled = 無効になったサブタブ [{0}] を選択できません +view_summaryDashboard_resetConfirm = デフォルトサマリーダッシュボードへリセットしてよろしいですか（現在の変更は失われるかもしれません）? +view_summaryOverviewForm_error_descriptionChangeFailure = ID {0} を持つリソースの説明を [{1}] から [{2}]に変更するのに失敗しました +view_summaryOverviewForm_error_locationChangeFailure = ID {0} を持つリソースの位置を [{1}] から [{2}]に変更するのに失敗しました +view_summaryOverviewForm_error_nameChangeFailure = ID {0} を持つリソースの名前を [{1}] から [{2}]に変更するのに失敗しました +view_summaryOverviewForm_error_traitsLoadFailure = {0} のためのトレイトのロードに失敗しました view_summaryOverviewForm_field_description = 説明 view_summaryOverviewForm_field_location = 場所 view_summaryOverviewForm_field_name = 名前 @@ -1597,16 +1592,16 @@ view_summaryOverviewForm_field_version = バージョン view_summaryOverviewForm_header_summary = サマリ view_summaryOverviewForm_label_plugin = プラグイン: view_summaryOverviewForm_label_type = タイプ: -view_summaryOverviewForm_message_descriptionChangeSuccess = Description of Resource with id {0} was changed from [{1}] to [{2}]. -view_summaryOverviewForm_message_locationChangeSuccess = Location of Resource with id {0} was changed from [{1}] to [{2}]. -view_summaryOverviewForm_message_nameChangeSuccess = Name of Resource with id {0} was changed from [{1}] to [{2}]. +view_summaryOverviewForm_message_descriptionChangeSuccess = ID {0} を持つリソースの説明を [{1}] から [{2}]に変更するのに失敗しました +view_summaryOverviewForm_message_locationChangeSuccess = ID {0} を持つリソースの位置を [{1}] から [{2}]に変更するのに失敗しました +view_summaryOverviewForm_message_nameChangeSuccess = ID {0} を持つリソースの名前を [{1}] から [{2}]に変更するのに失敗しました view_summaryOverview_header_detectedErrors = 検出済みエラー view_summaryOverview_title_errorDetailsWindow = エラー詳細 -view_summaryOverview_tooltip_detectedErrors = Click on the rows to see the error details. -view_tableSection_backButton = Back to List -view_tableSection_error_badId = Can not show detail for [{0}]. Illegal 'id': [{1}]. Please report this bug -view_tableSection_error_noId = Table [{0}] record is missing 'id' attribute - please report this bug. -view_table_drawFail = Failed to draw Table [{0}]. +view_summaryOverview_tooltip_detectedErrors = 行をクリックしてエラーの詳細を調べてください +view_tableSection_backButton = リストへ戻る +view_tableSection_error_badId = [{0}] の詳細を表示できません. 不正な 'id': [{1}]. これをバグとして報告してください +view_tableSection_error_noId = テーブル [{0}] のレコードがで 'id' 属性の付いたものが見当たりません - これをバグとして報告してください +view_table_drawFail = テーブル [{0}] の描画に失敗しました. view_table_matchingRows = 一致した行: {0} (選択済み: {1}) view_table_totalRows = 合計行: {0} (選択済み: {1}) view_tabs_common_activity = アクティビティ @@ -1642,160 +1637,161 @@ view_tabs_common_subscriptions = サブスクリプション view_tabs_common_summary = サマリ view_tabs_common_tables = テーブル view_tabs_common_timeline = タイムライン -view_tabs_common_traits = Traits -view_tabs_invalidSubTab = Invalid subtab: {0} -view_tabs_invalidTab = Invalid tab: {0} -view_tagCloud_deleteTag = Delete Tag -view_tagCloud_deleteTagFailure = Failed to delete the tag [{0}] -view_tagCloud_deleteTagSuccess = You successfully deleted the tag [{0}] -view_tagCloud_error_fetchFailure = Failed to load tags. -view_tagCloud_error_tagUsedCount = Tag used {0} times. -view_tagCloud_title = Tag Cloud +view_tabs_common_traits = トレイト +view_tabs_invalidSubTab = 不正なサブタブ: {0} +view_tabs_invalidTab = 不正なタブ: {0} +view_tagCloud_deleteTag = 削除タグ +view_tagCloud_deleteTagFailure = タグ [{0}] を削除するのに失敗しました +view_tagCloud_deleteTagSuccess = タグ [{0}] を削除するのに成功しました +view_tagCloud_error_fetchFailure = タグをロードするのに失敗しました +view_tagCloud_error_tagUsedCount = {0} 回使われたタグ +view_tagCloud_title = タグクラウド view_taggedResources_title = リソース -view_tags_error_1 = Failed to load Tags +view_tags_error_1 = タグをロードするのに失敗しました view_tags_tags = タグ -view_tags_tooltip_1 = Click to remove this Tag -view_tags_tooltip_2 = Click to edit Tags -view_tags_tooltip_3 = Enter a Tag in the format: (namespace:)(semantic=)tagname (e.g. it:env=QA, or owner=John) -view_testTop_description = This section contains pages for testing various GUI components. +view_tags_tooltip_1 = クリックするとこのタグを削除します +view_tags_tooltip_2 = クリックするとタグを編集します +view_tags_tooltip_3 = 次のフォーマットでタグを入力してください: (namespace:)(semantic=)tagname (例 it:env=QA, or owner=John) +view_testTop_description = このセクションはさまざまなGUIコンポーネントをテストするためのページを含んでいます view_testTop_title = テスト -view_titleBar_common_addedFav = You have added [{0}] as a favorite -view_titleBar_common_addedFavFailure = Failed to add [{0}] as a favorite -view_titleBar_common_clickToAddFav = Click to add this as a favorite -view_titleBar_common_clickToRemoveFav = Click to remove this as a favorite -view_titleBar_common_loadTagsFailure = Failed to load the tags for [{0}] -view_titleBar_common_removedFav = You have removed [{0}] as one of your favorites -view_titleBar_common_removedFavFailure = Failed to remove [{0}] as one of your favorites -view_titleBar_common_updateTagsFailure = Failed to update the tags for [{0}] -view_titleBar_common_updateTagsSuccessful = The tags for [{0}] have been updated -view_titleBar_group_failInfo = Failed to get general info on group [{0}] with ID [{1}] -view_titleBar_group_summary_collapsedTooltip = Click to show more details for this group -view_titleBar_group_summary_expandedTooltip = Click to hide details for this group -view_tree_common_contextMenu_addChartToDashboard = Add chart to dashboard [{0}] -view_tree_common_contextMenu_editPluginConfiguration = Edit [{0}] Plugin Configuration -view_tree_common_contextMenu_editResourceConfiguration = Edit [{0}] Resource Configuration -view_tree_common_contextMenu_groupGraph = Group Metric Graph -view_tree_common_contextMenu_loadFail_children = Failed to load platform manual add children -view_tree_common_contextMenu_loadFail_dashboards = Failed to load user dashboards -view_tree_common_contextMenu_loadFail_group = Failed to load group for context menu -view_tree_common_contextMenu_loadFailed_dashboard = Failed to load user dashboards -view_tree_common_contextMenu_loadFailed_manualAddChildren = Failed to load platform manual add children -view_tree_common_contextMenu_measurements = Measurements -view_tree_common_contextMenu_operations = Operations -view_tree_common_contextMenu_operations_loadFailed = Failure to start wizard for running operations -view_tree_common_contextMenu_resourceConfiguration = Resource Configuration -view_tree_common_contextMenu_resourceGraph = Resource Metric Graph -view_tree_common_contextMenu_saveChartToDashboardFailure = Failed to save the dashboard -view_tree_common_contextMenu_saveChartToDashboardSuccessful = You have saved dashboard [{0}] -view_tree_common_contextMenu_type_name_label = Type: {0} -view_tree_common_createFailed_autoCluster = Failed to create or update autocluster backing group -view_tree_common_loadFailed_children = Failed to load children for node -view_tree_common_loadFailed_create = Failed to create view for this node -view_tree_common_loadFailed_descendants = Failed to load descendants for tree -view_tree_common_loadFailed_generic = Failed to load data for tree -view_tree_common_loadFailed_group = Failed to load group with id [{0}] -view_tree_common_loadFailed_groupTree = Failed to load group tree -view_tree_common_loadFailed_node = Failed to load data for this node -view_tree_common_loadFailed_root = Failed to load root for tree -view_tree_common_loadFailed_selection = Failed to select this node -view_tree_common_loadFailed_update = Failed to update view for this node -view_tree_group_error_updateAutoCluster = Failed to create or update autocluster backing group. key: [{0}] -view_type_parentId = Parent ID -view_type_resourceTypes = Resource Types -view_type_typeTreeLoadFailure = Failed to load resource type tree data -view_upload_alreadyUploaded = File has already been uploaded -view_upload_bundleDistFile = Distribution File -view_upload_error_bundleDistFile = Error uploading Bundle Distribution File -view_upload_error_file = Error uploading file -view_upload_error_fileName = Error uploading file [{0}] -view_upload_error_fileName_2 = Error uploading file [{0}], check for invalid file path. -view_upload_error_packageVersionFile = Error uploading Package Version File -view_upload_error_results = Error uploading file, unexpected results: [{0}] -view_upload_inProgress = Can not submit, upload is currently in progress -view_upload_prompt_1 = Please select a file to upload [{0}] -view_upload_prompt_2 = File to Upload -view_upload_success = File successfully uploaded -view_upload_tooltip_1a = Select a file to upload, then click Upload or Next -view_upload_tooltip_1b = Select a file to upload, then click Next -view_upload_tooltip_2 = File upload had previously failed -view_upload_upload = Upload -view_upload_uploadFile = UploadFile -widget_colorPicker_tooltip = Click to select a new color -widget_durationItem_inputUnitLessThanTargetUnit = Input unit is less than target unit. -widget_durationItem_unitTypeNotSupported = Unit type [{0}] is not supported by this DurationItem. -widget_jobTriggerEditor_fieldHelp_repeatDuration = keep running this operation this many times or until this amount of time has elapsed -widget_jobTriggerEditor_fieldHelp_repeatInterval = how often the operation should be executed -widget_jobTriggerEditor_fieldHelp_startDelay = start executing the operation after this amount of time has elapsed -widget_jobTriggerEditor_field_cronExpression = Cron Expression -widget_jobTriggerEditor_field_mode = Schedule using -widget_jobTriggerEditor_field_repeatInterval_later = Repeat every -widget_jobTriggerEditor_field_repeatInterval_now = Run now and every -widget_jobTriggerEditor_field_startType = Run -widget_jobTriggerEditor_message_endTimeMustBeAfterStartTime = End time must be after start time. -widget_jobTriggerEditor_message_endTimeMustBeInFuture = End time must be in the future. -widget_jobTriggerEditor_message_startTimeMustBeInFuture = Start time must be in the future. -widget_jobTriggerEditor_tab_examples = Examples -widget_jobTriggerEditor_tab_format = Format -widget_jobTriggerEditor_value_calendar = Calendar -widget_jobTriggerEditor_value_cronExpression = Cron Expression +view_titleBar_common_addedFav = [{0}] をお気に入りとして追加しました +view_titleBar_common_addedFavFailure = [{0}] をお気に入りとして追加するのに失敗しました +view_titleBar_common_clickToAddFav = クリックするとこれをお気に入りとして追加します +view_titleBar_common_clickToRemoveFav = クリックするとこれをお気に入りから削除します +view_titleBar_common_loadTagsFailure = [{0}] のためのタグをロードするのに失敗しました +view_titleBar_common_removedFav = お気に入りから [{0}] を削除しました +view_titleBar_common_removedFavFailure = お気に入りから [{0}] を削除するのに失敗しました +view_titleBar_common_updateTagsFailure = [{0}] のタグの更新に失敗しました +view_titleBar_common_updateTagsSuccessful = [{0}] のタグが更新されました +view_titleBar_group_failInfo = ID [{1}] を持つグループ [{0}] に関する一般情報を取得するのに失敗しました +view_titleBar_group_summary_collapsedTooltip = クリックするとこのグループの詳細情報を表示します +view_titleBar_group_summary_expandedTooltip = クリックするとこのグループの詳細を隠します +view_tree_common_contextMenu_addChartToDashboard = ダッシュボード [{0}] へチャートを追加します +view_tree_common_contextMenu_editPluginConfiguration = [{0}] プラグイン構成を編集します +view_tree_common_contextMenu_editResourceConfiguration = [{0}] リソース構成を編集します +view_tree_common_contextMenu_groupGraph = グループメトリックグラフ +view_tree_common_contextMenu_loadFail_children = 子を手動で追加するためのプラットフォームのロードに失敗しました +view_tree_common_contextMenu_loadFail_dashboards = ユーザーのダッシュボードをロードするのに失敗しました +view_tree_common_contextMenu_loadFail_group = コンテキストメニューのためのグループのロードに失敗しました +view_tree_common_contextMenu_loadFailed_dashboard = ユーザーダッシュボードのロードに失敗しました +view_tree_common_contextMenu_loadFailed_manualAddChildren = 子を手動で追加するためのプラットフォームのロードに失敗しました +view_tree_common_contextMenu_measurements = 測定 +view_tree_common_contextMenu_operations = オペレーション +view_tree_common_contextMenu_operations_loadFailed = オペレーションの実行のためにウィザードを開始するのに失敗しました +view_tree_common_contextMenu_resourceConfiguration = リソース構成 +view_tree_common_contextMenu_resourceGraph = リソースメトリックグラフ +view_tree_common_contextMenu_saveChartToDashboardFailure = ダッシュボードを保存するのに失敗しました +view_tree_common_contextMenu_saveChartToDashboardSuccessful = [{0}] を保存しました +view_tree_common_contextMenu_type_name_label = タイプ: {0} +view_tree_common_createFailed_autoCluster = 自動クラスタバッキンググループの作成または更新に失敗しました +view_tree_common_loadFailed_children = ノードの子をロードするのに失敗しました +view_tree_common_loadFailed_create = このノードのビューを作るのに失敗しました +view_tree_common_loadFailed_descendants = ツリーの子孫をロードするのに失敗しました +view_tree_common_loadFailed_generic = ツリーのデータをロードするのに失敗しました +view_tree_common_loadFailed_group = ID [{0}] を持つグループをロードするのに失敗しました +view_tree_common_loadFailed_groupTree = グループツリーをロードするの失敗しました +view_tree_common_loadFailed_node = このノードのためのデータをロードするのに失敗しました +view_tree_common_loadFailed_root = ツリーのためのルートをロードするのに失敗しました +view_tree_common_loadFailed_selection = このノードを選択するのに失敗しました +view_tree_common_loadFailed_update = このノードのためのビューを更新するのに失敗しました +view_tree_group_error_updateAutoCluster = 自動クラスタバッキンググループの作成または更新に失敗しました。キー: [{0}] +view_type_parentId = 親ID +view_type_resourceTypes = リソースタイプ +view_type_typeTreeLoadFailure = リソースタイプのツリーデータをロードするのに失敗しました +view_upload_alreadyUploaded = ファイルはすでに更新されていました +view_upload_bundleDistFile = 分散ファイル +view_upload_error_bundleDistFile = バンドル配布ファイルのアップロードエラー +view_upload_error_file = ファイルアップロードエラー +view_upload_error_fileName = ファイルアップロードエラー [{0}] +view_upload_error_fileName_2 = [{0}] のアップロードエラーです。不正なファイルパスを調べてください。 +view_upload_error_packageVersionFile = パッケージバージョンファイルのアップロードエラー +view_upload_error_results = ファイルのアップロードエラー。予期しない結果: [{0}] +view_upload_inProgress = 送信できません。アップロードは現在進行中です。 +view_upload_prompt_1 = アップロードするファイル [{0}] を選択してください +view_upload_prompt_2 = アップロードするファイル +view_upload_success = ファイルのアップロードが成功しました +view_upload_tooltip_1a = アップロードするファイルを選択して、アップロードまたは次へをクリックしてください +view_upload_tooltip_1b = アップロードするファイルを選択してから次へをクリックしてください +view_upload_tooltip_2 = ファイルアップロードは以前失敗していました +view_upload_upload = アップロード +view_upload_uploadFile = アップロードファイル +widget_colorPicker_tooltip = 新規カラーを選択するためにクリックしてください +widget_durationItem_inputUnitLessThanTargetUnit = 入力単位はターゲット単位よりも小さいです +widget_durationItem_unitTypeNotSupported = 単位のタイプ [{0}] はこの DurationItem によりサポートされません +widget_jobTriggerEditor_fieldHelp_repeatDuration = このオペレーションを何回も実行するか、または指定された時間が終了するまで実行し続けます +widget_jobTriggerEditor_fieldHelp_repeatInterval = オペレーションが実行される頻度 +widget_jobTriggerEditor_fieldHelp_startDelay = 指定された時間が終了したあとにオペレーションの実行を開始します +widget_jobTriggerEditor_field_cronExpression = Cron式 +widget_jobTriggerEditor_field_mode = スケジューリング +widget_jobTriggerEditor_field_repeatInterval_later = 毎回 +widget_jobTriggerEditor_field_repeatInterval_now = 現在と毎回の実行 +widget_jobTriggerEditor_field_startType = 実行 +widget_jobTriggerEditor_message_endTimeMustBeAfterStartTime = 終了時刻は開始時刻の後でなければなりません +widget_jobTriggerEditor_message_endTimeMustBeInFuture = 終了時刻は未来でなければなりません。 +widget_jobTriggerEditor_message_startTimeMustBeInFuture = 開始時刻は未来でなければなりません +widget_jobTriggerEditor_tab_examples = 例 +widget_jobTriggerEditor_tab_format = 形式 +widget_jobTriggerEditor_value_calendar = カレンダー +widget_jobTriggerEditor_value_cronExpression = Cron式 widget_jobTriggerEditor_value_for = For widget_jobTriggerEditor_value_in = in -widget_jobTriggerEditor_value_indefinitely = Indefinitely -widget_jobTriggerEditor_value_later = Later -widget_jobTriggerEditor_value_laterAndRepeat = Later & Repeat -widget_jobTriggerEditor_value_now = Now -widget_jobTriggerEditor_value_nowAndRepeat = Now & Repeat +widget_jobTriggerEditor_value_indefinitely = 無期限 +widget_jobTriggerEditor_value_later = 後で +widget_jobTriggerEditor_value_laterAndRepeat = 後で & 繰り返す +widget_jobTriggerEditor_value_now = 現在 +widget_jobTriggerEditor_value_nowAndRepeat = 現在 & 繰り返す widget_jobTriggerEditor_value_on = on widget_jobTriggerEditor_value_until = Until -widget_recordEditor_error_invalidViewPath = Invalid view path: [{0}] -widget_recordEditor_error_multipleRecords = Multiple records were returned - expected exactly one. -widget_recordEditor_error_noRecords = No records were returned - expected exactly one. -widget_recordEditor_error_operation = Operation failed. An error occurred -widget_recordEditor_error_operationInvalidValues = Operation failed - one or more fields have invalid values -widget_recordEditor_error_permissionCreate = You do not have the permissions required to create a new [{0}] -widget_recordEditor_error_unsupportedOperationType = Unsupported operation type: [{0}] -widget_recordEditor_info_recordCreatedConcise = {0} created. -widget_recordEditor_info_recordCreatedDetailed = {0} [{1}] created. -widget_recordEditor_info_recordUpdatedConcise = {0} updated. -widget_recordEditor_info_recordUpdatedDetailed = {0} [{1}] updated. -widget_recordEditor_info_recordsDeletedConcise = {0} {1} deleted. -widget_recordEditor_info_recordsDeletedDetailed = {0} {1} deleted: {2}. +widget_recordEditor_error_invalidViewPath = 無効なビューパス: [{0}] +widget_recordEditor_error_multipleRecords = 複数レコードが見つかりました - 1つだけが期待されています +widget_recordEditor_error_noRecords = レコードが一つも見つかりませんでした - 1つだけが期待されています +widget_recordEditor_error_operation = オペレーションが失敗しました。エラーが発生しました。 +widget_recordEditor_error_operationInvalidValues = オペレーションが失敗しました。 - 一つ以上のフィールドが無効な値を持っています +widget_recordEditor_error_permissionCreate = [{0}] を新規作成するために必要な権限を持っていません +widget_recordEditor_error_unsupportedOperationType = サポート外のオペレーションタイプ: [{0}] +widget_recordEditor_info_recordCreatedConcise = {0} が作成されました。 +widget_recordEditor_info_recordCreatedDetailed = {0} [{1}] が作成されました。 +widget_recordEditor_info_recordUpdatedConcise = {0} が更新されました。 +widget_recordEditor_info_recordUpdatedDetailed = {0} [{1}] が更新されました。 +widget_recordEditor_info_recordsDeletedConcise = {0} {1} が削除されました。 +widget_recordEditor_info_recordsDeletedDetailed = {0} {1} が削除されました: {2}. widget_recordEditor_label_loading = ロード中... -widget_recordEditor_title_edit = Edit {0} [{1}] -widget_recordEditor_title_new = Create New {0} -widget_recordEditor_title_view = View {0} [{1}] -widget_recordEditor_warn_validation = One or more fields have invalid values. This [{0}] cannot be saved until these values are corrected -widget_resourceFactoryWizard_archPrompt = Package Architecture -widget_resourceFactoryWizard_configTemplatePrompt = Resource Configuration Templates -widget_resourceFactoryWizard_contentTemplatePrompt = Deployment Time Configuration Templates -widget_resourceFactoryWizard_createSubmit = A request to create a resource with the name of [{0}] has been submitted successfully. -widget_resourceFactoryWizard_createSubmitType = A request to create a resource of type [{0}] has been submitted successfully. -widget_resourceFactoryWizard_createWizardTitle = Create New Resource of Type [{0}] -widget_resourceFactoryWizard_createWizardWindowTitle = Resource Create Wizard -##widget_resourceFactoryWizard_editConfigStepName = Deployment Options -widget_resourceFactoryWizard_execute1 = Failed to create a new resource - there is no package version -widget_resourceFactoryWizard_execute2 = Failed to create a new resource -widget_resourceFactoryWizard_failedToDeleteVersion = Failed to delete package version while canceling a resource create -widget_resourceFactoryWizard_failedToGetType = Failed to get backing package type for new resource -widget_resourceFactoryWizard_importFailure = Failed to manually import resource -widget_resourceFactoryWizard_importSubmitted = A request to import a new resource of type [{0}] has been submitted -widget_resourceFactoryWizard_importWizardTitle = Import Resource of Type [{0}] -widget_resourceFactoryWizard_importWizardWindowTitle = Resource Import Wizard -widget_resourceFactoryWizard_infoStepName = Resource Information -widget_resourceFactoryWizard_infoStep_loadFail = Failed to get available Architectures -widget_resourceFactoryWizard_namePrompt = New Resource Name -widget_resourceFactoryWizard_templatePrompt = Connection Settings Template -##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the RHQ Agent). Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. -widget_resourceFactoryWizard_uploadFailure = Failed to upload file -widget_resourceFactoryWizard_uploadFileStepName = Upload Resource Content File -widget_resourceFactoryWizard_uploadInProgress = The upload is in progress... This can take several minutes to complete for large distribution files. -widget_resourceFactoryWizard_versionPrompt = Package Version -widget_resourceSelector_groupCategory = Group Category -widget_resourceSelector_pleaseSelectMultipleResource = Please select one or more resources -widget_resourceSelector_pleaseSelectResource = Please select a resource -widget_resourceSelector_selectMultipleResources = Select Resources -widget_resourceSelector_selectResource = Select a Resource -widget_typeCache_loadFail = Failed to load resource type metadata -widget_typeTree_badTemplateType = Invalid URL. Unknown template type [{0}] -widget_typeTree_badTypeId = Invalid URL. Bad resource type ID [{0}] -widget_typeTree_loadFail = Failed to load resource types +widget_recordEditor_title_edit = 編集 {0} [{1}] +widget_recordEditor_title_new = 新規作成 {0} +widget_recordEditor_title_view = 閲覧 {0} [{1}] +widget_recordEditor_warn_validation = 一つ以上のフィールドが無効な値を持っています。この [{0}] はこれらの値が修正されるまで保存できません +widget_resourceFactoryWizard_archPrompt = パッケージアーキテクチャ +widget_resourceFactoryWizard_configTemplatePrompt = リソース構成テンプレート +widget_resourceFactoryWizard_contentTemplatePrompt = デプロイ時間構成テンプレート +widget_resourceFactoryWizard_createSubmit = 名前 [{0}] のリソースを持つ新規リソースの作成リクエストの送信が成功しました。 +widget_resourceFactoryWizard_createSubmitType = タイプ [{0}] の新規リソースの作成のリクエストの送信が成功しました +widget_resourceFactoryWizard_createWizardTitle = タイプ [{0}] の新規リソースの作成 +widget_resourceFactoryWizard_createWizardWindowTitle = リソース作成ウィザード +widget_resourceFactoryWizard_editConfigStepName = 編集の構成 +widget_resourceFactoryWizard_editConfigStep_nothingToDo = このリソースのために定義が必要な構成は存在しません +widget_resourceFactoryWizard_execute1 = 新規リソースの作成に失敗しました - パッケージバージョンが存在しません +widget_resourceFactoryWizard_execute2 = 新規リソースの作成に失敗しました +widget_resourceFactoryWizard_failedToDeleteVersion = リソース作成のキャンセル中にパッケージバージョンの削除に失敗しました +widget_resourceFactoryWizard_failedToGetType = 新規リソースのパッケージタイプの取得に失敗しました +widget_resourceFactoryWizard_importFailure = 手動でのリソースのインポートに失敗しました +widget_resourceFactoryWizard_importSubmitted = 新規リソースタイプ [{0}] のインポートリクエストが送信されました +widget_resourceFactoryWizard_importWizardTitle = リソースタイプ [{0}] をインポート +widget_resourceFactoryWizard_importWizardWindowTitle = リソースインポートウィザード +widget_resourceFactoryWizard_infoStepName = リソース情報 +widget_resourceFactoryWizard_infoStep_loadFail = アーキテクチャーを利用可能にするのに失敗しました +widget_resourceFactoryWizard_namePrompt = 新規リソース名 +widget_resourceFactoryWizard_templatePrompt = コネクション設定テンプレート +widget_resourceFactoryWizard_timeoutHelp = xxxxxxx +widget_resourceFactoryWizard_uploadFailure = ファイルアップロードの失敗 +widget_resourceFactoryWizard_uploadFileStepName = リソースコンテントファイルのアップロード +widget_resourceFactoryWizard_uploadInProgress = アップロードは処理中です... 大きなファイルを配布するには数分かかることもあります。 +widget_resourceFactoryWizard_versionPrompt = パッケージバージョン +widget_resourceSelector_groupCategory = グループカテゴリ +widget_resourceSelector_pleaseSelectMultipleResource = 一つ以上のリソースを選択してください +widget_resourceSelector_pleaseSelectResource = リソースを選択してください +widget_resourceSelector_selectMultipleResources = リソースを選択 +widget_resourceSelector_selectResource = リソースを選択 +widget_typeCache_loadFail = リソースタイプメタデータのロードに失敗しました +widget_typeTree_badTemplateType = 無効なURL。未知のテンプレートタイプ [{0}] +widget_typeTree_badTypeId = 無効なURL。不正なリソースタイプ [{0}] +widget_typeTree_loadFail = リソースタイプのロードに失敗しました commit 3096d876fec0bbe678c2966fcc459eb3dbf596df Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Jul 11 10:43:10 2011 +0200 Do not mark columns as nullable if they are already nullable, as Oracle does not like this. diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml index df0daf7..d7c373b 100644 --- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml +++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml @@ -3422,10 +3422,8 @@ </statement> </schema-directSQL> <schema-addColumn table="RHQ_CONFIG_PD_OSRC" column="LINK_TO_TARGET" columnType="BOOLEAN"/> - <schema-alterColumn table="RHQ_CONFIG_PD_OSRC" column="LINK_TO_TARGET" nullable="TRUE"/> <schema-addColumn table="RHQ_CONFIG_PD_OSRC" column="FILTER" columnType="VARCHAR2" precision="40"/> - <schema-alterColumn table="RHQ_CONFIG_PD_OSRC" column="FILTER" nullable="TRUE"/> <schema-addColumn table="RHQ_CONFIG_PD_OSRC" column="EXPRESSION" columnType="VARCHAR2" precision="400"/> <schema-alterColumn table="RHQ_CONFIG_PD_OSRC" column="EXPRESSION" nullable="FALSE"/> commit 5aecf44063e3b6bcd501c4153e32990a33e38642 Author: Jijun Liu <lxjijun(a)gmail.com> Date: Sun Jul 10 21:15:09 2011 +0200 Updated chinese translations by Jijun Liu and Zhongqiang Li diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 0b9d91a..f56bd10 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -10,231 +10,231 @@ common_alert_high = High common_alert_low = Low common_alert_medium = Medium common_buildInfo_gwtVersion = ${gwt.version} -common_button_ack = \u786E\u8BA4 -common_button_ack_all = \u786E\u8BA4\u6240\u6709 -common_button_add = \u6DFB\u52A0 -common_button_advanced = \u9AD8\u7EA7... -common_button_apply = \u63A5\u53D7 -common_button_cancel = \u53D6\u6D88 -common_button_close = \u5173\u95ED -common_button_compare = \u5BF9\u6BD4 +common_button_ack = \u786e\u8ba4 +common_button_ack_all = \u786e\u8ba4\u6240\u6709 +common_button_add = \u6dfb\u52a0 +common_button_advanced = \u9ad8\u7ea7... +common_button_apply = \u63a5\u53d7 +common_button_cancel = \u53d6\u6d88 +common_button_close = \u5173\u95ed +common_button_compare = \u5bf9\u6bd4 common_button_create_child = Create Child common_button_delete = \u5220\u9664 common_button_delete_all = \u5220\u9664\u6240\u6709 common_button_disable = \u7981\u7528 -common_button_edit = \u7F16\u8F91 -common_button_enable = \u542F\u7528 -common_button_finish = \u5B8C\u6210 -common_button_import = \u5BFC\u5165 -common_button_new = \u65B0\u5EFA -common_button_next = \u4E0B\u4E00\u6B65 +common_button_edit = \u7f16\u8f91 +common_button_enable = \u542f\u7528 +common_button_finish = \u5b8c\u6210 +common_button_import = \u5bfc\u5165 +common_button_new = \u65b0\u5efa +common_button_next = \u4e0b\u4e00\u6b65 common_button_ok = OK -common_button_previous = \u4E0A\u4E00\u6B65 -common_button_purgeAll = \u6E05\u9664\u6240\u6709 -common_button_refresh = \u5237\u65B0 -common_button_reset = \u91CD\u7F6E -common_button_save = \u4FDD\u5B58 -common_button_schedule = \u8BA1\u5212 -common_button_search = \u68C0\u7D22 +common_button_previous = \u4e0a\u4e00\u6b65 +common_button_purgeAll = \u6e05\u9664\u6240\u6709 +common_button_refresh = \u5237\u65b0 +common_button_reset = \u91cd\u7f6e +common_button_save = \u4fdd\u5b58 +common_button_schedule = \u8ba1\u5212 +common_button_search = \u68c0\u7d22 common_button_set = Set -common_button_showDetails = \u67E5\u770B\u8BE6\u60C5... +common_button_showDetails = \u67e5\u770b\u8be6\u60c5... common_button_uninventory = Uninventory -common_calendar_april_short = \u56DB\u6708 -common_calendar_august_short = \u516B\u6708 -common_calendar_december_short = \u5341\u4E8C\u6708 -common_calendar_february_short = \u4E8C\u6708 -common_calendar_january_short = \u4E00\u6708 -common_calendar_july_short = \u4E03\u6708 -common_calendar_june_short = \u516D\u6708 -common_calendar_march_short = \u4E09\u6708 -common_calendar_may_short = \u4E94\u6708 -common_calendar_november_short = \u5341\u4E00\u6708 +common_calendar_april_short = \u56db\u6708 +common_calendar_august_short = \u516b\u6708 +common_calendar_december_short = \u5341\u4e8c\u6708 +common_calendar_february_short = \u4e8c\u6708 +common_calendar_january_short = \u4e00\u6708 +common_calendar_july_short = \u4e03\u6708 +common_calendar_june_short = \u516d\u6708 +common_calendar_march_short = \u4e09\u6708 +common_calendar_may_short = \u4e94\u6708 +common_calendar_november_short = \u5341\u4e00\u6708 common_calendar_october_short = \u5341\u6708 -common_calendar_september_short = \u4E5D\u6708 +common_calendar_september_short = \u4e5d\u6708 common_label_ago = ago common_label_all = \u6240\u6709 -common_label_all_resources = \u6240\u6709\u8D44\u6E90 +common_label_all_resources = \u6240\u6709\u8d44\u6e90 common_label_day = \u5929 common_label_days = \u5929 -common_label_hour = \u5C0F\u65F6 -common_label_hours = \u5C0F\u65F6 +common_label_hour = \u5c0f\u65f6 +common_label_hours = \u5c0f\u65f6 common_label_item = \u9879 common_label_items = \u9879 -common_label_milliseconds = \u6BEB\u79D2 -common_label_minutes = \u5206\u949F +common_label_milliseconds = \u6beb\u79d2 +common_label_minutes = \u5206\u949f common_label_month = \u6708 -common_label_none = \u65E0 -common_label_role = \u89D2\u8272 -common_label_roles = \u89D2\u8272 -common_label_scheduled_operations = \u8BA1\u5212\u64CD\u4F5C -common_label_seconds = \u79D2 -common_label_selected_resources = \u5DF2\u9009\u8D44\u6E90 -common_label_unlimited = \u65E0\u9650\u5236 +common_label_none = \u65e0 +common_label_role = \u89d2\u8272 +common_label_roles = \u89d2\u8272 +common_label_scheduled_operations = \u8ba1\u5212\u64cd\u4f5c +common_label_seconds = \u79d2 +common_label_selected_resources = \u5df2\u9009\u8d44\u6e90 +common_label_unlimited = \u65e0\u9650\u5236 common_label_user = \u7528\u6237 common_label_users = \u7528\u6237 common_label_week = \u5468 common_label_weeks = \u5468 common_label_yesterday = \u6628\u5929 -common_msg_areYouSure = \u4F60\u786E\u5B9A? -common_msg_asyncTimeout = {0}. \u56E0\u4E3A\u670D\u52A1\u5668\u54CD\u5E94\u65F6\u95F4\u592A\u957F. \u8BF7\u6CE8\u610F\u670D\u52A1\u5668\u53EF\u80FD\u4ECD\u5728\u5904\u7406\u60A8\u7684\u8BF7\u6C42\uFF0C\u5E76\u53EF\u80FD\u5728\u77ED\u671F\u5185\u5B8C\u6210. \u4F60\u53EF\u4EE5\u68C0\u67E5\u670D\u52A1\u5668\u65E5\u5FD7\uFF0C\u67E5\u770B\u662F\u5426\u51FA\u73B0\u4EFB\u4F55\u4E0D\u6B63\u5E38\u7684\u9519\u8BEF. +common_msg_areYouSure = \u4f60\u786e\u5b9a? +common_msg_asyncTimeout = {0}. \u56e0\u4e3a\u670d\u52a1\u5668\u54cd\u5e94\u65f6\u95f4\u592a\u957f. \u8bf7\u6ce8\u610f\u670d\u52a1\u5668\u53ef\u80fd\u4ecd\u5728\u5904\u7406\u60a8\u7684\u8bf7\u6c42\uff0c\u5e76\u53ef\u80fd\u5728\u77ed\u671f\u5185\u5b8c\u6210. \u4f60\u53ef\u4ee5\u68c0\u67e5\u670d\u52a1\u5668\u65e5\u5fd7\uff0c\u67e5\u770b\u662f\u5426\u51fa\u73b0\u4efb\u4f55\u4e0d\u6b63\u5e38\u7684\u9519\u8bef. common_msg_changeAutoDetected = Change auto-detected -common_msg_deleteConfirm = \u4F60\u786E\u5B9A\u8981\u5220\u9664# selected {0}? -common_msg_emphasizedNotePrefix = \u6CE8\u610F: -common_msg_loading = \u52A0\u8F7D\u4E2D... -common_msg_noItemsToShow = \u6CA1\u6709\u6761\u76EE\u663E\u793A -common_msg_notYetImplemented = \u5C1A\u672A\u5B9E\u73B0 -common_msg_see_more = \u67E5\u770B\u66F4\u591A... +common_msg_deleteConfirm = \u4f60\u786e\u5b9a\u8981\u5220\u9664# selected {0}? +common_msg_emphasizedNotePrefix = \u6ce8\u610f: +common_msg_loading = \u52a0\u8f7d\u4e2d... +common_msg_noItemsToShow = \u6ca1\u6709\u6761\u76ee\u663e\u793a +common_msg_notYetImplemented = \u5c1a\u672a\u5b9e\u73b0 +common_msg_see_more = \u67e5\u770b\u66f4\u591a... common_msg_step_x_of_y = Step {0} of {1} -common_severity_debug = Debug -common_severity_error = Error -common_severity_fatal = Fatal -common_severity_info = Info -common_severity_warn = Warn -common_status_canceled = Canceled -common_status_deferred = Deferred -common_status_failed = Failed -common_status_inprogress = In Progress -common_status_nochange = No Change -common_status_partial = Partial -common_status_success = Success -common_status_timedOut = Timed Out -common_status_unknown = Unknown -common_title_add_column = \u6DFB\u52A0\u5217 -common_title_add_graph_to_view = \u6DFB\u52A0\u56FE\u5230\u76D1\u89C6\u89C6\u56FE -common_title_add_portlet = \u6DFB\u52A0Portlet +common_severity_debug = \u8c03\u8bd5 +common_severity_error = \u9519\u8bef +common_severity_fatal = \u4e25\u91cd +common_severity_info = \u4fe1\u606f +common_severity_warn = \u8b66\u544a +common_status_canceled = \u53d6\u6d88 +common_status_deferred = \u5ef6\u671f +common_status_failed = \u5931\u8d25 +common_status_inprogress = \u8fdb\u884c\u4e2d +common_status_nochange = \u672a\u6539\u53d8 +common_status_partial = \u5c40\u90e8 +common_status_success = \u6210\u529f +common_status_timedOut = \u8d85\u65f6 +common_status_unknown = \u672a\u77e5 +common_title_add_column = \u6dfb\u52a0\u5217 +common_title_add_graph_to_view = \u6dfb\u52a0\u56fe\u5230\u76d1\u89c6\u89c6\u56fe +common_title_add_portlet = \u6dfb\u52a0Portlet common_title_address = \u5730\u5740 -common_title_alert_range = \u544A\u8B66\u8303\u56F4 +common_title_alert_range = \u544a\u8b66\u8303\u56f4 common_title_ancestry = \u7956\u5148 -common_title_availability = \u53EF\u7528\u6027 -common_title_available_resources = \u53EF\u7528\u7684\u8D44\u6E90 -common_title_average_metrics = \u5E73\u5747\u6BCF\u5206\u949F\u6307\u6807 -common_title_background = \u80CC\u666F\u8272 +common_title_availability = \u53ef\u7528\u6027 +common_title_available_resources = \u53ef\u7528\u7684\u8d44\u6e90 +common_title_average_metrics = \u5e73\u5747\u6bcf\u5206\u949f\u6307\u6807 +common_title_background = \u80cc\u666f\u8272 common_title_bundle = Bundle common_title_bundles = Bundles -common_title_category = \u7C7B\u522B -common_title_change_refresh_time = \u5237\u65B0\u95F4\u9694 +common_title_category = \u7c7b\u522b +common_title_change_refresh_time = \u5237\u65b0\u95f4\u9694 common_title_columns = \u5217 -common_title_compare_metrics = \u6307\u6807\u5BF9\u6BD4 -common_title_compatibleGroups = \u517C\u5BB9\u7EC4 -common_title_compatibleGroups_total = \u6240\u6709\u517C\u5BB9\u7EC4 -common_title_component_errors = \u7EC4\u4EF6\u9519\u8BEF -common_title_config_update_status = \u66F4\u65B0\u72B6\u6001 -common_title_configuration = \u914D\u7F6E +common_title_compare_metrics = \u6307\u6807\u5bf9\u6bd4 +common_title_compatibleGroups = \u517c\u5bb9\u7ec4 +common_title_compatibleGroups_total = \u6240\u6709\u517c\u5bb9\u7ec4 +common_title_component_errors = \u7ec4\u4ef6\u9519\u8bef +common_title_config_update_status = \u66f4\u65b0\u72b6\u6001 +common_title_configuration = \u914d\u7f6e common_title_count = \u6570 -common_title_custom = \u81EA\u5B9A\u4E49 -common_title_dashboard_name = \u7EDF\u8BA1\u8868\u76D8\u540D -common_title_dateCreated = \u521B\u5EFA\u65E5\u671F -common_title_dateRange = \u65E5\u671F\u8303\u56F4 -common_title_default = \u9ED8\u8BA4 -common_title_description = \u63CF\u8FF0 -common_title_details = \u8BE6\u7EC6 -common_title_display = \u663E\u793A -common_title_display_name = \u663E\u793A\u540D -common_title_duration = \u95F4\u9694 -common_title_edit_mode = \u7F16\u8F91\u6A21\u5F0F -common_title_enabled = \u542F\u7528? +common_title_custom = \u81ea\u5b9a\u4e49 +common_title_dashboard_name = \u7edf\u8ba1\u8868\u76d8\u540d +common_title_dateCreated = \u521b\u5efa\u65e5\u671f +common_title_dateRange = \u65e5\u671f\u8303\u56f4 +common_title_default = \u9ed8\u8ba4 +common_title_description = \u63cf\u8ff0 +common_title_details = \u8be6\u7ec6 +common_title_display = \u663e\u793a +common_title_display_name = \u663e\u793a\u540d +common_title_duration = \u95f4\u9694 +common_title_edit_mode = \u7f16\u8f91\u6a21\u5f0f +common_title_enabled = \u542f\u7528? common_title_end = End common_title_error = Error -common_title_generalProp = \u57FA\u672C\u5C5E\u6027 -common_title_group = \u7EC4 -common_title_group_def_total = \u5B9A\u4E49\u7EC4\u603B\u6570 -common_title_group_member_health = Group Member Health -common_title_groups = \u7EC4 -common_title_help = \u5E2E\u52A9 -common_title_host = \u4E3B\u673A +common_title_generalProp = \u57fa\u672c\u5c5e\u6027 +common_title_group = \u7ec4 +common_title_group_def_total = \u5b9a\u4e49\u7ec4\u603b\u6570 +common_title_group_member_health = \u7ec4\u5458\u5065\u5eb7\u5ea6 +common_title_groups = \u7ec4 +common_title_help = \u5e2e\u52a9 +common_title_host = \u4e3b\u673a common_title_id = ID common_title_id_parent = \u7236ID -common_title_info = Info -common_title_inventory = \u6E05\u5355 -common_title_inventorySummary = \u6E05\u5355\u6C47\u603B -common_title_lastUpdated = \u6700\u8FD1\u66F4\u65B0 -common_title_lastUpdatedBy = \u6700\u8FD1\u66F4\u65B0\u8005 -common_title_ldapGroups = LDAP\u7EC4 +common_title_info = \u4fe1\u606f +common_title_inventory = \u6e05\u5355 +common_title_inventorySummary = \u6e05\u5355\u6c47\u603b +common_title_lastUpdated = \u6700\u8fd1\u66f4\u65b0 +common_title_lastUpdatedBy = \u6700\u8fd1\u66f4\u65b0\u8005 +common_title_ldapGroups = LDAP\u7ec4 common_title_mashup = Mashup -common_title_members_reporting = \u7EC4\u62A5\u8868 -common_title_message = \u6D88\u606F -common_title_metric = Metric -common_title_metric_chart = Metric\u56FE\u8868 -common_title_mixedGroups = \u6DF7\u5408\u7EC4 -common_title_mixedGroups_total = \u6240\u6709\u6DF7\u5408\u7EC4 -common_title_name = \u540D\u79F0 -common_title_new_dashboard = \u65B0\u5EFA\u7EDF\u8BA1\u8868\u76D8 -common_title_numeric_metrics = \u6570\u5B57\u578B\u6307\u6807 -common_title_numeric_type = \u6570\u5B57\u7C7B\u578B -common_title_operation_status = \u64CD\u4F5C\u72B6\u6001 -common_title_operations = \u64CD\u4F5C -common_title_operations_range = \u64CD\u4F5C\u8303\u56F4 -common_title_over = Over -common_title_password = \u5BC6\u7801 -common_title_path = Path +common_title_members_reporting = \u7ec4\u62a5\u8868 +common_title_message = \u6d88\u606f +common_title_metric = \u6307\u6807 +common_title_metric_chart = \u6307\u6807\u56fe\u8868 +common_title_mixedGroups = \u6df7\u5408\u7ec4 +common_title_mixedGroups_total = \u6240\u6709\u6df7\u5408\u7ec4 +common_title_name = \u540d\u79f0 +common_title_new_dashboard = \u65b0\u5efa\u7edf\u8ba1\u8868\u76d8 +common_title_numeric_metrics = \u6570\u5b57\u578b\u6307\u6807 +common_title_numeric_type = \u6570\u5b57\u7c7b\u578b +common_title_operation_status = \u64cd\u4f5c\u72b6\u6001 +common_title_operations = \u64cd\u4f5c +common_title_operations_range = \u64cd\u4f5c\u8303\u56f4 +common_title_over = \u8d85\u8fc7 +common_title_password = \u5bc6\u7801 +common_title_path = \u8def\u5f84 common_title_permissions = \u6743\u9650 -common_title_platform = \u5E73\u53F0 -common_title_platform_total = \u6240\u6709\u5E73\u53F0 -common_title_plugin = \u63D2\u4EF6 -common_title_port = \u7AEF\u53E3 -common_title_providers = \u63D0\u4F9B\u8005 -common_title_recent_alerts = \u6700\u8FD1\u544A\u8B66 -common_title_recent_bundle_deployments = \u6700\u8FD1\u53D1\u5E03Bundles -common_title_recent_configuration_updates = \u6700\u8FD1\u914D\u7F6E\u66F4\u65B0 -common_title_recent_event_counts = \u6700\u8FD1\u4E8B\u4EF6\u6570 -common_title_recent_measurements = Recent Measurements -common_title_recent_oob_metrics = Recent Out of Bound metrics -common_title_recent_operations = \u6700\u8FD1\u64CD\u4F5C -common_title_recent_pkg_history = \u6700\u8FD1\u5386\u53F2\u5305 -common_title_recently_added = \u6700\u8FD1\u6DFB\u52A0 -common_title_remove_column = \u79FB\u9664\u5217 -common_title_repositories = \u5E93 -common_title_resource = \u8D44\u6E90 -common_title_resourceGroups = \u8D44\u6E90\u7EC4 -common_title_resource_group = \u8D44\u6E90\u7EC4 -common_title_resource_id = \u8D44\u6E90ID -common_title_resource_inventory = \u8D44\u6E90\u6E05\u5355 -common_title_resource_key = \u8D44\u6E90Key -common_title_resource_name = \u8D44\u6E90\u540D -common_title_resource_type = \u8D44\u6E90\u7C7B\u578B -common_title_resources = \u8D44\u6E90 -common_title_results_count = \u7ED3\u679C\u6570\u91CF -common_title_results_count_tooltip = \u663E\u793A\u7ED3\u679C\u6570\u91CF -common_title_role = \u89D2\u8272 -common_title_roles = \u89D2\u8272 -common_title_scheduled_operations = \u8BA1\u5212\u64CD\u4F5C -common_title_search = \u641C\u7D22 -common_title_selected_resources = \u9009\u62E9\u7684\u8D44\u6E90 -common_title_server = \u670D\u52A1\u5668 -common_title_server_total = \u670D\u52A1\u5668\u603B\u6570 -common_title_service = \u670D\u52A1 -common_title_service_total = \u670D\u52A1\u603B\u6570 -common_title_settings = \u8BBE\u7F6E -common_title_show = \u663E\u793A -common_title_show_more = \u663E\u793A\u6240\u6709... -common_title_sort_order = \u6392\u5E8F -common_title_sort_order_tooltip = \u8BBE\u7F6E\u6392\u5E8F\u65B9\u5F0F. -common_title_start = \u5F00\u59CB -common_title_status = \u72B6\u6001 -common_title_stop = \u505C\u6B62 -common_title_summary = \u7EDF\u8BA1 -common_title_tag_cloud = \u6807\u7B7E\u4E91 +common_title_platform = \u5e73\u53f0 +common_title_platform_total = \u6240\u6709\u5e73\u53f0 +common_title_plugin = \u63d2\u4ef6 +common_title_port = \u7aef\u53e3 +common_title_providers = \u63d0\u4f9b\u8005 +common_title_recent_alerts = \u6700\u8fd1\u544a\u8b66 +common_title_recent_bundle_deployments = \u6700\u8fd1\u53d1\u5e03Bundles +common_title_recent_configuration_updates = \u6700\u8fd1\u914d\u7f6e\u66f4\u65b0 +common_title_recent_event_counts = \u6700\u8fd1\u4e8b\u4ef6\u6570 +common_title_recent_measurements = \u6700\u8fd1\u76d1\u6d4b +common_title_recent_oob_metrics = \u6700\u8fd1\u8d85\u6807\u6307\u6807 +common_title_recent_operations = \u6700\u8fd1\u64cd\u4f5c +common_title_recent_pkg_history = \u6700\u8fd1\u5386\u53f2\u5305 +common_title_recently_added = \u6700\u8fd1\u6dfb\u52a0 +common_title_remove_column = \u79fb\u9664\u5217 +common_title_repositories = \u5e93 +common_title_resource = \u8d44\u6e90 +common_title_resourceGroups = \u8d44\u6e90\u7ec4 +common_title_resource_group = \u8d44\u6e90\u7ec4 +common_title_resource_id = \u8d44\u6e90ID +common_title_resource_inventory = \u8d44\u6e90\u6e05\u5355 +common_title_resource_key = \u8d44\u6e90Key +common_title_resource_name = \u8d44\u6e90\u540d +common_title_resource_type = \u8d44\u6e90\u7c7b\u578b +common_title_resources = \u8d44\u6e90 +common_title_results_count = \u7ed3\u679c\u6570\u91cf +common_title_results_count_tooltip = \u663e\u793a\u7ed3\u679c\u6570\u91cf +common_title_role = \u89d2\u8272 +common_title_roles = \u89d2\u8272 +common_title_scheduled_operations = \u8ba1\u5212\u64cd\u4f5c +common_title_search = \u641c\u7d22 +common_title_selected_resources = \u9009\u62e9\u7684\u8d44\u6e90 +common_title_server = \u670d\u52a1\u5668 +common_title_server_total = \u670d\u52a1\u5668\u603b\u6570 +common_title_service = \u670d\u52a1 +common_title_service_total = \u670d\u52a1\u603b\u6570 +common_title_settings = \u8bbe\u7f6e +common_title_show = \u663e\u793a +common_title_show_more = \u663e\u793a\u6240\u6709... +common_title_sort_order = \u6392\u5e8f +common_title_sort_order_tooltip = \u8bbe\u7f6e\u6392\u5e8f\u65b9\u5f0f. +common_title_start = \u5f00\u59cb +common_title_status = \u72b6\u6001 +common_title_stop = \u505c\u6b62 +common_title_summary = \u7edf\u8ba1 +common_title_tag_cloud = \u6807\u7b7e\u4e91 common_title_the = The -common_title_timestamp = \u65E5\u671F/\u65F6\u95F4 -common_title_total = \u603B\u6570 -common_title_type = \u7C7B\u578B -common_title_units = \u5355\u4F4D +common_title_timestamp = \u65e5\u671f/\u65f6\u95f4 +common_title_total = \u603b\u6570 +common_title_type = \u7c7b\u578b +common_title_units = \u5355\u4f4d common_title_user = \u7528\u6237 common_title_users = \u7528\u6237 -common_title_value = \u503C -common_title_version = \u7248\u672C -common_title_view_mode = \u67E5\u770B\u6A21\u5F0F +common_title_value = \u503c +common_title_version = \u7248\u672c +common_title_view_mode = \u67e5\u770b\u6a21\u5f0f common_title_web_address = Web\u5730\u5740 -common_title_welcome = \u6B22\u8FCE +common_title_welcome = \u6b22\u8fce common_unit_days = \u5929 -common_unit_hours = \u5C0F\u65F6 -common_unit_milliseconds = \u6BEB\u79D2 -common_unit_minutes = \u5206\u949F +common_unit_hours = \u5c0f\u65f6 +common_unit_milliseconds = \u6beb\u79d2 +common_unit_minutes = \u5206\u949f common_unit_months = \u6708 -common_unit_seconds = \u79D2 -common_unit_times = \u6B21 +common_unit_seconds = \u79d2 +common_unit_times = \u6b21 common_unit_weeks = \u5468 -common_unit_years = \u5E74 +common_unit_years = \u5e74 common_val_for = for common_val_n1st = {0}st common_val_n2nd = {0}nd @@ -247,363 +247,363 @@ common_val_none = None common_val_nth = {0}th common_val_yes = Yes common_val_yes_lower = yes -dataSource_ContentRepoTree_error_load = \u52A0\u8F7D\u5E93\u9519\u8BEF +dataSource_ContentRepoTree_error_load = \u52a0\u8f7d\u5e93\u9519\u8bef dataSource_ContentRepoTree_field_parentId = \u7236ID -dataSource_bundle_loadFailed = \u52A0\u8F7Dbundle\u6570\u636E\u5931\u8D25 -dataSource_configurationHistory_clickToSeeError = \u53CC\u51FB\u67E5\u770B\u9519\u8BEF... -dataSource_configurationHistory_currentConfig = \u8FD9\u662F\u5F53\u524D\u914D\u7F6E -dataSource_configurationHistory_dateCompleted = \u5B8C\u6210\u65E5\u671F -dataSource_configurationHistory_dateSubmitted = \u63D0\u4EA4\u65E5\u671F -dataSource_configurationHistory_error_fetchFailure = \u65E0\u6CD5\u52A0\u8F7D\u5386\u53F2\u914D\u7F6E. -dataSource_configurationHistory_updateType = \u66F4\u65B0\u7C7B\u578B -dataSource_configurationHistory_updateType_group = \u7EC4 -dataSource_configurationHistory_updateType_individual = Individual -dataSource_definitions_loadFailed = \u65E0\u6CD5\u52A0\u8F7D\u6307\u6807\u5B9A\u4E49 -dataSource_measurementOob_error_fetchFailure = \u52A0\u8F7Dmeasurement OOB information\u5931\u8D25 -dataSource_measurementOob_field_factor = Out of Range Factor (%) +dataSource_bundle_loadFailed = \u52a0\u8f7dbundle\u6570\u636e\u5931\u8d25 +dataSource_configurationHistory_clickToSeeError = \u53cc\u51fb\u67e5\u770b\u9519\u8bef... +dataSource_configurationHistory_currentConfig = \u8fd9\u662f\u5f53\u524d\u914d\u7f6e +dataSource_configurationHistory_dateCompleted = \u5b8c\u6210\u65e5\u671f +dataSource_configurationHistory_dateSubmitted = \u63d0\u4ea4\u65e5\u671f +dataSource_configurationHistory_error_fetchFailure = \u65e0\u6cd5\u52a0\u8f7d\u5386\u53f2\u914d\u7f6e. +dataSource_configurationHistory_updateType = \u66f4\u65b0\u7c7b\u578b +dataSource_configurationHistory_updateType_group = \u7ec4 +dataSource_configurationHistory_updateType_individual = \u5355\u72ec\u7684 +dataSource_definitions_loadFailed = \u65e0\u6cd5\u52a0\u8f7d\u6307\u6807\u5b9a\u4e49 +dataSource_measurementOob_error_fetchFailure = \u52a0\u8f7d\u76d1\u6d4bOOB\u4fe1\u606f\u5931\u8d25 +dataSource_measurementOob_field_factor = \u8d85\u51fa\u8303\u56f4\u56e0\u5b50 (%) dataSource_measurementOob_field_formattedBaseband = Band dataSource_measurementOob_field_formattedOutlier = Outlier dataSource_measurementOob_field_parentName = \u7236 -dataSource_measurementOob_field_resourceName = \u8D44\u6E90 +dataSource_measurementOob_field_resourceName = \u8d44\u6e90 dataSource_measurementOob_field_scheduleName = \u6307\u6807 -dataSource_operationHistory_error_fetchFailure = \u52A0\u8F7D\u5386\u53F2\u64CD\u4F5C\u5931\u8D25. -dataSource_operationHistory_field_createdTime = \u521B\u5EFA\u65F6\u95F4 -dataSource_operationHistory_field_operationName = \u64CD\u4F5C\u540D -dataSource_operationHistory_field_startedTime = \u5F00\u59CB\u65F6\u95F4 +dataSource_operationHistory_error_fetchFailure = \u52a0\u8f7d\u5386\u53f2\u64cd\u4f5c\u5931\u8d25. +dataSource_operationHistory_field_createdTime = \u521b\u5efa\u65f6\u95f4 +dataSource_operationHistory_field_operationName = \u64cd\u4f5c\u540d +dataSource_operationHistory_field_startedTime = \u5f00\u59cb\u65f6\u95f4 dataSource_operationHistory_field_subject = Requester -dataSource_operationSchedule_field_description = \u6CE8\u610F -dataSource_operationSchedule_field_id = \u8BA1\u5212\u4EFB\u52A1ID -dataSource_operationSchedule_field_nextFireTime = \u4E0B\u6B21\u89E6\u53D1\u65F6\u95F4 -dataSource_operationSchedule_field_operationDisplayName = \u64CD\u4F5C -dataSource_operationSchedule_field_operationName = \u64CD\u4F5C +dataSource_operationSchedule_field_description = \u6ce8\u610f +dataSource_operationSchedule_field_id = \u8ba1\u5212\u4efb\u52a1ID +dataSource_operationSchedule_field_nextFireTime = \u4e0b\u6b21\u89e6\u53d1\u65f6\u95f4 +dataSource_operationSchedule_field_operationDisplayName = \u64cd\u4f5c +dataSource_operationSchedule_field_operationName = \u64cd\u4f5c dataSource_operationSchedule_field_subject = \u6240\u6709\u8005 -dataSource_operationSchedule_field_timeout = \u8D85\u65F6(\u79D2) +dataSource_operationSchedule_field_timeout = \u8d85\u65f6(\u79d2) dataSource_platforms_field_cpu = CPU -dataSource_platforms_field_memory = \u5185\u5B58 -dataSource_platforms_field_swap = \u4EA4\u6362\u533A -dataSource_problemResources_error_fetchFailure = \u52A0\u8F7D\u544A\u8B66/\u4E0D\u53EF\u7528\u8D44\u6E90\u5931\u8D25. -dataSource_problemResources_field_alerts = \u544A\u8B66 -dataSource_problemResources_field_available = \u5F53\u524D\u53EF\u7528\u6027 -dataSource_recentOperations_error_fetchFailure = \u52A0\u8F7D\u6700\u8FD1\u64CD\u4F5C\u5931\u8D25. -dataSource_recentOperations_field_location = \u4F4D\u7F6E -dataSource_recentOperations_field_operation = \u64CD\u4F5C -dataSource_recentOperations_field_resource = \u8D44\u6E90 -dataSource_recentOperations_field_status = \u72B6\u6001 -dataSource_recentOperations_field_time = \u65E5\u671F/\u65F6\u95F4 -dataSource_resourceErrors_clickStatusIcon = \u70B9\u51FB\u56FE\u6807\u67E5\u770B\u8BE6\u60C5 -dataSource_resourceErrors_deleteFailure = \u5220\u9664\u8D44\u6E90\u9519\u8BEF\u5931\u8D25 -dataSource_resourceErrors_deleteSuccess = You have successfully deleted [{0}] resource error messages. -dataSource_resourceErrors_error_fetchFailure = Failed to find Resource errors for Resource with id [{0}]. -dataSource_resourceErrors_field_errorType = \u9519\u8BEF\u7C7B\u578B -dataSource_resourceErrors_field_summary = \u7EDF\u8BA1 -dataSource_resourceErrors_field_timeOccured = \u65F6\u95F4 -dataSource_resourceGroups_loadFailed = \u52A0\u8F7D\u8D44\u6E90\u7EC4\u5931\u8D25 -dataSource_resources_field_discoveryTime = \u53D1\u73B0\u65F6\u95F4 -dataSource_resources_field_importTime = \u5BFC\u5165\u65F6\u95F4 +dataSource_platforms_field_memory = \u5185\u5b58 +dataSource_platforms_field_swap = \u4ea4\u6362\u533a +dataSource_problemResources_error_fetchFailure = \u52a0\u8f7d\u544a\u8b66/\u4e0d\u53ef\u7528\u8d44\u6e90\u5931\u8d25. +dataSource_problemResources_field_alerts = \u544a\u8b66 +dataSource_problemResources_field_available = \u5f53\u524d\u53ef\u7528\u6027 +dataSource_recentOperations_error_fetchFailure = \u52a0\u8f7d\u6700\u8fd1\u64cd\u4f5c\u5931\u8d25. +dataSource_recentOperations_field_location = \u4f4d\u7f6e +dataSource_recentOperations_field_operation = \u64cd\u4f5c +dataSource_recentOperations_field_resource = \u8d44\u6e90 +dataSource_recentOperations_field_status = \u72b6\u6001 +dataSource_recentOperations_field_time = \u65e5\u671f/\u65f6\u95f4 +dataSource_resourceErrors_clickStatusIcon = \u70b9\u51fb\u56fe\u6807\u67e5\u770b\u8be6\u60c5 +dataSource_resourceErrors_deleteFailure = \u5220\u9664\u8d44\u6e90\u9519\u8bef\u5931\u8d25 +dataSource_resourceErrors_deleteSuccess = \u6210\u529f\u5220\u9664\u8d44\u6e90[{0}]\u9519\u8bef\u4fe1\u606f. +dataSource_resourceErrors_error_fetchFailure = \u67e5\u627e\u8d44\u6e90[{0}]\u9519\u8bef\u4fe1\u606f\u5931\u8d25. +dataSource_resourceErrors_field_errorType = \u9519\u8bef\u7c7b\u578b +dataSource_resourceErrors_field_summary = \u7edf\u8ba1 +dataSource_resourceErrors_field_timeOccured = \u65f6\u95f4 +dataSource_resourceGroups_loadFailed = \u52a0\u8f7d\u8d44\u6e90\u7ec4\u5931\u8d25 +dataSource_resources_field_discoveryTime = \u53d1\u73b0\u65f6\u95f4 +dataSource_resources_field_importTime = \u5bfc\u5165\u65f6\u95f4 dataSource_resources_field_key = Key -dataSource_resources_field_lastModifiedTime = \u6700\u8FD1\u66F4\u6539\u65F6\u95F4 -dataSource_resources_field_lastModifier = \u6700\u8FD1\u4FEE\u6539\u8005 -dataSource_resources_field_location = \u4F4D\u7F6E -dataSource_rpc_error_transformRequestFailure = Failure in datasource while processing {0} request. +dataSource_resources_field_lastModifiedTime = \u6700\u8fd1\u66f4\u6539\u65f6\u95f4 +dataSource_resources_field_lastModifier = \u6700\u8fd1\u4fee\u6539\u8005 +dataSource_resources_field_location = \u4f4d\u7f6e +dataSource_rpc_error_transformRequestFailure = \u5728\u6570\u636e\u6e90\u4e2d\u5904\u7406\u8bf7\u6c42{0}\u5931\u8d25. dataSource_rpc_error_unsupportedArrayFilterType = No support for passing array filters of type {0}. dataSource_rpc_error_unsupportedEnumType = Please add an appropriate code block for enum {0} to RPCDataSource.getEnumArray(Class) dataSource_rpc_no = no dataSource_rpc_yes = yes -dataSource_scheduledOperations_error_fetchFailure = \u65E0\u6CD5\u8F7D\u5165\u8BA1\u5212\u64CD\u4F5C. -dataSource_scheduledOperations_field_location = \u4F4D\u7F6E -dataSource_scheduledOperations_field_operation = \u64CD\u4F5C -dataSource_scheduledOperations_field_resource = \u8D44\u6E90 -dataSource_scheduledOperations_field_time = \u65E5\u671F/\u65F6\u95F4 -dataSource_schedules_disableFailure_group = Failed to disable the collection of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}] -dataSource_schedules_disableFailure_resource = Failed to disable the collection of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}] -dataSource_schedules_disableSuccessful_concise = You have disabled the collection of [{0}] measurements -dataSource_schedules_disableSuccessful_full_group = You have disabled the collection of [{0}] measurements for the resource group with ID [{1}]. The disabled measurements are: [{2}] -dataSource_schedules_disableSuccessful_full_resource = You have disabled the collection of [{0}] measurements for the resource with ID [{1}]. The disabled measurements are: [{2}] -dataSource_schedules_enableFailure_group = Failed to enable the collection of [{0}] metrics for group with ID [{1}]. The metrics were: [{2}] -dataSource_schedules_enableFailure_resource = Failed to enable the collection of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}] -dataSource_schedules_enableSuccessful_concise = You have enabled the collection of [{0}] measurements -dataSource_schedules_enableSuccessful_full_group = You have enabled the collection of [{0}] measurements for the resource group with ID [{1}]. The enabled measurements are: [{2}] -dataSource_schedules_enableSuccessful_full_resource = You have enabled the collection of [{0}] measurements for the resource with ID [{1}]. The enabled measurements are: [{2}] -dataSource_schedules_field_resourceGroupId = \u7EC4ID -dataSource_schedules_loadFailed = \u52A0\u8F7D\u6307\u6807\u8BA1\u5212\u4EFB\u52A1\u5931\u8D25 -dataSource_schedules_loadFailedContext = Failed to load metric schedules for context [{0}] -dataSource_schedules_loadFailedCriteria = Failed to load metric schedules for criteria [{0}] -dataSource_schedules_updateFailure_group = Failed to set the collection interval of [{0}] metrics for resource group with ID [{1}]. The metrics were: [{2}]. The collection interval was to be [{3}] seconds. -dataSource_schedules_updateFailure_resource = Failed to set the collection interval of [{0}] metrics for resource with ID [{1}]. The metrics were: [{2}]. The collection interval was to be [{3}] seconds. +dataSource_scheduledOperations_error_fetchFailure = \u65e0\u6cd5\u8f7d\u5165\u8ba1\u5212\u64cd\u4f5c. +dataSource_scheduledOperations_field_location = \u4f4d\u7f6e +dataSource_scheduledOperations_field_operation = \u64cd\u4f5c +dataSource_scheduledOperations_field_resource = \u8d44\u6e90 +dataSource_scheduledOperations_field_time = \u65e5\u671f/\u65f6\u95f4 +dataSource_schedules_disableFailure_group = \u7981\u7528\u6307\u6807\u96c6[{0}]\u5931\u8d25 \u4e3a\u8d44\u6e90\u7ec4ID [{1}]. \u6307\u6807\u662f: [{2}] +dataSource_schedules_disableFailure_resource = \u7981\u7528\u6307\u6807\u96c6[{0}]\u5931\u8d25 \u4e3a\u8d44\u6e90ID [{1}]. \u6307\u6807\u662f: [{2}] +dataSource_schedules_disableSuccessful_concise = \u7981\u7528\u76d1\u6d4b\u96c6[{0}]\u6210\u529f +dataSource_schedules_disableSuccessful_full_group = \u7981\u7528\u76d1\u6d4b\u96c6 [{0}] \u4e3a\u8d44\u6e90\u7ec4ID [{1}]. \u88ab\u7981\u7528\u7684\u76d1\u6d4b\u662f: [{2}] +dataSource_schedules_disableSuccessful_full_resource = \u7981\u7528\u76d1\u6d4b\u96c6 [{0}] \u4e3a\u8d44\u6e90ID [{1}]. \u88ab\u7981\u7528\u7684\u76d1\u6d4b\u662f: [{2}] +dataSource_schedules_enableFailure_group = \u542f\u7528\u6307\u6807\u96c6[{0}]\u5931\u8d25 \u4e3a\u7ec4ID [{1}]. \u6307\u6807\u662f: [{2}] +dataSource_schedules_enableFailure_resource = \u542f\u7528\u6307\u6807\u96c6 [{0}]\u5931\u8d25\u4e3a\u8d44\u6e90 ID [{1}]. \u6307\u6807\u662f: [{2}] +dataSource_schedules_enableSuccessful_concise = \u5df2\u542f\u7528\u76d1\u6d4b\u96c6[{0}] +dataSource_schedules_enableSuccessful_full_group = \u542f\u7528\u76d1\u6d4b\u96c6 [{0}]\u4e3a\u8d44\u6e90\u7ec4ID [{1}]. \u542f\u7528\u7684\u76d1\u6d4b\u662f: [{2}] +dataSource_schedules_enableSuccessful_full_resource = \u542f\u7528\u76d1\u6d4b\u96c6[{0}]\u4e3a\u8d44\u6e90ID [{1}]. \u542f\u7528\u7684\u76d1\u6d4b\u662f: [{2}] +dataSource_schedules_field_resourceGroupId = \u7ec4ID +dataSource_schedules_loadFailed = \u52a0\u8f7d\u6307\u6807\u8ba1\u5212\u4efb\u52a1\u5931\u8d25 +dataSource_schedules_loadFailedContext = \u4e3a\u4e0a\u4e0b\u6587[{0}]\u52a0\u8f7d\u6307\u6807\u8ba1\u5212\u4efb\u52a1\u5931\u8d25 +dataSource_schedules_loadFailedCriteria = \u4e3a\u6807\u51c6[{0}]\u52a0\u8f7d\u6307\u6807\u8ba1\u5212\u4efb\u52a1 +dataSource_schedules_updateFailure_group = Failed to set the collection interval of [{0}] metrics for resource group with ID [{1}]. \u6307\u6807\u662f: [{2}]. The collection interval was to be [{3}] seconds. +dataSource_schedules_updateFailure_resource = Failed to set the collection interval of [{0}] metrics for resource with ID [{1}]. \u6307\u6807\u662f: [{2}]. The collection interval was to be [{3}] seconds. dataSource_schedules_updateSuccessful_concise = A new collection interval of [{0}] seconds has been set on [{1}] measurements dataSource_schedules_updateSuccessful_full_group = A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource group with ID [{2}]. The updated measurements are: [{3}] dataSource_schedules_updateSuccessful_full_resource = A new collection interval of [{0}] seconds has been set on [{1}] measurements for resource with ID [{2}]. The updated measurements are: [{3}] -dataSource_traits_failFetch = Failed to fetch traits for criteria [{0}]. -dataSource_traits_field_definitionID = Definition ID -dataSource_traits_field_lastChanged = \u6700\u8FD1\u66F4\u6539 -dataSource_traits_field_primaryKey = \u4E3B\u952E -dataSource_traits_field_trait = Trait -dataSource_traits_group_field_groupId = \u7EC4ID +dataSource_traits_failFetch = \u83b7\u53d6\u6807\u51c6 [{0}]\u7279\u5f81\u5931\u8d25. +dataSource_traits_field_definitionID = \u5b9a\u4e49ID +dataSource_traits_field_lastChanged = \u6700\u8fd1\u66f4\u6539 +dataSource_traits_field_primaryKey = \u4e3b\u952e +dataSource_traits_field_trait = \u7279\u5f81 +dataSource_traits_group_field_groupId = \u7ec4ID dataSource_users_delete = \u5220\u9664\u7528\u6237[{0}] -dataSource_users_deleteFailed = \u5220\u9664\u7528\u6237[{0}]\u5931\u8D25 -dataSource_users_field_department = \u90E8\u95E8 +dataSource_users_deleteFailed = \u5220\u9664\u7528\u6237[{0}]\u5931\u8d25 +dataSource_users_field_department = \u90e8\u95e8 dataSource_users_field_emailAddress = Email\u5730\u5740 -dataSource_users_field_factive = \u5141\u8BB8\u767B\u5F55? -dataSource_users_field_firstName = \u540D +dataSource_users_field_factive = \u5141\u8bb8\u767b\u5f55? +dataSource_users_field_firstName = \u540d dataSource_users_field_id = ID -dataSource_users_field_lastName = \u59D3 -dataSource_users_field_ldap = LDAP\u767B\u5F55? -dataSource_users_field_name = \u7528\u6237\u540D -dataSource_users_field_password = \u5BC6\u7801 -dataSource_users_field_passwordVerify = \u786E\u8BA4\u5BC6\u7801 -dataSource_users_field_phoneNumber = \u7535\u8BDD\u53F7\u7801 -dataSource_users_invalidEmailAddress = \u90AE\u7BB1\u5730\u5740\u65E0\u6548. -dataSource_users_passwordsDoNotMatch = \u5BC6\u7801\u4E0D\u5339\u914D. -datasource_roles_field_ldapGroups = LDAP\u7EC4 +dataSource_users_field_lastName = \u59d3 +dataSource_users_field_ldap = LDAP\u767b\u5f55? +dataSource_users_field_name = \u7528\u6237\u540d +dataSource_users_field_password = \u5bc6\u7801 +dataSource_users_field_passwordVerify = \u786e\u8ba4\u5bc6\u7801 +dataSource_users_field_phoneNumber = \u7535\u8bdd\u53f7\u7801 +dataSource_users_invalidEmailAddress = \u90ae\u7bb1\u5730\u5740\u65e0\u6548. +dataSource_users_passwordsDoNotMatch = \u5bc6\u7801\u4e0d\u5339\u914d. +datasource_roles_field_ldapGroups = LDAP\u7ec4 datasource_roles_field_permissions = \u6743\u9650 -datasource_roles_field_resourceGroups = \u8D44\u6E90\u7EC4 +datasource_roles_field_resourceGroups = \u8d44\u6e90\u7ec4 datasource_roles_field_subjects = Subjects -datasource_templateSchedules_disabled = \u7981\u7528\u9009\u62E9\u7684\u6307\u6807[{0}]\u91C7\u96C6. +datasource_templateSchedules_disabled = \u7981\u7528\u9009\u62e9\u7684\u6307\u6807[{0}]\u91c7\u96c6. datasource_templateSchedules_disabled_detailed = Disabled collection of metric [{0}] [{1}] by default for ResourceType with id [{2}]. datasource_templateSchedules_disabled_failed = Failed to disable collection of metric [{0}] [{1}] by default for ResourceType with id [{2}]. -datasource_templateSchedules_enabled = Enabled collection of selected metric [{0}]. +datasource_templateSchedules_enabled = \u542f\u7528\u9009\u62e9\u7684\u6307\u6807\u96c6 [{0}]. datasource_templateSchedules_enabled_detailed = Enabled collection of metric [{0}] [{1}] by default for ResourceType with id [{2}]. datasource_templateSchedules_enabled_failed = Failed to enable collection of metric [{0}] [{1}] by default for ResourceType with id [{2}]. datasource_templateSchedules_updated = Updated collection intervals of selected metric [{0}]. datasource_templateSchedules_updated_detail = Collection interval for metric [{0}] [{1}] by default for ResourceType with id [{2}] set to [{3}] seconds. datasource_templateSchedules_updated_failed = Failed to set collection interval to [{0}] seconds for metric [{1}] [{2}] by default for ResourceType with id [{3}]. -favorites = \u6536\u85CF\u5939 -favorites_groups = \u7EC4\u6536\u85CF\u5939 -favorites_recentlyViewed = \u6700\u8FD1\u67E5\u770B -favorites_resources = \u8D44\u6E90\u6536\u85CF\u5939 -group_tree_partialClusterTooltip = \u9664\u53BB {1},{0}\u7684\u7EC4\u6210\u5458\u62E5\u6709 \u4E00\u4E2A''{2}''\u8D44\u6E90 +favorites = \u6536\u85cf\u5939 +favorites_groups = \u7ec4\u6536\u85cf\u5939 +favorites_recentlyViewed = \u6700\u8fd1\u67e5\u770b +favorites_resources = \u8d44\u6e90\u6536\u85cf\u5939 +group_tree_partialClusterTooltip = \u9664\u53bb {1},{0}\u7684\u7ec4\u6210\u5458\u62e5\u6709 \u4e00\u4e2a''{2}''\u8d44\u6e90 util_ancestry_parentAncestry = Parent Ancestry for: -util_errorHandler_nullException = exception was null -util_monitoringRequestCallback_error_checkServerStatusFailure = \u65E0\u6CD5\u786E\u5B9A\u767B\u5F55\u72B6\u6001- \u68C0\u67E5\u670D\u52A1\u5668\u72B6\u6001. -util_rpcManager_activeRequests = {0}\u6FC0\u6D3B\u7684\u8BF7\u6C42 -util_userPerm_loadFailGlobal = \u65E0\u6CD5\u8F7D\u5165\u5168\u5C40\u6743\u9650- \u672A\u6388\u6743. -util_userPerm_loadFailGroup = \u65E0\u6CD5\u8BBF\u95EE\u8D44\u6E90\u7EC4[{0}] - \u672A\u6388\u6743. -util_userPerm_loadFailResource = \u65E0\u6CD5\u8BBF\u95EE\u8D44\u6E90[{0}] - \u672A\u6388\u6743. -util_userSession_loadFailSubject = UserSessionManager: \u52A0\u8F7D\u7528\u6237\u4E3B\u9898\u5931\u8D25 -util_userSession_logoutFail = \u6CE8\u9500\u5931\u8D25. -util_widgetsField_unlimited = \u65E0\u9650\u5236 +util_errorHandler_nullException = \u5f02\u5e38\u662f null +util_monitoringRequestCallback_error_checkServerStatusFailure = \u65e0\u6cd5\u786e\u5b9a\u767b\u5f55\u72b6\u6001- \u68c0\u67e5\u670d\u52a1\u5668\u72b6\u6001. +util_rpcManager_activeRequests = {0}\u6fc0\u6d3b\u7684\u8bf7\u6c42 +util_userPerm_loadFailGlobal = \u65e0\u6cd5\u8f7d\u5165\u5168\u5c40\u6743\u9650- \u672a\u6388\u6743. +util_userPerm_loadFailGroup = \u65e0\u6cd5\u8bbf\u95ee\u8d44\u6e90\u7ec4[{0}] - \u672a\u6388\u6743. +util_userPerm_loadFailResource = \u65e0\u6cd5\u8bbf\u95ee\u8d44\u6e90[{0}] - \u672a\u6388\u6743. +util_userSession_loadFailSubject = UserSessionManager: \u52a0\u8f7d\u7528\u6237\u4e3b\u9898\u5931\u8d25 +util_userSession_logoutFail = \u6ce8\u9500\u5931\u8d25. +util_widgetsField_unlimited = \u65e0\u9650\u5236 view_aboutBox_allRightsReserved = All Rights Reserved. -view_aboutBox_buildNumber = \u4EA7\u54C1\u7F16\u8BD1\u53F7: -view_aboutBox_failedToLoad = \u52A0\u8F7D\u4EA7\u54C1\u4FE1\u606F\u5931\u8D25. -view_aboutBox_homepage = \u4E3B\u9875 +view_aboutBox_buildNumber = \u4ea7\u54c1\u7f16\u8bd1\u53f7: +view_aboutBox_failedToLoad = \u52a0\u8f7d\u4ea7\u54c1\u4fe1\u606f\u5931\u8d25. +view_aboutBox_homepage = \u4e3b\u9875 view_aboutBox_jbossByRedHat = JBoss by Red Hat -view_aboutBox_title = \u5173\u4E8E {0} -view_aboutBox_version = \u7248\u672C: -view_adminConfig_downloads = \u4E0B\u8F7D -view_adminConfig_plugins = \u63D2\u4EF6 -view_adminConfig_systemSettings = \u7CFB\u7EDF\u8BBE\u7F6E -view_adminConfig_templates = \u6A21\u677F -view_adminContent_contentSources = Content\u6E90 -view_adminContent_repositories = \u5E93 -view_adminRoles_assignedGroups = \u5206\u914D\u7684\u8D44\u6E90\u7EC4 -view_adminRoles_assignedSubjects = \u5206\u914D\u7684\u4E3B\u9898 -view_adminRoles_failLdap = \u65E0\u6CD5\u786E\u5B9ALDAP - \u5047\u5B9A\u6CA1\u6709LDAP. -view_adminRoles_failLdapGroups = \u67E5\u8BE2\u6709\u6548LDAP\u7EC4\u5931\u8D25 - \u5047\u5B9A\u65E0DAP\u7EC4. -view_adminRoles_failLdapGroupsRole = \u52A0\u8F7DLDAP\u7EC4\u89D2\u8272\u5931\u8D25. -view_adminRoles_failRoles = \u53D6\u5F97\u89D2\u8272\u5931\u8D25. -view_adminRoles_globalPerms = \u5168\u5C40\u6388\u6743 -view_adminRoles_ldapGroups = LDAP\u7EC4 -view_adminRoles_ldapGroupsReadOnly = LDAP\u7EC4\u6570\u636E\u4E3A\u53EA\u8BFB -view_adminRoles_noItems = \u6CA1\u6709\u6761\u76EE\u663E\u793A -view_adminRoles_noLdap = \u6CA1\u6709\u96C6\u6210LDAP\u5B89\u5168, \u5230<a {0}>{1}</a>. +view_aboutBox_title = \u5173\u4e8e {0} +view_aboutBox_version = \u7248\u672c: +view_adminConfig_downloads = \u4e0b\u8f7d +view_adminConfig_plugins = \u63d2\u4ef6 +view_adminConfig_systemSettings = \u7cfb\u7edf\u8bbe\u7f6e +view_adminConfig_templates = \u6a21\u677f +view_adminContent_contentSources = Content\u6e90 +view_adminContent_repositories = \u5e93 +view_adminRoles_assignedGroups = \u5206\u914d\u7684\u8d44\u6e90\u7ec4 +view_adminRoles_assignedSubjects = \u5206\u914d\u7684\u4e3b\u9898 +view_adminRoles_failLdap = \u65e0\u6cd5\u786e\u5b9aLDAP - \u5047\u5b9a\u6ca1\u6709LDAP. +view_adminRoles_failLdapGroups = \u67e5\u8be2\u6709\u6548LDAP\u7ec4\u5931\u8d25 - \u5047\u5b9a\u65e0DAP\u7ec4. +view_adminRoles_failLdapGroupsRole = \u52a0\u8f7dLDAP\u7ec4\u89d2\u8272\u5931\u8d25. +view_adminRoles_failRoles = \u53d6\u5f97\u89d2\u8272\u5931\u8d25. +view_adminRoles_globalPerms = \u5168\u5c40\u6388\u6743 +view_adminRoles_ldapGroups = LDAP\u7ec4 +view_adminRoles_ldapGroupsReadOnly = LDAP\u7ec4\u6570\u636e\u4e3a\u53ea\u8bfb +view_adminRoles_noItems = \u6ca1\u6709\u6761\u76ee\u663e\u793a +view_adminRoles_noLdap = \u6ca1\u6709\u96c6\u6210LDAP\u5b89\u5168, \u5230<a {0}>{1}</a>. view_adminRoles_permissions_autoselecting_configureRead_implied = Autodeselected CONFIGURE_WRITE permission, since lack of CONFIGURE_READ implies lack of it... view_adminRoles_permissions_autoselecting_configureWrite_implied = Autoselected CONFIGURE_READ permission, since CONFIGURE_WRITE implies it... view_adminRoles_permissions_autoselecting_manageInventory_implied = Autoselected unselected Resource permissions, since MANAGE_INVENTORY implies all Resource permissions... view_adminRoles_permissions_autoselecting_manageSecurity_implied = Autoselected unselected permissions, since MANAGE_SECURITY implies all other permissions... -view_adminRoles_permissions_globalPermissions = \u5168\u5C40\u6388\u6743 +view_adminRoles_permissions_globalPermissions = \u5168\u5c40\u6388\u6743 view_adminRoles_permissions_illegalDeselectionDueToCorrespondingWritePermSelection = {0} read permission cannot be deselected, unless the {0} write permission, which implies the read permission, is deselected first. view_adminRoles_permissions_illegalDeselectionDueToManageInventorySelection = {0} permission cannot be deselected, unless Manage Inventory, which implies all Resource permissions, is deselected first. view_adminRoles_permissions_illegalDeselectionDueToManageSecuritySelection = {0} permission cannot be deselected, unless the Manage Security permission, which implies all other permissions, is deselected first. view_adminRoles_permissions_isAuthorized = \u6388\u6743? -view_adminRoles_permissions_isRead = \u8BFB? +view_adminRoles_permissions_isRead = \u8bfb? view_adminRoles_permissions_isWrite = \u5199? -view_adminRoles_permissions_permDesc_manageBundles = \u80FD\u521B\u5EFA,\u66F4\u65B0\u6216\u8005\u5220\u9664\u63D0\u4F9B\u7684bundles(\u4EFB\u4F55\u4EBA\u90FD\u80FD\u67E5\u770B) -view_adminRoles_permissions_permDesc_manageInventory = \u62E5\u6709\u6240\u6709\u8D44\u6E90\u6743\u9650, \u5982\u4E0B\u6240\u8FF0, \u5BF9\u6240\u6709\u8D44\u6E90; \u5177\u6709\u521B\u5EFA, \u66F4\u65B0, \u5220\u9664\u7EC4; \u80FD\u5BFC\u5165\u81EA\u52A8\u53D1\u73B0\u6216\u624B\u52A8\u53D1\u73B0\u7684\u8D44\u6E90 +view_adminRoles_permissions_permDesc_manageBundles = \u80fd\u521b\u5efa,\u66f4\u65b0\u6216\u8005\u5220\u9664\u63d0\u4f9b\u7684bundles(\u4efb\u4f55\u4eba\u90fd\u80fd\u67e5\u770b) +view_adminRoles_permissions_permDesc_manageInventory = \u62e5\u6709\u6240\u6709\u8d44\u6e90\u6743\u9650, \u5982\u4e0b\u6240\u8ff0, \u5bf9\u6240\u6709\u8d44\u6e90; \u5177\u6709\u521b\u5efa, \u66f4\u65b0, \u5220\u9664\u7ec4; \u80fd\u5bfc\u5165\u81ea\u52a8\u53d1\u73b0\u6216\u624b\u52a8\u53d1\u73b0\u7684\u8d44\u6e90 view_adminRoles_permissions_permDesc_manageRepositories = can create, update, or delete repositories of any user (everyone can create their own repositories), can associate content sources to repositories. -view_adminRoles_permissions_permDesc_manageSecurity = \u80FD\u521B\u5EFA,\u66F4\u65B0,\u6216\u5220\u9664\u7528\u6237\u548C\u89D2\u8272 (\u4EFB\u4F55\u4EBA\u90FD\u6709\u67E5\u770B\u6743\u9650) -view_adminRoles_permissions_permDesc_manageSettings = \u80FD\u4FEE\u6539RHQ\u670D\u52A1\u5668\u914D\u7F6E\u800C\u4E14\u80FD\u64CD\u4F5C\u4EFB\u4F55\u76F8\u5173\u7684\u670D\u52A1\u5668\u529F\u80FD -view_adminRoles_permissions_permReadDesc_configure = \u67E5\u770B\u8D44\u6E90\u914D\u7F6E\u548C\u8D44\u6E90\u914D\u7F6E\u4FEE\u8BA2\u5386\u53F2 -view_adminRoles_permissions_permReadDesc_control = (IMPLIED) \u67E5\u770B\u53EF\u7528\u64CD\u4F5C\u548C\u64CD\u4F5C\u6267\u884C\u5386\u53F2 -view_adminRoles_permissions_permReadDesc_createChildResources = (IMPLIED) \u67E5\u770B\u5B50\u8D44\u6E90\u521B\u5EFA\u5386\u53F2 -view_adminRoles_permissions_permReadDesc_deleteChildResources = (IMPLIED) \u67E5\u770B\u5B50\u8D44\u6E90\u5220\u9664\u5386\u53F2 +view_adminRoles_permissions_permDesc_manageSecurity = \u80fd\u521b\u5efa,\u66f4\u65b0,\u6216\u5220\u9664\u7528\u6237\u548c\u89d2\u8272 (\u4efb\u4f55\u4eba\u90fd\u6709\u67e5\u770b\u6743\u9650) +view_adminRoles_permissions_permDesc_manageSettings = \u80fd\u4fee\u6539RHQ\u670d\u52a1\u5668\u914d\u7f6e\u800c\u4e14\u80fd\u64cd\u4f5c\u4efb\u4f55\u76f8\u5173\u7684\u670d\u52a1\u5668\u529f\u80fd +view_adminRoles_permissions_permReadDesc_configure = \u67e5\u770b\u8d44\u6e90\u914d\u7f6e\u548c\u8d44\u6e90\u914d\u7f6e\u4fee\u8ba2\u5386\u53f2 +view_adminRoles_permissions_permReadDesc_control = (IMPLIED) \u67e5\u770b\u53ef\u7528\u64cd\u4f5c\u548c\u64cd\u4f5c\u6267\u884c\u5386\u53f2 +view_adminRoles_permissions_permReadDesc_createChildResources = (IMPLIED) \u67e5\u770b\u5b50\u8d44\u6e90\u521b\u5efa\u5386\u53f2 +view_adminRoles_permissions_permReadDesc_deleteChildResources = (IMPLIED) \u67e5\u770b\u5b50\u8d44\u6e90\u5220\u9664\u5386\u53f2 view_adminRoles_permissions_permReadDesc_inventory = (IMPLIED) view Resource properties (name, description, version, etc.), connection settings, and connection settings history -view_adminRoles_permissions_permReadDesc_manageAlerts = (IMPLIED) \u67E5\u770B\u544A\u8B66\u5B9A\u4E49\u548C\u544A\u8B66\u5386\u53F2 -view_adminRoles_permissions_permReadDesc_manageContent = (IMPLIED) \u67E5\u770B\u5B89\u88C5\u7684\u548C\u53EF\u7528\u7684\u5305; \u67E5\u770B\u5305\u5B89\u88C5\u5386\u53F2 -view_adminRoles_permissions_permReadDesc_manageEvents = (IMPLIED)\u67E5\u770B\u4E8B\u4EF6 +view_adminRoles_permissions_permReadDesc_manageAlerts = (IMPLIED) \u67e5\u770b\u544a\u8b66\u5b9a\u4e49\u548c\u544a\u8b66\u5386\u53f2 +view_adminRoles_permissions_permReadDesc_manageContent = (IMPLIED) \u67e5\u770b\u5b89\u88c5\u7684\u548c\u53ef\u7528\u7684\u5305; \u67e5\u770b\u5305\u5b89\u88c5\u5386\u53f2 +view_adminRoles_permissions_permReadDesc_manageEvents = (IMPLIED)\u67e5\u770b\u4e8b\u4ef6 view_adminRoles_permissions_permReadDesc_manageMeasurements = (IMPLIED) view metric data and collection schedules -view_adminRoles_permissions_permWriteDesc_configure = \u66F4\u65B0\u8D44\u6E90\u914D\u7F6E; delete Resource configuration revision history items -view_adminRoles_permissions_permWriteDesc_control = \u6267\u884C\u64CD\u4F5C; \u5220\u9664\u64CD\u4F5C\u6267\u884C\u5386\u53F2 -view_adminRoles_permissions_permWriteDesc_createChildResources = \u521B\u5EFA\u65B0\u7684\u5B50\u8D44\u6E90 (for child Resources of types that are creatable) +view_adminRoles_permissions_permWriteDesc_configure = \u66f4\u65b0\u8d44\u6e90\u914d\u7f6e; \u5220\u9664\u8d44\u6e90\u914d\u7f6e\u4fee\u8ba2\u7684\u5386\u53f2\u9879 +view_adminRoles_permissions_permWriteDesc_control = \u6267\u884c\u64cd\u4f5c; \u5220\u9664\u64cd\u4f5c\u6267\u884c\u5386\u53f2 +view_adminRoles_permissions_permWriteDesc_createChildResources = \u521b\u5efa\u65b0\u7684\u5b50\u8d44\u6e90 (for child Resources of types that are creatable) view_adminRoles_permissions_permWriteDesc_deleteChildResources = uninventory resources; delete Resources (for Resources of types that are deletable) -view_adminRoles_permissions_permWriteDesc_inventory = update Resource name, version, description, and connection settings; delete connection settings history items -view_adminRoles_permissions_permWriteDesc_manageAlerts = create, update, and delete alert definitions; acknowledge and delete alert history items -view_adminRoles_permissions_permWriteDesc_manageContent = subscribe to content sources; install and uninstall packages -view_adminRoles_permissions_permWriteDesc_manageEvents = \u5220\u9664\u4E8B\u4EF6 -view_adminRoles_permissions_permWriteDesc_manageMeasurements = update metric collection schedules -view_adminRoles_permissions_perm_configure = \u914D\u7F6E -view_adminRoles_permissions_perm_control = \u63A7\u5236 -view_adminRoles_permissions_perm_createChildResources = \u521B\u5EFA\u5B50\u8D44\u6E90 -view_adminRoles_permissions_perm_deleteChildResources = \u5220\u9664\u5B50\u8D44\u6E90 -view_adminRoles_permissions_perm_inventory = \u6E05\u5355 -view_adminRoles_permissions_perm_manageAlerts = \u7BA1\u7406\u544A\u8B66 -view_adminRoles_permissions_perm_manageBundles = \u7BA1\u7406Bundles -view_adminRoles_permissions_perm_manageContent = \u7BA1\u7406Content -view_adminRoles_permissions_perm_manageEvents = \u7BA1\u7406\u4E8B\u4EF6 -view_adminRoles_permissions_perm_manageInventory = \u7BA1\u7406\u6E05\u5355 -view_adminRoles_permissions_perm_manageMeasurements = \u7BA1\u7406\u6307\u6807 -view_adminRoles_permissions_perm_manageRepositories = \u7BA1\u7406\u5E93 -view_adminRoles_permissions_perm_manageSecurity = \u7BA1\u7406\u6743\u9650 -view_adminRoles_permissions_perm_manageSettings = \u7BA1\u7406\u914D\u7F6E -view_adminRoles_permissions_read = \u8BFB: -view_adminRoles_permissions_readAccessImplied = \u9ED8\u8BA4\u6709\u8BBF\u95EE{0}\u7684\u6743\u9650\u800C\u4E14\u65E0\u6CD5\u7981\u7528. -view_adminRoles_permissions_resourcePermissions = \u8D44\u6E90\u6388\u6743 +view_adminRoles_permissions_permWriteDesc_inventory = \u66f4\u65b0\u8d44\u6e90\u540d, \u7248\u672c,\u63cf\u8ff0, \u548c\u8fde\u63a5\u8bbe\u7f6e; \u5220\u9664\u8fde\u63a5\u8bbe\u7f6e\u5386\u53f2\u9879 +view_adminRoles_permissions_permWriteDesc_manageAlerts = \u521b\u5efa, \u66f4\u65b0, \u548c\u5220\u9664\u544a\u8b66\u5b9a\u4e49; \u786e\u8ba4\u548c\u5220\u9664\u5386\u53f2\u544a\u8b66\u9879 +view_adminRoles_permissions_permWriteDesc_manageContent = \u8ba2\u9605\u5185\u5bb9\u6e90; \u5b89\u88c5\u5378\u8f7d\u5305 +view_adminRoles_permissions_permWriteDesc_manageEvents = \u5220\u9664\u4e8b\u4ef6 +view_adminRoles_permissions_permWriteDesc_manageMeasurements = \u66f4\u65b0\u6307\u6807\u96c6\u8ba1\u5212\u4efb\u52a1 +view_adminRoles_permissions_perm_configure = \u914d\u7f6e +view_adminRoles_permissions_perm_control = \u63a7\u5236 +view_adminRoles_permissions_perm_createChildResources = \u521b\u5efa\u5b50\u8d44\u6e90 +view_adminRoles_permissions_perm_deleteChildResources = \u5220\u9664\u5b50\u8d44\u6e90 +view_adminRoles_permissions_perm_inventory = \u6e05\u5355 +view_adminRoles_permissions_perm_manageAlerts = \u7ba1\u7406\u544a\u8b66 +view_adminRoles_permissions_perm_manageBundles = \u7ba1\u7406Bundles +view_adminRoles_permissions_perm_manageContent = \u7ba1\u7406\u5185\u5bb9 +view_adminRoles_permissions_perm_manageEvents = \u7ba1\u7406\u4e8b\u4ef6 +view_adminRoles_permissions_perm_manageInventory = \u7ba1\u7406\u6e05\u5355 +view_adminRoles_permissions_perm_manageMeasurements = \u7ba1\u7406\u6307\u6807 +view_adminRoles_permissions_perm_manageRepositories = \u7ba1\u7406\u5e93 +view_adminRoles_permissions_perm_manageSecurity = \u7ba1\u7406\u6743\u9650 +view_adminRoles_permissions_perm_manageSettings = \u7ba1\u7406\u914d\u7f6e +view_adminRoles_permissions_read = \u8bfb: +view_adminRoles_permissions_readAccessImplied = \u9ed8\u8ba4\u6709\u8bbf\u95ee{0}\u7684\u6743\u9650\u800c\u4e14\u65e0\u6cd5\u7981\u7528. +view_adminRoles_permissions_resourcePermissions = \u8d44\u6e90\u6388\u6743 view_adminRoles_permissions_write = \u5199: view_adminRoles_perms = \u6743\u9650 -view_adminRoles_resourcePerms = \u8D44\u6E90\u6388\u6743 -view_adminRoles_roleAdded = \u89D2\u8272[{0}]\u6DFB\u52A0. -view_adminRoles_roleDeleteFailed = \u5220\u9664\u89D2\u8272[{0}]\u5931\u8D25. -view_adminRoles_roleDeleted = \u89D2\u8272[{0}]\u5220\u9664. -view_adminRoles_roleUpdateFailed = \u4FEE\u6539\u89D2\u8272[{0}]\u5931\u8D25. -view_adminRoles_roleUpdated = \u89D2\u8272[{0}]\u66F4\u65B0\u4E86. -view_adminSecurity_roles = \u89D2\u8272 +view_adminRoles_resourcePerms = \u8d44\u6e90\u6388\u6743 +view_adminRoles_roleAdded = \u89d2\u8272[{0}]\u6dfb\u52a0. +view_adminRoles_roleDeleteFailed = \u5220\u9664\u89d2\u8272[{0}]\u5931\u8d25. +view_adminRoles_roleDeleted = \u89d2\u8272[{0}]\u5220\u9664. +view_adminRoles_roleUpdateFailed = \u4fee\u6539\u89d2\u8272[{0}]\u5931\u8d25. +view_adminRoles_roleUpdated = \u89d2\u8272[{0}]\u66f4\u65b0\u4e86. +view_adminSecurity_roles = \u89d2\u8272 view_adminSecurity_users = \u7528\u6237 -view_adminTemplates_disabledAlertTemplates = \u7981\u7528\u544A\u8B66\u6A21\u677F -view_adminTemplates_disabledMetricTemplates = \u7981\u7528\u6307\u6807\u6A21\u677F -view_adminTemplates_editAlertTemplate = \u7F16\u8F91\u544A\u8B66\u6A21\u677F -view_adminTemplates_editMetricTemplate = \u7F16\u8F91\u6307\u6807\u6A21\u677F -view_adminTemplates_enabledAlertTemplates = \u542F\u7528\u544A\u8B66\u6A21\u677F -view_adminTemplates_enabledMetricTemplates = \u542F\u7528\u6307\u6807\u6A21\u677F -view_adminTemplates_platformServices = \u5E73\u53F0\u670D\u52A1 -view_adminTemplates_platforms = \u5E73\u53F0 -view_adminTemplates_prompt_disabledAlertTemplates = \u8FD9\u79CD\u8D44\u6E90\u7C7B\u578B\u521B\u5EFA\u800C\u7981\u7528\u7684\u544A\u8B66\u6A21\u677F\u6570 -view_adminTemplates_prompt_disabledMetricTemplates = Number of metric schedules that are disabled by default on this resource type -view_adminTemplates_prompt_enabledAlertTemplates = \u8FD9\u79CD\u8D44\u6E90\u7C7B\u578B\u542F\u7528\u7684\u544A\u8B66\u6A21\u677F\u6570 -view_adminTemplates_prompt_enabledMetricTemplates = Number of metric schedules that are enabled by default on this resource type -view_adminTemplates_servers = \u670D\u52A1\u5668 -view_adminTopology_affinityGroups = \u76F8\u5173\u7EC4 -view_adminTopology_agents = \u4EE3\u7406 -view_adminTopology_partitionEvents = Partition\u4E8B\u4EF6 -view_adminTopology_remoteAgentInstall = \u8FDC\u7A0B\u4EE3\u7406\u5B89\u88C5 -view_adminTopology_servers = \u670D\u52A1\u5668 +view_adminTemplates_disabledAlertTemplates = \u7981\u7528\u544a\u8b66\u6a21\u677f +view_adminTemplates_disabledMetricTemplates = \u7981\u7528\u6307\u6807\u6a21\u677f +view_adminTemplates_editAlertTemplate = \u7f16\u8f91\u544a\u8b66\u6a21\u677f +view_adminTemplates_editMetricTemplate = \u7f16\u8f91\u6307\u6807\u6a21\u677f +view_adminTemplates_enabledAlertTemplates = \u542f\u7528\u544a\u8b66\u6a21\u677f +view_adminTemplates_enabledMetricTemplates = \u542f\u7528\u6307\u6807\u6a21\u677f +view_adminTemplates_platformServices = \u5e73\u53f0\u670d\u52a1 +view_adminTemplates_platforms = \u5e73\u53f0 +view_adminTemplates_prompt_disabledAlertTemplates = \u8fd9\u79cd\u8d44\u6e90\u7c7b\u578b\u521b\u5efa\u800c\u7981\u7528\u7684\u544a\u8b66\u6a21\u677f\u6570 +view_adminTemplates_prompt_disabledMetricTemplates = \u8fd9\u4e2a\u7c7b\u578b\u7684\u8d44\u6e90\u8bb8\u591a\u6307\u6807\u4efb\u52a1\u9ed8\u8ba4\u88ab\u7981\u7528 +view_adminTemplates_prompt_enabledAlertTemplates = \u8fd9\u79cd\u8d44\u6e90\u7c7b\u578b\u542f\u7528\u7684\u544a\u8b66\u6a21\u677f\u6570 +view_adminTemplates_prompt_enabledMetricTemplates = \u8fd9\u4e2a\u7c7b\u578b\u7684\u8d44\u6e90\u8bb8\u591a\u6307\u6807\u4efb\u52a1\u9ed8\u8ba4\u88ab\u542f\u7528 +view_adminTemplates_servers = \u670d\u52a1\u5668 +view_adminTopology_affinityGroups = \u76f8\u5173\u7ec4 +view_adminTopology_agents = \u4ee3\u7406 +view_adminTopology_partitionEvents = Partition\u4e8b\u4ef6 +view_adminTopology_remoteAgentInstall = \u8fdc\u7a0b\u4ee3\u7406\u5b89\u88c5 +view_adminTopology_servers = \u670d\u52a1\u5668 view_adminUsersDetails_dataTypeName = user view_adminUsersList_dataTypeName = user view_adminUsersList_dataTypeNamePlural = users -view_admin_administration = \u7BA1\u7406 -view_admin_configuration = \u914D\u7F6E +view_admin_administration = \u7ba1\u7406 +view_admin_configuration = \u914d\u7f6e view_admin_content = Content -view_admin_downloads_agentDownload = \u4EE3\u7406\u4E0B\u8F7D -view_admin_downloads_agent_buildNumber = \u4EE3\u7406Build -view_admin_downloads_agent_help = \u8FD9\u662FRHQ Agent\u66F4\u65B0\u7684\u4E8C\u8FDB\u5236jar\u6587\u4EF6. The purpose of this jar file is to allow you to install a fresh agent on a machine where an agent does not yet exist and to allow you to update an agent that is already installed on a machine. For more details, run this agent download jar with the --help command line option: java -jar <agent-download.jar> --help <h3>\u4EE3\u7406\u5B89\u88C5</h3> java -jar <agent-download.jar> --install[=<new agent directory>] This command will install a new agent. If you do not specify the new agent directory, the default will be "." <h3>\u4EE3\u7406\u66F4\u65B0</h3> java -jar <agent-download.jar> --update[=<old agent home>] This will update an existing agent that was already installed. If you do not specify the directory where the old, existing agent was installed, it will assumed to be "rhq-agent". -view_admin_downloads_agent_link_label = Link -view_admin_downloads_agent_link_value = \u4E0B\u8F7D\u4EE3\u7406 {0} ({1}) -view_admin_downloads_agent_loadError = \u65E0\u6CD5\u83B7\u5F97\u4EE3\u7406\u7248\u672C\u4FE1\u606F -view_admin_downloads_agent_md5 = \u4EE3\u7406MD5 -view_admin_downloads_agent_version = \u4EE3\u7406\u7248\u672C -view_admin_downloads_bundleDownload = Bundle\u90E8\u7F72\u5668\u4E0B\u8F7D +view_admin_downloads_agentDownload = \u4ee3\u7406\u4e0b\u8f7d +view_admin_downloads_agent_buildNumber = \u4ee3\u7406Build +view_admin_downloads_agent_help = \u8fd9\u662fRHQ Agent\u66f4\u65b0\u7684\u4e8c\u8fdb\u5236jar\u6587\u4ef6. The purpose of this jar file is to allow you to install a fresh agent on a machine where an agent does not yet exist and to allow you to update an agent that is already installed on a machine. For more details, run this agent download jar with the --help command line option: java -jar <agent-download.jar> --help <h3>\u4ee3\u7406\u5b89\u88c5</h3> java -jar <agent-download.jar> --install[=<new agent directory>] This command will install a new agent. If you do not specify the new agent directory, the default will be "." <h3>\u4ee3\u7406\u66f4\u65b0</h3> java -jar <agent-download.jar> --update[=<old agent home>] This will update an existing agent that was already installed. If you do not specify the directory where the old, existing agent was installed, it will assumed to be "rhq-agent". +view_admin_downloads_agent_link_label = \u94fe\u63a5 +view_admin_downloads_agent_link_value = \u4e0b\u8f7d\u4ee3\u7406 {0} ({1}) +view_admin_downloads_agent_loadError = \u65e0\u6cd5\u83b7\u5f97\u4ee3\u7406\u7248\u672c\u4fe1\u606f +view_admin_downloads_agent_md5 = \u4ee3\u7406MD5 +view_admin_downloads_agent_version = \u4ee3\u7406\u7248\u672c +view_admin_downloads_bundleDownload = Bundle\u90e8\u7f72\u5668\u4e0b\u8f7d view_admin_downloads_bundle_help = This is the Bundle Deployer tool. It is for use by developers and packagers of RHQ bundles. This standalone tool allows you to test your bundles and their recipes from a console. -view_admin_downloads_bundle_link_label = Link +view_admin_downloads_bundle_link_label = \u94fe\u63a5 view_admin_downloads_bundle_link_value = Download Bundle Deployer {0} view_admin_downloads_bundle_loadError = Cannot get bundle deployer info -view_admin_downloads_cliDownload = \u547D\u4EE4\u884C\u5BA2\u6237\u7AEF\u4E0B\u8F7D +view_admin_downloads_cliDownload = \u547d\u4ee4\u884c\u5ba2\u6237\u7aef\u4e0b\u8f7d view_admin_downloads_cli_buildNumber = CLI Build view_admin_downloads_cli_help = This is the Command Line Client tool, otherwise known as the CLI. It is a standalone tool that runs from within a console and provides a command line interface to the RHQ Server. You can invoke commands via the CLI as well as run scripts to perform automated tasks. See the documentation for more information on how to install and use the CLI. -view_admin_downloads_cli_link_label = Link -view_admin_downloads_cli_link_value = \u4E0B\u8F7DCLI {0} ({1}) -view_admin_downloads_cli_loadError = \u65E0\u6CD5\u83B7\u5F97CLI\u7248\u672C\u4FE1\u606F +view_admin_downloads_cli_link_label = \u94fe\u63a5 +view_admin_downloads_cli_link_value = \u4e0b\u8f7dCLI {0} ({1}) +view_admin_downloads_cli_loadError = \u65e0\u6cd5\u83b7\u5f97CLI\u7248\u672c\u4fe1\u606f view_admin_downloads_cli_md5 = CLI MD5 -view_admin_downloads_cli_version = CLI\u7248\u672C -view_admin_downloads_connectorsDownload = \u8FDE\u63A5\u5668\u4E0B\u8F7D +view_admin_downloads_cli_version = CLI\u7248\u672c +view_admin_downloads_connectorsDownload = \u8fde\u63a5\u5668\u4e0b\u8f7d view_admin_downloads_connectors_help = Connectors are software that is needed in order for some products to be manageable by RHQ. You install connectors into some managed products so RHQ agents can talk to them. See the documentation for more information. -view_admin_downloads_connectors_loadError = Cannot get connectors info -view_admin_downloads_connectors_none = No connectors are available for download -view_admin_landing = \u8FD9\u91CC\u4F60\u53EF\u4EE5\u7BA1\u7406RHQ\u5168\u5C40\u914D\u7F6E.\u5305\u62EC\u914D\u7F6E\u5B89\u5168,\u5B89\u88C5\u63D2\u4EF6,\u7BA1\u7406RHQ\u670D\u52A1\u5668\u548C\u4EE3\u7406. -view_admin_measTemplates_title = Template Metric Collection Schedules -view_admin_measTemplates_updateExisting_title = \u66F4\u65B0\u5B58\u5728\u7684\u8BA1\u5212\u4EFB\u52A1 +view_admin_downloads_connectors_loadError = \u65e0\u6cd5\u83b7\u5f97\u8fde\u63a5\u5668\u4fe1\u606f +view_admin_downloads_connectors_none = \u6ca1\u6709\u53ef\u7528\u8fde\u63a5\u5668\u4e0b\u8f7d +view_admin_landing = \u8fd9\u91cc\u4f60\u53ef\u4ee5\u7ba1\u7406RHQ\u5168\u5c40\u914d\u7f6e.\u5305\u62ec\u914d\u7f6e\u5b89\u5168,\u5b89\u88c5\u63d2\u4ef6,\u7ba1\u7406RHQ\u670d\u52a1\u5668\u548c\u4ee3\u7406. +view_admin_measTemplates_title = \u6a21\u677f\u6307\u6807\u96c6\u8ba1\u5212\u4efb\u52a1 +view_admin_measTemplates_updateExisting_title = \u66f4\u65b0\u5b58\u5728\u7684\u8ba1\u5212\u4efb\u52a1 view_admin_measTemplates_updateExisting_tooltip = Check this box to update the collection schedules for the selected metrics on all existing resources of this type. If this is not checked, the template schedules will only be applied to new resources of this type that are added to inventory in the future. -view_admin_security = \u5B89\u5168 +view_admin_security = \u5b89\u5168 view_admin_systemSettings_AgentMaxQuietTimeAllowed_desc = If this amount of time passes without hearing from an agent, that quiet agent will be considered down. This value is specified in minutes. -view_admin_systemSettings_AgentMaxQuietTimeAllowed_name = Agent Max Quiet Time Allowed +view_admin_systemSettings_AgentMaxQuietTimeAllowed_name = \u4ee3\u7406\u6700\u591a\u5141\u8bb8\u9759\u9ed8\u65f6\u95f4 view_admin_systemSettings_AlertPurge_desc = How old alert history items must be before being purged from the database. This is specified in days. -view_admin_systemSettings_AlertPurge_name = Delete Alerts Older Than +view_admin_systemSettings_AlertPurge_name = \u5220\u9664\u544a\u8b66\u65e9\u4e8e view_admin_systemSettings_AvailabilityPurge_desc = How old availability data must be before being purged from the database. This is specified in days. -view_admin_systemSettings_AvailabilityPurge_name = Delete Availability Data Older Than -view_admin_systemSettings_BaseURL_desc = A URL to the server GUI, used mainly within alert email notifications. -view_admin_systemSettings_BaseURL_name = GUI Console URL +view_admin_systemSettings_AvailabilityPurge_name = \u5220\u9664\u53ef\u7528\u6027\u6570\u636e\u65e9\u4e8e +view_admin_systemSettings_BaseURL_desc = \u670d\u52a1\u5668URL, \u4e3b\u8981\u7528\u5728\u544a\u8b66\u90ae\u4ef6\u901a\u77e5. +view_admin_systemSettings_BaseURL_name = GUI\u63a7\u5236\u53f0URL view_admin_systemSettings_BaselineDataSet_desc = The amount of past measurement data that is used to determine a baseline. This is specified in days. -view_admin_systemSettings_BaselineDataSet_name = Baseline Dataset +view_admin_systemSettings_BaselineDataSet_name = Baseline\u6570\u636e\u96c6 view_admin_systemSettings_BaselineFrequency_desc = The frequency which the auto-calculation of baselines will be performed. If 0, baseline auto-calculation is disabled. This is specified in days. -view_admin_systemSettings_BaselineFrequency_name = Baseline Calculation Frequency +view_admin_systemSettings_BaselineFrequency_name = Baseline\u8ba1\u7b97\u9891\u7387 view_admin_systemSettings_DataMaintenance_desc = How often database maintenance is performed (for example, vacuuming if using Postgres). This is specified in hours. -view_admin_systemSettings_DataMaintenance_name = \u6570\u636E\u5E93\u7EF4\u62A4\u671F\u95F4 -view_admin_systemSettings_DataReindex_desc = If enabled, certain database tables will be re-indexed periodically. -view_admin_systemSettings_DataReindex_name = Reindex Data Tables Nightly +view_admin_systemSettings_DataMaintenance_name = \u6570\u636e\u5e93\u7ef4\u62a4\u671f\u95f4 +view_admin_systemSettings_DataReindex_desc = \u5982\u679c\u542f\u7528,\u67d0\u4e9b\u6570\u636e\u8868\u4f1a\u5b9a\u671f\u88ab\u7d22\u5f15. +view_admin_systemSettings_DataReindex_name = \u6bcf\u665a\u91cd\u65b0\u7d22\u5f15\u6570\u636e\u8868 view_admin_systemSettings_EnableAgentAutoUpdate_desc = Determines if the server will allow agents to auto-update themselves. You will not be able to download agent distributions from the server if this is disabled. -view_admin_systemSettings_EnableAgentAutoUpdate_name = \u542F\u7528\u4EE3\u7406\u81EA\u52A8\u5347\u7EA7 -view_admin_systemSettings_EnableDebugMode_desc = \u5982\u679C\u542F\u7528,\u670D\u52A1\u5668\u5C06\u8FDB\u5165debug\u6A21\u5F0F. -view_admin_systemSettings_EnableDebugMode_name = \u542F\u7528Debug\u6A21\u5F0F +view_admin_systemSettings_EnableAgentAutoUpdate_name = \u542f\u7528\u4ee3\u7406\u81ea\u52a8\u5347\u7ea7 +view_admin_systemSettings_EnableDebugMode_desc = \u5982\u679c\u542f\u7528,\u670d\u52a1\u5668\u5c06\u8fdb\u5165debug\u6a21\u5f0f. +view_admin_systemSettings_EnableDebugMode_name = \u542f\u7528Debug\u6a21\u5f0f view_admin_systemSettings_EnableExperimentalFeatures_desc = If enabled, any experimental features that exist in the current product will be available. -view_admin_systemSettings_EnableExperimentalFeatures_name = Enable Experimental Features +view_admin_systemSettings_EnableExperimentalFeatures_name = \u542f\u7528Experimental\u7279\u6027 view_admin_systemSettings_EventPurge_desc = How old event data must be before being purged from the database. This is specified in days. -view_admin_systemSettings_EventPurge_name = Delete Events Older Than -view_admin_systemSettings_JAASProvider_desc = Should LDAP be used to determine user identity? -view_admin_systemSettings_JAASProvider_name = \u542F\u7528LDAP +view_admin_systemSettings_EventPurge_name = \u5220\u9664\u4e8b\u4ef6\u65e9\u4e8e +view_admin_systemSettings_JAASProvider_desc = LDAP\u5e94\u8be5\u7528\u6765\u786e\u5b9a\u7528\u6237\u8eab\u4efd? +view_admin_systemSettings_JAASProvider_name = \u542f\u7528LDAP view_admin_systemSettings_LDAPBaseDN_desc = The base of the directory tree to search for usernames and passwords while authenticating users, e.g. ou=People,dc=redhat,dc=com -view_admin_systemSettings_LDAPBaseDN_name = Search Base +view_admin_systemSettings_LDAPBaseDN_name = \u57fa\u672cDN\u540d view_admin_systemSettings_LDAPBindDN_desc = The username to connect to the LDAP server when querying the LDAP user database. This is typically the full LDAP distinguished name (DN) of a manager user, e.g. cn=Manager,dc=redhat,dc=com -view_admin_systemSettings_LDAPBindDN_name = \u7528\u6237\u540D +view_admin_systemSettings_LDAPBindDN_name = \u7528\u6237\u540d view_admin_systemSettings_LDAPBindPW_desc = The credentials of the user used to connect to the LDAP server when querying the LDAP user database. -view_admin_systemSettings_LDAPBindPW_name = \u5BC6\u7801 +view_admin_systemSettings_LDAPBindPW_name = \u5bc6\u7801 view_admin_systemSettings_LDAPFilter_desc = Any additional filters to apply when doing the LDAP search. This is useful if the population to authenticate can be identified via a given LDAP property, e.g. RHQUser=true -view_admin_systemSettings_LDAPFilter_name = Search Filter +view_admin_systemSettings_LDAPFilter_name = \u641c\u7d22\u8fc7\u6ee4 view_admin_systemSettings_LDAPGroupFilter_desc = LDAP search filter that must return all LDAP groups available for authorization. This is used for LDAP group authorization. -view_admin_systemSettings_LDAPGroupFilter_name = Group Search Filter +view_admin_systemSettings_LDAPGroupFilter_name = \u7ec4\u641c\u7d22\u8fc7\u6ee4 view_admin_systemSettings_LDAPGroupMember_desc = LDAP search filter that is used in conjunction with the group search filter to determine user authorization. This is used for LDAP group authorization. -view_admin_systemSettings_LDAPGroupMember_name = Group Member Filter +view_admin_systemSettings_LDAPGroupMember_name = \u7ec4\u5458\u8fc7\u6ee4 view_admin_systemSettings_LDAPLoginProperty_desc = The LDAP property that contains the user name. Defaults to "cn". If multiple matches are found, the first entry found is used. view_admin_systemSettings_LDAPLoginProperty_name = Login Property -view_admin_systemSettings_LDAPProtocol_desc = Should communication with the LDAP server be done over SSL? +view_admin_systemSettings_LDAPProtocol_desc = \u901a\u8fc7SSL\u4e0eLDAP\u670d\u52a1\u5668\u901a\u4fe1? view_admin_systemSettings_LDAPProtocol_name = SSL -view_admin_systemSettings_LDAPUrl_desc = URL to the LDAP Server +view_admin_systemSettings_LDAPUrl_desc = LDAP\u670d\u52a1\u5668URL view_admin_systemSettings_LDAPUrl_name = LDAP URL view_admin_systemSettings_RtDataPurge_desc = How old response time data must be before being purged from the database. This is specified in days. view_admin_systemSettings_RtDataPurge_name = Delete Response Time Data Older Than view_admin_systemSettings_TraitPurge_desc = How old measurement trait data must be before being purged from the database. This is specified in days. view_admin_systemSettings_TraitPurge_name = Delete Measurement Traits Older Than -view_admin_systemSettings_cannotLoadServerDetails = \u65E0\u6CD5\u52A0\u8F7D\u670D\u52A1\u5668\u8BE6\u60C5 -view_admin_systemSettings_cannotLoadSettings = \u65E0\u6CD5\u83B7\u5F97\u5F53\u524D\u7CFB\u7EDF\u914D\u7F6E -view_admin_systemSettings_fixBeforeSaving = \u4FDD\u5B58\u524D\u8BF7\u4FEE\u590D\u9519\u8BEF -view_admin_systemSettings_group_baseline = \u81EA\u52A8Baseline\u914D\u7F6E\u5C5E\u6027 -view_admin_systemSettings_group_dataMgr = \u6570\u636E\u7BA1\u7406\u5668\u57FA\u672C\u5C5E\u6027 -view_admin_systemSettings_group_general = \u57FA\u672C\u914D\u7F6E\u5C5E\u6027 -view_admin_systemSettings_group_ldap = LDAP\u914D\u7F6E\u5C5E\u6027 -view_admin_systemSettings_saveFailure = \u4FDD\u5B58\u7CFB\u7EDF\u5C5E\u6027\u5931\u8D25 -view_admin_systemSettings_savedSettings = \u4FDD\u5B58\u7CFB\u7EDF\u5C5E\u6027\u6210\u529F -view_admin_systemSettings_serverDetails = \u670D\u52A1\u5668\u8BE6\u60C5 +view_admin_systemSettings_cannotLoadServerDetails = \u65e0\u6cd5\u52a0\u8f7d\u670d\u52a1\u5668\u8be6\u60c5 +view_admin_systemSettings_cannotLoadSettings = \u65e0\u6cd5\u83b7\u5f97\u5f53\u524d\u7cfb\u7edf\u914d\u7f6e +view_admin_systemSettings_fixBeforeSaving = \u4fdd\u5b58\u524d\u8bf7\u4fee\u590d\u9519\u8bef +view_admin_systemSettings_group_baseline = \u81ea\u52a8Baseline\u914d\u7f6e\u5c5e\u6027 +view_admin_systemSettings_group_dataMgr = \u6570\u636e\u7ba1\u7406\u5668\u57fa\u672c\u5c5e\u6027 +view_admin_systemSettings_group_general = \u57fa\u672c\u914d\u7f6e\u5c5e\u6027 +view_admin_systemSettings_group_ldap = LDAP\u914d\u7f6e\u5c5e\u6027 +view_admin_systemSettings_saveFailure = \u4fdd\u5b58\u7cfb\u7edf\u5c5e\u6027\u5931\u8d25 +view_admin_systemSettings_savedSettings = \u4fdd\u5b58\u7cfb\u7edf\u5c5e\u6027\u6210\u529f +view_admin_systemSettings_serverDetails = \u670d\u52a1\u5668\u8be6\u60c5 view_admin_systemSettings_serverDetails_buildNumber = Build Number view_admin_systemSettings_serverDetails_currentTable = Current Measurement Raw Table -view_admin_systemSettings_serverDetails_dbDriverName = \u6570\u636E\u5E93\u9A71\u52A8\u540D -view_admin_systemSettings_serverDetails_dbDriverVersion = \u6570\u636E\u5E93\u9A71\u52A8\u7248\u672C -view_admin_systemSettings_serverDetails_dbName = \u6570\u636E\u5E93\u4EA7\u54C1\u540D -view_admin_systemSettings_serverDetails_dbUrl = \u6570\u636E\u5E93\u8FDE\u63A5URL -view_admin_systemSettings_serverDetails_dbVersion = \u6570\u636E\u5E93\u7248\u672C\u4FE1\u606F -view_admin_systemSettings_serverDetails_installDir = \u670D\u52A1\u5668\u5B89\u88C5\u76EE\u5F55 +view_admin_systemSettings_serverDetails_dbDriverName = \u6570\u636e\u5e93\u9a71\u52a8\u540d +view_admin_systemSettings_serverDetails_dbDriverVersion = \u6570\u636e\u5e93\u9a71\u52a8\u7248\u672c +view_admin_systemSettings_serverDetails_dbName = \u6570\u636e\u5e93\u4ea7\u54c1\u540d +view_admin_systemSettings_serverDetails_dbUrl = \u6570\u636e\u5e93\u8fde\u63a5URL +view_admin_systemSettings_serverDetails_dbVersion = \u6570\u636e\u5e93\u7248\u672c\u4fe1\u606f +view_admin_systemSettings_serverDetails_installDir = \u670d\u52a1\u5668\u5b89\u88c5\u76ee\u5f55 view_admin_systemSettings_serverDetails_nextRotation = Next Measurement Table Rotation -view_admin_systemSettings_serverDetails_time = \u670D\u52A1\u5668\u672C\u5730\u65F6\u95F4 -view_admin_systemSettings_serverDetails_tz = \u670D\u52A1\u5668\u65F6\u533A -view_admin_topology = \u62D3\u6251 +view_admin_systemSettings_serverDetails_time = \u670d\u52a1\u5668\u672c\u5730\u65f6\u95f4 +view_admin_systemSettings_serverDetails_tz = \u670d\u52a1\u5668\u65f6\u533a +view_admin_topology = \u62d3\u6251 view_alert_common_tab_conditions = Conditions -view_alert_common_tab_conditions_expression = \u89E6\u53D1\u4E8B\u4EF6\u5F53 +view_alert_common_tab_conditions_expression = \u89e6\u53d1\u4e8b\u4ef6\u5f53 view_alert_common_tab_conditions_expression_tooltip = Determines if ANY or ALL of the conditions must evaluate to true in order for the entire condition set to be considered true. -view_alert_common_tab_conditions_modal_title = \u6DFB\u52A0\u6761\u4EF6 +view_alert_common_tab_conditions_modal_title = \u6dfb\u52a0\u6761\u4ef6 view_alert_common_tab_conditions_recovery_disabled = This alert caused its alert definition to be disabled view_alert_common_tab_conditions_recovery_enabled = Triggered ''{0}'' to be re-enabled -view_alert_common_tab_conditions_text = \u6761\u4EF6 -view_alert_common_tab_conditions_type_availability = \u53EF\u7528\u6027\u6539\u53D8 +view_alert_common_tab_conditions_text = \u6761\u4ef6 +view_alert_common_tab_conditions_type_availability = \u53ef\u7528\u6027\u6539\u53d8 view_alert_common_tab_conditions_type_availability_down = Went down view_alert_common_tab_conditions_type_availability_up = Came up -view_alert_common_tab_conditions_type_event = \u4E8B\u4EF6\u68C0\u6D4B +view_alert_common_tab_conditions_type_event = \u4e8b\u4ef6\u68c0\u6d4b view_alert_common_tab_conditions_type_event_matching = with event source matching -view_alert_common_tab_conditions_type_metric_baseline = \u6307\u6807\u57FA\u51C6 +view_alert_common_tab_conditions_type_metric_baseline = \u6307\u6807\u57fa\u51c6 view_alert_common_tab_conditions_type_metric_baseline_verb = of view_alert_common_tab_conditions_type_metric_calltime_change = Call Time Value Changes view_alert_common_tab_conditions_type_metric_calltime_change_verb = by at least @@ -612,17 +612,17 @@ view_alert_common_tab_conditions_type_metric_calltime_delta_other = Changes view_alert_common_tab_conditions_type_metric_calltime_delta_shrinks = Shrinks view_alert_common_tab_conditions_type_metric_calltime_destination = with call destination matching view_alert_common_tab_conditions_type_metric_calltime_threshold = Call Time Value Threshold -view_alert_common_tab_conditions_type_metric_change = Metric Value Change -view_alert_common_tab_conditions_type_metric_threshold = Metric Value Threshold -view_alert_common_tab_conditions_type_metric_trait_change = Trait Change -view_alert_common_tab_conditions_type_operation = \u64CD\u4F5C\u6267\u884C +view_alert_common_tab_conditions_type_metric_change = \u6307\u6807\u503c\u6539\u53d8 +view_alert_common_tab_conditions_type_metric_threshold = \u6307\u6807\u9600\u503c +view_alert_common_tab_conditions_type_metric_trait_change = \u7279\u5f81\u6539\u53d8 +view_alert_common_tab_conditions_type_operation = \u64cd\u4f5c\u6267\u884c view_alert_common_tab_conditions_type_operation_status = with result status -view_alert_common_tab_conditions_type_resource_configuration = \u8D44\u6E90\u914D\u7F6E Change +view_alert_common_tab_conditions_type_resource_configuration = \u8d44\u6e90\u914d\u7f6e Change view_alert_common_tab_conditions_value = Value view_alert_common_tab_dampening = Dampening -view_alert_common_tab_dampening_category_consecutive_count = Consecutive +view_alert_common_tab_dampening_category_consecutive_count = \u8fde\u7eed view_alert_common_tab_dampening_category_consecutive_count_tooltip = An alert is triggered once every X occurrences the condition set is true consecutively. -view_alert_common_tab_dampening_category_duration_count = Time Period +view_alert_common_tab_dampening_category_duration_count = \u65f6\u95f4\u5468\u671f view_alert_common_tab_dampening_category_duration_count_tooltip = An alert is triggered once every X occurrences the condition set is true within a given time period. view_alert_common_tab_dampening_category_none = None view_alert_common_tab_dampening_category_none_tooltip = Dampening is disabled. Every time the condition set is true, an alert will be triggered. @@ -632,37 +632,37 @@ view_alert_common_tab_dampening_consecutive_occurrences_label = Occurrences view_alert_common_tab_dampening_consecutive_occurrences_label_tooltip = The number of times the condition set must be consecutively true before the alert is triggered view_alert_common_tab_dampening_duration_occurrences_label = Occurrences view_alert_common_tab_dampening_duration_occurrences_label_tooltip = The number of times the condition set must be true during the given time period before the alert is triggered. -view_alert_common_tab_dampening_duration_period_label = \u65F6\u95F4\u6BB5 +view_alert_common_tab_dampening_duration_period_label = \u65f6\u95f4\u6bb5 view_alert_common_tab_dampening_duration_period_label_tooltip = The time span in which the condition set will be tested to see if the given number of occurrences are true. -view_alert_common_tab_dampening_partial_evalatuions_label = \u8BC4\u4F30 +view_alert_common_tab_dampening_partial_evalatuions_label = \u8bc4\u4f30 view_alert_common_tab_dampening_partial_evalatuions_label_tooltip = The total number of times the condition set will be tested to see if the given number of occurrences are true. view_alert_common_tab_dampening_partial_occurrences_label = Occurrences view_alert_common_tab_dampening_partial_occurrences_label_tooltip = The number of times the condition set must be true during the last N evaluations before the alert is triggered. -view_alert_common_tab_general = \u57FA\u672C\u5C5E\u6027 +view_alert_common_tab_general = \u57fa\u672c\u5c5e\u6027 view_alert_common_tab_invalid_condition_category = Invalid condition category - please report this as a bug: {0} view_alert_common_tab_invalid_dampening_category = Invalid dampening category - please report this as a bug: {0} -view_alert_common_tab_invalid_time_units = \u65E0\u6548\u65F6\u95F4\u5355\u4F4D - \u8BF7\u62A5\u544Abug: {0} -view_alert_common_tab_notifications = \u901A\u77E5 -view_alert_common_tab_notifications_message = \u6D88\u606F -view_alert_common_tab_notifications_sender = Sender -view_alert_common_tab_notifications_status = \u72B6\u6001 -view_alert_common_tab_recovery = \u8FD8\u539F +view_alert_common_tab_invalid_time_units = \u65e0\u6548\u65f6\u95f4\u5355\u4f4d - \u8bf7\u62a5\u544abug: {0} +view_alert_common_tab_notifications = \u901a\u77e5 +view_alert_common_tab_notifications_message = \u6d88\u606f +view_alert_common_tab_notifications_sender = \u53d1\u9001\u8005 +view_alert_common_tab_notifications_status = \u72b6\u6001 +view_alert_common_tab_recovery = \u8fd8\u539f view_alert_definition_condition_editor_avilability_option_down = Goes down view_alert_definition_condition_editor_avilability_option_up = Comes up view_alert_definition_condition_editor_avilability_tooltip = Specify the availability state change that will trigger the condition. -view_alert_definition_condition_editor_avilability_value = \u53EF\u7528\u6027 -view_alert_definition_condition_editor_common_avg = Average -view_alert_definition_condition_editor_common_max = Maximum -view_alert_definition_condition_editor_common_min = Minimum -view_alert_definition_condition_editor_delete_confirm = \u5220\u9664\u9009\u5B9A\u7684\u8B66\u62A5\u6761\u4EF6? -view_alert_definition_condition_editor_event_regex = \u6B63\u5219\u8868\u8FBE\u5F0F +view_alert_definition_condition_editor_avilability_value = \u53ef\u7528\u6027 +view_alert_definition_condition_editor_common_avg = \u5e73\u5747 +view_alert_definition_condition_editor_common_max = \u6700\u5927 +view_alert_definition_condition_editor_common_min = \u6700\u5c0f +view_alert_definition_condition_editor_delete_confirm = \u5220\u9664\u9009\u5b9a\u7684\u8b66\u62a5\u6761\u4ef6? +view_alert_definition_condition_editor_event_regex = \u6b63\u5219\u8868\u8fbe\u5f0f view_alert_definition_condition_editor_event_regex_tooltip = If specified, this is a regular expression that must match a collected event message in order to trigger the condition. -view_alert_definition_condition_editor_event_severity = Event Severity -view_alert_definition_condition_editor_event_severity_debug = Debug -view_alert_definition_condition_editor_event_severity_error = Error -view_alert_definition_condition_editor_event_severity_fatal = Fatal -view_alert_definition_condition_editor_event_severity_info = Info -view_alert_definition_condition_editor_event_severity_warn = Warn +view_alert_definition_condition_editor_event_severity = \u4e8b\u4ef6\u4e25\u91cd\u6027 +view_alert_definition_condition_editor_event_severity_debug = \u8c03\u8bd5 +view_alert_definition_condition_editor_event_severity_error = \u9519\u8bef +view_alert_definition_condition_editor_event_severity_fatal = \u4e25\u91cd +view_alert_definition_condition_editor_event_severity_info = \u4fe1\u606f +view_alert_definition_condition_editor_event_severity_warn = \u8b66\u544a view_alert_definition_condition_editor_event_tooltip = Specify the event severity that an event message must be reported with in order to trigger this condition. If you specify an optional regular expression, the event message must also match that regular expression in order for the condition to trigger. view_alert_definition_condition_editor_metric_baseline_percentage = Baseline Percentage view_alert_definition_condition_editor_metric_baseline_percentage_tooltip = A collected metric value will trigger this condition when compared to this percentage of the selected baseline value using the selected comparator @@ -671,7 +671,7 @@ view_alert_definition_condition_editor_metric_baseline_value = Baseline view_alert_definition_condition_editor_metric_calltime_change_percentage = Percentage Change view_alert_definition_condition_editor_metric_calltime_change_percentage_tooltip = A collected calltime value will trigger this condition when it differs by at least this percentage of the selected calltime limit value view_alert_definition_condition_editor_metric_calltime_change_tooltip = Specify the calltime value that, when changed at least a specified amount, triggers the condition. You must specify which calltime limit to check (minimum, maximum or average calltime value) and the percentage of change that must occur. -view_alert_definition_condition_editor_metric_calltime_common_comparator = Comparator +view_alert_definition_condition_editor_metric_calltime_common_comparator = \u6bd4\u8f83 view_alert_definition_condition_editor_metric_calltime_common_comparator_changes = Changes view_alert_definition_condition_editor_metric_calltime_common_comparator_grows = Grows view_alert_definition_condition_editor_metric_calltime_common_comparator_shrinks = Shrinks @@ -679,78 +679,78 @@ view_alert_definition_condition_editor_metric_calltime_common_comparator_tooltip view_alert_definition_condition_editor_metric_calltime_common_limit = Call Time Limit view_alert_definition_condition_editor_metric_calltime_common_limit_tooltip = The calltime limit value that is to be compared with the given value view_alert_definition_condition_editor_metric_calltime_common_name = Call Time Metric -view_alert_definition_condition_editor_metric_calltime_common_regex = \u6B63\u5219\u8868\u8FBE\u5F0F +view_alert_definition_condition_editor_metric_calltime_common_regex = \u6b63\u5219\u8868\u8fbe\u5f0f view_alert_definition_condition_editor_metric_calltime_common_regex_tooltip = If specified, this is a regular expression that must match a call destination in order to trigger the condition. view_alert_definition_condition_editor_metric_calltime_threshold_tooltip = Specify the calltime threshold value that, when violated, triggers the condition. The value you specify is an absolute value with an optional units specifier. You also must specify which calltime limit to compare the value with (minimum, maximum or average calltime value). view_alert_definition_condition_editor_metric_calltime_threshold_value = Call Time Value view_alert_definition_condition_editor_metric_calltime_threshold_value_tooltip = The threshold value of the metric that will trigger the condition when compared using the selected comparator. view_alert_definition_condition_editor_metric_change_tooltip = Specify the metric whose value must change to trigger the condition. view_alert_definition_condition_editor_metric_common_definition_not_found = Should have found metric definition - something is wrong -view_alert_definition_condition_editor_metric_threshold_comparator = Comparator -view_alert_definition_condition_editor_metric_threshold_comparator_equal = \u7B49\u4E8E -view_alert_definition_condition_editor_metric_threshold_comparator_greater = \u5927\u4E8E -view_alert_definition_condition_editor_metric_threshold_comparator_less = \u5C0F\u4E8E +view_alert_definition_condition_editor_metric_threshold_comparator = \u6bd4\u8f83 +view_alert_definition_condition_editor_metric_threshold_comparator_equal = \u7b49\u4e8e +view_alert_definition_condition_editor_metric_threshold_comparator_greater = \u5927\u4e8e +view_alert_definition_condition_editor_metric_threshold_comparator_less = \u5c0f\u4e8e view_alert_definition_condition_editor_metric_threshold_comparator_tooltip = How a collected metric value should be compared to the given threshold value view_alert_definition_condition_editor_metric_threshold_name = \u6307\u6807 view_alert_definition_condition_editor_metric_threshold_tooltip = Specify the threshold value that, when violated, triggers the condition. The value you specify is an absolute value with an optional units specifier. -view_alert_definition_condition_editor_metric_threshold_value = \u6307\u6807\u503C +view_alert_definition_condition_editor_metric_threshold_value = \u6307\u6807\u503c view_alert_definition_condition_editor_metric_threshold_value_tooltip = The threshold value of the metric that will trigger the condition when compared using the selected comparator. view_alert_definition_condition_editor_metric_trait_change_tooltip = Specify the trait whose value must change to trigger the condition. -view_alert_definition_condition_editor_metric_trait_change_value = Trait -view_alert_definition_condition_editor_operation_status = \u64CD\u4F5C\u72B6\u6001 +view_alert_definition_condition_editor_metric_trait_change_value = \u7279\u5f81 +view_alert_definition_condition_editor_operation_status = \u64cd\u4f5c\u72b6\u6001 view_alert_definition_condition_editor_operation_status_canceled = Canceled view_alert_definition_condition_editor_operation_status_failure = Failure -view_alert_definition_condition_editor_operation_status_inprogress = \u8FDB\u884C\u4E2D +view_alert_definition_condition_editor_operation_status_inprogress = \u8fdb\u884c\u4e2d view_alert_definition_condition_editor_operation_status_success = Success view_alert_definition_condition_editor_operation_tooltip = Specify the result that must occur when the selected operation is executed in order to trigger the condition. -view_alert_definition_condition_editor_operation_value = \u64CD\u4F5C -view_alert_definition_condition_editor_option_availability = Availability Change -view_alert_definition_condition_editor_option_event = \u4E8B\u4EF6\u68C0\u6D4B -view_alert_definition_condition_editor_option_label = Condition Type -view_alert_definition_condition_editor_option_metric_baseline = Measurement Baseline Threshold +view_alert_definition_condition_editor_operation_value = \u64cd\u4f5c +view_alert_definition_condition_editor_option_availability = \u53ef\u7528\u6027\u6539\u53d8 +view_alert_definition_condition_editor_option_event = \u4e8b\u4ef6\u68c0\u6d4b +view_alert_definition_condition_editor_option_label = \u6761\u4ef6\u7c7b\u578b +view_alert_definition_condition_editor_option_metric_baseline = \u6307\u6807\u57fa\u7ebf\u9600\u503c view_alert_definition_condition_editor_option_metric_calltime_change = Call Time Value Change view_alert_definition_condition_editor_option_metric_calltime_threshold = Call Time Value Threshold view_alert_definition_condition_editor_option_metric_change = Measurement Value Change view_alert_definition_condition_editor_option_metric_threshold = Measurement Absolute Value Threshold view_alert_definition_condition_editor_option_metric_trait_change = Trait Value Change view_alert_definition_condition_editor_option_operation = Operation Execution -view_alert_definition_condition_editor_option_resource_configuration = \u8D44\u6E90\u914D\u7F6E\u6539\u53D8 +view_alert_definition_condition_editor_option_resource_configuration = \u8d44\u6e90\u914d\u7f6e\u6539\u53d8 view_alert_definition_condition_editor_resource_configuration_tooltip = This condition is triggered when the resource configuration changes. -view_alert_definition_for_group = \u67E5\u770B\u7EC4\u5B9A\u4E49 -view_alert_definition_for_type = \u67E5\u770B\u6A21\u677F -view_alert_definition_notification_cliScript_editor_anotherUser = \u5176\u4ED6\u7528\u6237 +view_alert_definition_for_group = \u67e5\u770b\u7ec4\u5b9a\u4e49 +view_alert_definition_for_type = \u67e5\u770b\u6a21\u677f +view_alert_definition_notification_cliScript_editor_anotherUser = \u5176\u4ed6\u7528\u6237 view_alert_definition_notification_cliScript_editor_existingScript = Existing Script view_alert_definition_notification_cliScript_editor_loadFailed = Loading the CLI Notification Editor Failed. -view_alert_definition_notification_cliScript_editor_newScriptVersion = Version -view_alert_definition_notification_cliScript_editor_repository = Repository -view_alert_definition_notification_cliScript_editor_script = Script +view_alert_definition_notification_cliScript_editor_newScriptVersion = \u7248\u672c +view_alert_definition_notification_cliScript_editor_repository = \u5e93 +view_alert_definition_notification_cliScript_editor_script = \u811a\u672c view_alert_definition_notification_cliScript_editor_selectRepo = Select the repository where the script should reside -view_alert_definition_notification_cliScript_editor_selectRepoFirst = \u9996\u5148\u9009\u62E9\u5E93. +view_alert_definition_notification_cliScript_editor_selectRepoFirst = \u9996\u5148\u9009\u62e9\u5e93. view_alert_definition_notification_cliScript_editor_thisUser = Myself -view_alert_definition_notification_cliScript_editor_uploadNewScript = \u4E0A\u4F20\u65B0\u811A\u672C -view_alert_definition_notification_cliScript_editor_verifyAuthentication = Verify +view_alert_definition_notification_cliScript_editor_uploadNewScript = \u4e0a\u4f20\u65b0\u811a\u672c +view_alert_definition_notification_cliScript_editor_verifyAuthentication = \u786e\u8ba4 view_alert_definition_notification_cliScript_editor_whichUser = User To Run The Script As -view_alert_definition_notification_editor_delete_confirm = \u4F60\u786E\u5B9A\u8981\u5220\u9664\u9009\u5B9A\u7684\u544A\u8B66\u901A\u77E5? -view_alert_definition_notification_editor_field_configuration = \u914D\u7F6E -view_alert_definition_notification_editor_field_configuration_loadFailed = Failed to get notification configuration preview -view_alert_definition_notification_editor_field_configuration_not_loaded = Unknown -view_alert_definition_notification_editor_field_sender = Sender -view_alert_definition_notification_editor_loadFailed = Cannot get alert senders -view_alert_definition_notification_editor_loadFailed_single = Cannot get alert sender configuration definition -view_alert_definition_notification_editor_none_available = No alert senders available -view_alert_definition_notification_editor_saveFailed = Cannot save the notification configuration -view_alert_definition_notification_editor_sender = \u901A\u77E5\u53D1\u9001\u8005 -view_alert_definition_notification_editor_title_add = \u6DFB\u52A0\u901A\u77E5 -view_alert_definition_notification_editor_title_edit = \u7F16\u8F91\u901A\u77E5 -view_alert_definition_notification_operation_editor_common_operation = \u64CD\u4F5C -view_alert_definition_notification_operation_editor_mode_relative = \u76F8\u5173\u8D44\u6E90 -view_alert_definition_notification_operation_editor_mode_specific = \u6307\u5B9A\u8D44\u6E90 -view_alert_definition_notification_operation_editor_mode_this = \u8FD9\u4E2A\u8D44\u6E90 -view_alert_definition_notification_operation_editor_mode_title = \u8D44\u6E90\u9009\u62E9\u6A21\u5F0F +view_alert_definition_notification_editor_delete_confirm = \u4f60\u786e\u5b9a\u8981\u5220\u9664\u9009\u5b9a\u7684\u544a\u8b66\u901a\u77e5? +view_alert_definition_notification_editor_field_configuration = \u914d\u7f6e +view_alert_definition_notification_editor_field_configuration_loadFailed = \u65e0\u6cd5\u5f97\u5230\u901a\u77e5\u914d\u7f6e\u9884\u89c8 +view_alert_definition_notification_editor_field_configuration_not_loaded = \u672a\u77e5 +view_alert_definition_notification_editor_field_sender = \u53d1\u9001\u8005 +view_alert_definition_notification_editor_loadFailed = \u65e0\u6cd5\u83b7\u5f97\u544a\u8b66\u53d1\u9001\u8005 +view_alert_definition_notification_editor_loadFailed_single = \u65e0\u6cd5\u53d6\u5f97\u544a\u8b66\u53d1\u9001\u8005\u914d\u7f6e +view_alert_definition_notification_editor_none_available = \u6ca1\u6709\u53ef\u7528\u544a\u8b66\u53d1\u9001\u8005 +view_alert_definition_notification_editor_saveFailed = \u65e0\u6cd5\u4fdd\u5b58\u901a\u77e5\u914d\u7f6e +view_alert_definition_notification_editor_sender = \u901a\u77e5\u53d1\u9001\u8005 +view_alert_definition_notification_editor_title_add = \u6dfb\u52a0\u901a\u77e5 +view_alert_definition_notification_editor_title_edit = \u7f16\u8f91\u901a\u77e5 +view_alert_definition_notification_operation_editor_common_operation = \u64cd\u4f5c +view_alert_definition_notification_operation_editor_mode_relative = \u76f8\u5173\u8d44\u6e90 +view_alert_definition_notification_operation_editor_mode_specific = \u6307\u5b9a\u8d44\u6e90 +view_alert_definition_notification_operation_editor_mode_this = \u8fd9\u4e2a\u8d44\u6e90 +view_alert_definition_notification_operation_editor_mode_title = \u8d44\u6e90\u9009\u62e9\u6a21\u5f0f view_alert_definition_notification_operation_editor_mode_unknown = UNKNOWN OPTION - THIS IS A BUG -view_alert_definition_notification_operation_editor_operations_loadFailed = Failed to load the list of available operations -view_alert_definition_notification_operation_editor_operations_no_parameters = This operation does not take any parameters -view_alert_definition_notification_operation_editor_relative_ancestor = Start Search From +view_alert_definition_notification_operation_editor_operations_loadFailed = \u65e0\u6cd5\u52a0\u8f7d\u6709\u6548\u7684\u64cd\u4f5c\u5217\u8868 +view_alert_definition_notification_operation_editor_operations_no_parameters = \u8fd9\u4e2a\u64cd\u4f5c\u65e0\u53c2\u6570 +view_alert_definition_notification_operation_editor_relative_ancestor = \u5f00\u59cb\u68c0\u7d22\u4e8e view_alert_definition_notification_operation_editor_relative_ancestor_loadFailed = Cannot get type ancestry view_alert_definition_notification_operation_editor_relative_ancestor_root = Root Ancestor Type view_alert_definition_notification_operation_editor_relative_ancestor_tooltip = Select the top of the type hierarchy from which to search its descendant tree for the Filter By type @@ -759,10 +759,10 @@ view_alert_definition_notification_operation_editor_relative_descendant_filter_t view_alert_definition_notification_operation_editor_relative_descendant_loadFailed = Cannot get type descendants view_alert_definition_notification_operation_editor_relative_descendant_tooltip = The resource type to search for under the root type defined in the Start Search From selection. view_alert_definition_notification_operation_editor_specific_pick_button = Pick -view_alert_definition_notification_operation_editor_specific_pick_error_invalid = Please pick a resource +view_alert_definition_notification_operation_editor_specific_pick_error_invalid = \u9009\u62e9\u4e00\u4e2a\u8d44\u6e90 view_alert_definition_notification_operation_editor_specific_pick_error_no_operation = Please pick a resource that has one or more operations -view_alert_definition_notification_operation_editor_specific_pick_text = Pick a resource... -view_alert_definition_notification_operation_editor_specific_resource = \u8D44\u6E90 +view_alert_definition_notification_operation_editor_specific_pick_text = \u9009\u62e9\u4e00\u4e2a\u8d44\u6e90... +view_alert_definition_notification_operation_editor_specific_resource = \u8d44\u6e90 view_alert_definition_notification_role_editor_loadFailed = Cannot determine current roles - starting empty view_alert_definition_notification_role_editor_restoreFailed = Cannot use current roles - starting empty view_alert_definition_notification_role_editor_saveFailed = Cannot save the selected roles @@ -773,127 +773,133 @@ view_alert_definition_recovery_editor_disable_when_fired = Disable When Fired view_alert_definition_recovery_editor_disable_when_fired_tooltip = Indicates if this alert will be disabled after it fires. Once disabled, the alert can be manually re-enabled or a recovery alert can be set up to automatically re-enable it. If this alert is a recovery alert itself, this setting cannot be turned on. view_alert_definition_recovery_editor_loadFailed = Cannot build recovery menu view_alert_definition_recovery_editor_none_available = None -view_alert_definition_recovery_editor_recovery_alert = Recover Alert +view_alert_definition_recovery_editor_recovery_alert = \u6062\u590d\u544a\u8b66 view_alert_definition_recovery_editor_recovery_alert_tooltip = The target alert that will be recovered (i.e. re-enabled) after this alert triggers. Do not select an alert here if you are not defining a recovery alert. -view_alert_definitions_create_failure = Alert definition creation failed -view_alert_definitions_create_success = Alert definition successfully created -view_alert_definitions_delete_confirm = Delete the selected alert definition(s)? -view_alert_definitions_delete_failure = Failed to deleted the selected alert definitions -view_alert_definitions_delete_success = Successfully deleted {0} alert definitions -view_alert_definitions_disable_confirm = Disable the selected alert definition(s)? -view_alert_definitions_disable_failure = Failed to disable the selected alert definitions -view_alert_definitions_disable_success = Successfully disabled {0} alert definitions -view_alert_definitions_enable_confirm = Enable the selected alert definition(s)? -view_alert_definitions_enable_failure = Failed to enable the selected alert definitions -view_alert_definitions_enable_success = Successfully enabled {0} alert definitions -view_alert_definitions_loadFailed = Failed to fetch alert definition data -view_alert_definitions_loadFailed_single = Failed to fetch data for alert definition with id {0} -view_alert_definitions_table_title_group = \u7EC4\u544A\u8B66\u5B9A\u4E49 -view_alert_definitions_table_title_resource = \u7EC4\u544A\u8B66\u5B9A\u4E49 -view_alert_definitions_update_failure = \u544A\u8B66\u5B9A\u4E49\u66F4\u65B0\u5931\u8D25 -view_alert_definitions_update_success = \u544A\u8B66\u5B9A\u4E49\u66F4\u65B0\u6210\u529F -view_alert_details_field_ack_at = \u786E\u8BA4\u4E8E -view_alert_details_field_ack_by = \u786E\u8BA4\u8005 -view_alert_details_field_recovery_info = \u8FD8\u539F\u4FE1\u606F -view_alert_details_loadFailed = \u53D6\u5F97\u544A\u8B66\u8BE6\u60C5\u5931\u8D25 -view_alerts_ack_confirm = Acknowledge the selected alert(s)? -view_alerts_ack_confirm_all = Acknowledge all alerts from this source? -view_alerts_ack_failure = Failed to acknowledge alerts with id''s: {0} -view_alerts_ack_failure_all = Failed to acknowledge all alerts from this source -view_alerts_ack_success = Successfully acknowledged {0} alerts -view_alerts_delete_confirm = Delete the selected alert(s)? -view_alerts_delete_confirm_all = Delete all alerts from this source? -view_alerts_delete_failure = Failed to delete alerts with id''s: {0} -view_alerts_delete_failure_all = Failed to delete all alerts from this source -view_alerts_delete_success = Successfully deleted {0} alerts -view_alerts_field_ack_status = \u72B6\u6001 +view_alert_definitions_create_failure = \u544a\u8b66\u5b9a\u4e49\u521b\u5efa\u5931\u8d25 +view_alert_definitions_create_success = \u544a\u8b66\u5b9a\u4e49\u521b\u5efa\u6210\u529f +view_alert_definitions_delete_confirm = \u5220\u9664\u9009\u5b9a\u7684\u544a\u8b66\u5b9a\u4e49? +view_alert_definitions_delete_failure = \u5220\u9664\u9009\u5b9a\u7684\u544a\u8b66\u5b9a\u4e49\u5931\u8d25 +view_alert_definitions_delete_success = \u6210\u529f\u5220\u9664 {0} \u544a\u8b66\u5b9a\u4e49 +view_alert_definitions_disable_confirm = \u7981\u7528\u9009\u62e9\u7684\u544a\u8b66\u5b9a\u4e49? +view_alert_definitions_disable_failure = \u7981\u7528\u9009\u62e9\u7684\u544a\u8b66\u5b9a\u4e49\u5931\u8d25 +view_alert_definitions_disable_success = \u6210\u529f\u7981\u7528{0}\u544a\u8b66\u5b9a\u4e49 +view_alert_definitions_enable_confirm = \u542f\u7528\u9009\u62e9\u7684\u544a\u8b66\u5b9a\u4e49? +view_alert_definitions_enable_failure = \u542f\u7528\u9009\u62e9\u7684\u544a\u8b66\u5b9a\u4e49\u5931\u8d25 +view_alert_definitions_enable_success = \u542f\u7528 {0} \u544a\u8b66\u5b9a\u4e49\u6210\u529f +view_alert_definitions_loadFailed = \u53d6\u5f97\u544a\u8b66\u5b9a\u4e49\u6570\u636e\u5931\u8d25 +view_alert_definitions_loadFailed_single = \u4e3a\u544a\u8b66\u5b9a\u4e49id {0}\u83b7\u53d6\u6570\u636e\u5931\u8d25 +view_alert_definitions_table_title_group = \u7ec4\u544a\u8b66\u5b9a\u4e49 +view_alert_definitions_table_title_resource = \u7ec4\u544a\u8b66\u5b9a\u4e49 +view_alert_definitions_update_failure = \u544a\u8b66\u5b9a\u4e49\u66f4\u65b0\u5931\u8d25 +view_alert_definitions_update_success = \u544a\u8b66\u5b9a\u4e49\u66f4\u65b0\u6210\u529f +view_alert_details_field_ack_at = \u786e\u8ba4\u4e8e +view_alert_details_field_ack_by = \u786e\u8ba4\u8005 +view_alert_details_field_recovery_info = \u8fd8\u539f\u4fe1\u606f +view_alert_details_loadFailed = \u53d6\u5f97\u544a\u8b66\u8be6\u60c5\u5931\u8d25 +view_alerts_ack_confirm = \u786e\u8ba4\u9009\u62e9\u7684\u544a\u8b66(s)? +view_alerts_ack_confirm_all = \u4ece\u8fd9\u4e2a\u6e90\u4e0a\u786e\u8ba4\u6240\u6709\u544a\u8b66? +view_alerts_ack_failure = \u786e\u8ba4\u544a\u8b66id ''s: {0}\u5931\u8d25 +view_alerts_ack_failure_all = \u4ece\u8fd9\u4e2a\u6e90\u4e0a\u786e\u8ba4\u6240\u6709\u544a\u8b66\u5931\u8d25 +view_alerts_ack_success = \u6210\u529f\u786e\u8ba4 {0} \u544a\u8b66 +view_alerts_delete_confirm = \u5220\u9664\u9009\u62e9\u7684\u544a\u8b66? +view_alerts_delete_confirm_all = \u4ece\u8fd9\u4e2a\u6e90\u4e0a\u5220\u9664\u6240\u6709\u544a\u8b66? +view_alerts_delete_failure = \u65e0\u6cd5\u5220\u9664\u544a\u8b66''s: {0} +view_alerts_delete_failure_all = \u4ece\u8fd9\u4e2a\u6e90\u4e0a\u5220\u9664\u6240\u6709\u544a\u8b66\u5931\u8d25 +view_alerts_delete_success = \u5220\u9664\u544a\u8b66{0}\u6210\u529f +view_alerts_field_ack_status = \u72b6\u6001 view_alerts_field_ack_status_ack = Ack ({0}) -view_alerts_field_ack_status_ackHover = \u786E\u8BA4\u8005{0}\u4E8E{1} +view_alerts_field_ack_status_ackHover = \u786e\u8ba4\u8005{0}\u4e8e{1} view_alerts_field_ack_status_noAck = No Ack -view_alerts_field_ack_status_noAckHover = \u8FD8\u6CA1\u786E\u8BA4\u7684 +view_alerts_field_ack_status_noAckHover = \u8fd8\u6ca1\u786e\u8ba4\u7684 view_alerts_field_ack_subject = Acknowledge Subject -view_alerts_field_ack_time = \u786E\u8BA4\u65F6\u95F4 -view_alerts_field_condition_text = Condition Text -view_alerts_field_condition_text_many = Multiple Conditions -view_alerts_field_condition_text_none = No Conditions -view_alerts_field_condition_value = Condition Value -view_alerts_field_created_time = \u4EA7\u751F\u65F6\u95F4 -view_alerts_field_enabled = \u542F\u7528 -view_alerts_field_modified_time = \u4FEE\u6539\u65F6\u95F4 -view_alerts_field_name = Name +view_alerts_field_ack_time = \u786e\u8ba4\u65f6\u95f4 +view_alerts_field_condition_text = \u6761\u4ef6\u6587\u672c +view_alerts_field_condition_text_many = \u591a\u6761\u4ef6 +view_alerts_field_condition_text_none = \u65e0\u6761\u4ef6 +view_alerts_field_condition_value = \u6761\u4ef6\u503c +view_alerts_field_created_time = \u4ea7\u751f\u65f6\u95f4 +view_alerts_field_enabled = \u542f\u7528 +view_alerts_field_modified_time = \u4fee\u6539\u65f6\u95f4 +view_alerts_field_name = \u540d\u79f0 view_alerts_field_parent = \u7236 -view_alerts_field_priority = \u4F18\u5148\u7EA7 -view_alerts_field_protected = Protected +view_alerts_field_priority = \u4f18\u5148\u7ea7 +view_alerts_field_protected = \u4fdd\u62a4\u7684 view_alerts_field_protected_tooltip = If true, this definition is protected from being changed by the parent definition. In other words, the parent definition settings will not override this definition. -view_alerts_loadFailed = Failed to fetch alerts data -view_alerts_table_filter_priority = \u4F18\u5148\u7EA7\u8FC7\u6EE4 -view_alerts_table_title_group = \u7EC4\u544A\u8B66\u5386\u53F2 -view_alerts_table_title_resource = \u8D44\u6E90\u544A\u8B66\u5386\u53F2 +view_alerts_loadFailed = \u65e0\u6cd5\u83b7\u53d6\u544a\u8b66\u6570\u636e +view_alerts_table_filter_priority = \u4f18\u5148\u7ea7\u8fc7\u6ee4 +view_alerts_table_title_group = \u7ec4\u544a\u8b66\u5386\u53f2 +view_alerts_table_title_resource = \u8d44\u6e90\u544a\u8b66\u5386\u53f2 view_autoDiscoveryQ_committed = Committed -view_autoDiscoveryQ_confirmSelect = \u662F\u5426\u9009\u4E2D\u5B50\u8282\u70B9\uFF1F -view_autoDiscoveryQ_deleted = Deleted -view_autoDiscoveryQ_field_discoveryTime = \u53D1\u73B0\u65F6\u95F4 -view_autoDiscoveryQ_field_inventoryStatus = \u6E05\u5355\u72B6\u6001 -view_autoDiscoveryQ_field_key = \u8D44\u6E90Key -view_autoDiscoveryQ_field_name = \u8D44\u6E90\u540D\u79F0 +view_autoDiscoveryQ_confirmSelect = \u662f\u5426\u9009\u4e2d\u5b50\u8282\u70b9\uff1f +view_autoDiscoveryQ_confirmSelectAll = Also select the children of each platform? +view_autoDiscoveryQ_deleted = \u5220\u9664\u7684 +view_autoDiscoveryQ_deselectAll = \u53d6\u6d88\u6240\u6709\u7684\u9009\u5b9a +view_autoDiscoveryQ_field_discoveryTime = \u53d1\u73b0\u65f6\u95f4 +view_autoDiscoveryQ_field_inventoryStatus = \u6e05\u5355\u72b6\u6001 +view_autoDiscoveryQ_field_key = \u8d44\u6e90Key +view_autoDiscoveryQ_field_name = \u8d44\u6e90\u540d\u79f0 view_autoDiscoveryQ_field_parentId = \u7236ID -view_autoDiscoveryQ_ignore = \u5FFD\u7565 -view_autoDiscoveryQ_ignoreFailure = Failed to ignore resources -view_autoDiscoveryQ_ignoreSuccessful = \u6210\u529F\u5FFD\u7565\u9009\u5B9A\u8D44\u6E90. +view_autoDiscoveryQ_ignore = \u5ffd\u7565 +view_autoDiscoveryQ_ignoreFailure = \u5ffd\u7565\u8d44\u6e90\u5931\u8d25 +view_autoDiscoveryQ_ignoreInProgress = \u5ffd\u7565\u9009\u4e2d\u8d44\u6e90... +view_autoDiscoveryQ_ignoreSuccessful = \u6210\u529f\u5ffd\u7565\u9009\u5b9a\u8d44\u6e90. view_autoDiscoveryQ_ignored = Ignored -view_autoDiscoveryQ_import = \u5BFC\u5165 -view_autoDiscoveryQ_importFailure = \u5BFC\u5165\u8D44\u6E90\u5931\u8D25 -view_autoDiscoveryQ_importSuccessful = \u6210\u529F\u5BFC\u5165\u88AB\u9009\u8D44\u6E90. -view_autoDiscoveryQ_loadFailure = \u52A0\u8F7D\u8D44\u6E90\u6E05\u5355\u53D1\u73B0\u961F\u5217\u5931\u8D25 +view_autoDiscoveryQ_import = \u5bfc\u5165 +view_autoDiscoveryQ_importFailure = \u5bfc\u5165\u8d44\u6e90\u5931\u8d25 +view_autoDiscoveryQ_importInProgress = \u5bfc\u5165\u9009\u62e9\u7684\u8d44\u6e90... +view_autoDiscoveryQ_importSuccessful = \u6210\u529f\u5bfc\u5165\u88ab\u9009\u8d44\u6e90. +view_autoDiscoveryQ_loadFailure = \u52a0\u8f7d\u8d44\u6e90\u6e05\u5355\u53d1\u73b0\u961f\u5217\u5931\u8d25 view_autoDiscoveryQ_new = New view_autoDiscoveryQ_newAndIgnored = New and Ignored -view_autoDiscoveryQ_noItems = \u65E0\u6761\u76EE\u663E\u793A -view_autoDiscoveryQ_noperm = (\u60A8\u6CA1\u6709\u6743\u9650\u67E5\u770B\u81EA\u52A8\u53D1\u73B0\u961F\u5217) -view_autoDiscoveryQ_showStatus = \u663E\u793A\u72B6\u6001 -view_autoDiscoveryQ_title = \u81EA\u52A8\u53D1\u73B0\u961F\u5217 +view_autoDiscoveryQ_noItems = \u65e0\u6761\u76ee\u663e\u793a +view_autoDiscoveryQ_noperm = (\u60a8\u6ca1\u6709\u6743\u9650\u67e5\u770b\u81ea\u52a8\u53d1\u73b0\u961f\u5217) +view_autoDiscoveryQ_selectAll = \u9009\u62e9\u6240\u6709 +view_autoDiscoveryQ_showStatus = \u663e\u793a\u72b6\u6001 +view_autoDiscoveryQ_title = \u81ea\u52a8\u53d1\u73b0\u961f\u5217 view_autoDiscoveryQ_unignore = Unignore view_autoDiscoveryQ_unignoreFailure = Failed to unignore resources -view_autoDiscoveryQ_unignoreSuccessful = \u6210\u529F\u4F7F\u9009\u4E2D\u7684\u8D44\u6E90\u751F\u6548. +view_autoDiscoveryQ_unignoreInProgress = Unignoring the selected Resources... +view_autoDiscoveryQ_unignoreSuccessful = \u6210\u529f\u4f7f\u9009\u4e2d\u7684\u8d44\u6e90\u751f\u6548. view_autoDiscoveryQ_uninventoried = Uninventoried -view_bundleVersion_loadFailure = Failed to load bundle version data +view_bundleVersion_loadFailure = \u52a0\u8f7dbundle\u7248\u672c\u6570\u636e\u5931\u8d25 view_bundle_bundle = Bundle -view_bundle_bundleDeployment = Bundle\u53D1\u5E03 -view_bundle_bundleDeployments = Bundle\u53D1\u5E03 -view_bundle_bundleDestinations = Bundle\u76EE\u7684\u5730 -view_bundle_bundleFiles = Bundle\u6587\u4EF6 -view_bundle_bundleType = Bundle\u7C7B\u578B -view_bundle_bundleVersion = Bundle\u7248\u672C -view_bundle_bundleVersions = Bundle\u7248\u672C +view_bundle_bundleDeployment = Bundle\u53d1\u5e03 +view_bundle_bundleDeployments = Bundle\u53d1\u5e03 +view_bundle_bundleDestinations = Bundle\u76ee\u7684\u5730 +view_bundle_bundleFiles = Bundle\u6587\u4ef6 +view_bundle_bundleType = Bundle\u7c7b\u578b +view_bundle_bundleVersion = Bundle\u7248\u672c +view_bundle_bundleVersions = Bundle\u7248\u672c view_bundle_bundles = Bundles -view_bundle_createWizard_bundleDistro = Bundle Distribution +view_bundle_createWizard_bundleDistro = Bundle\u53d1\u5e03 view_bundle_createWizard_cancelFailure = Failed to fully cancel the creation of bundle [{0}], version = [{1}] - the bundle may still exist in the database view_bundle_createWizard_cancelSuccessful = Canceled the creation of bundle [{0}], version = [{1}] view_bundle_createWizard_clickToUploadRecipe = Click to load a recipe file -view_bundle_createWizard_createFailure = \u521B\u5EFAbundle\u5931\u8D25 +view_bundle_createWizard_createFailure = \u521b\u5efabundle\u5931\u8d25 view_bundle_createWizard_createSuccessful = You have successfully created a bundle named [{0}] with a version of [{1}] -view_bundle_createWizard_enterRecipe = Please supply a valid recipe +view_bundle_createWizard_enterRecipe = \u8bf7\u63d0\u4f9b\u6709\u6548\u7684recipe view_bundle_createWizard_enterUrl = Please enter a valid URL where the bundle distribution file can be downloaded from -view_bundle_createWizard_failedToUploadDistroFile = Failed to upload bundle distribution file -view_bundle_createWizard_failedToUploadFile = Failed to upload bundle file -view_bundle_createWizard_loadBundleFileFailure = Cannot obtain bundle file information from server +view_bundle_createWizard_failedToUploadDistroFile = \u4e0a\u4f20bundle\u53d1\u5e03\u5305\u6587\u4ef6\u5931\u8d25 +view_bundle_createWizard_failedToUploadFile = \u4e0a\u4f20bundle\u6587\u4ef6\u5931\u8d25 +view_bundle_createWizard_loadBundleFileFailure = \u65e0\u6cd5\u4ece\u670d\u52a1\u5668\u83b7\u5f97bundle\u6587\u4ef6\u4fe1\u606f view_bundle_createWizard_noAdditionalFilesNeeded = No additional files need to be uploaded for this bundle -view_bundle_createWizard_noBundleTypesAvail = No bundle types are available +view_bundle_createWizard_noBundleTypesAvail = \u65e0\u6709\u6548bundle\u7c7b\u578b view_bundle_createWizard_noBundleTypesSupported = No bundle types are supported - you must deploy a valid plugin that supports bundle deployments -view_bundle_createWizard_provideBundleDistro = Provide a Bundle Distribution +view_bundle_createWizard_provideBundleDistro = \u63d0\u4f9b\u4e00\u4e2aBundle\u53d1\u5e03\u5305 view_bundle_createWizard_recipeOption = Recipe -view_bundle_createWizard_title = \u521B\u5EFABundle -view_bundle_createWizard_uploadInProgress = Upload is in progress... This can take several minutes for large files -view_bundle_createWizard_uploadOption = \u4E0A\u4F20 -view_bundle_createWizard_uploadStepName = Upload Bundle Files +view_bundle_createWizard_title = \u521b\u5efaBundle +view_bundle_createWizard_uploadInProgress = \u4e0a\u4f20\u4e2d...\u5927\u6587\u4ef6\u8981\u82b1\u8d39\u6570\u5206\u949f +view_bundle_createWizard_uploadOption = \u4e0a\u4f20 +view_bundle_createWizard_uploadStepName = \u4e0a\u4f20Bundle\u6587\u4ef6 view_bundle_createWizard_urlOption = URL -view_bundle_createWizard_windowTitle = Bundle\u521B\u5EFA\u5411\u5BFC -view_bundle_createWizard_youMustChooseOne = You must choose one option in order to create a bundle! -view_bundle_deleteConfirm = \u4F60\u786E\u5B9A\u8981\u5220\u9664\u8FD9\u4E2Abundle? \u8FD9\u4E2Abundle\u6240\u6709\u7684\u7248\u672C, \u76EE\u7684\u5730\u548C\u90E8\u7F72\u5C06\u88AB\u5220\u9664. -view_bundle_deploy = \u53D1\u5E03 -view_bundle_deployDir = \u53D1\u5E03\u76EE\u5F55 -view_bundle_deployWizard_deployStep = \u53D1\u5E03Bundle\u5230\u76EE\u7684\u5E73\u53F0 -view_bundle_deployWizard_deploying = \u53D1\u5E03\u4E2D... -view_bundle_deployWizard_deploymentCreated = \u521B\u5EFA\u90E8\u7F72... +view_bundle_createWizard_windowTitle = Bundle\u521b\u5efa\u5411\u5bfc +view_bundle_createWizard_youMustChooseOne = \u4e3a\u4e86\u521b\u5efabundle\u4f60\u8981\u9009\u62e9\u4e00\u4e2a\u9009\u9879! +view_bundle_deleteConfirm = \u4f60\u786e\u5b9a\u8981\u5220\u9664\u8fd9\u4e2abundle? \u8fd9\u4e2abundle\u6240\u6709\u7684\u7248\u672c, \u76ee\u7684\u5730\u548c\u90e8\u7f72\u5c06\u88ab\u5220\u9664. +view_bundle_deploy = \u53d1\u5e03 +view_bundle_deployDir = \u53d1\u5e03\u76ee\u5f55 +view_bundle_deployWizard_deployStep = \u53d1\u5e03Bundle\u5230\u76ee\u7684\u5e73\u53f0 +view_bundle_deployWizard_deploying = \u53d1\u5e03\u4e2d... +view_bundle_deployWizard_deploymentCreated = \u521b\u5efa\u90e8\u7f72... view_bundle_deployWizard_deploymentCreatedDetail = You have created the deployment [{0}] with the description [{1}] view_bundle_deployWizard_deploymentCreatedDetail_concise = You have created the deployment [{0}] view_bundle_deployWizard_deploymentScheduled = Bundle Deployment Scheduled! @@ -903,111 +909,111 @@ view_bundle_deployWizard_destinationCreatedDetail = You have created the destina view_bundle_deployWizard_destinationCreatedDetail_concise = You have created the destination [{0}] view_bundle_deployWizard_error_1 = Failed to delete new deployment on Cancel view_bundle_deployWizard_error_10 = Failed to create destination, it may already exist. (Note, for an existing destination deploy from the Destination view) -view_bundle_deployWizard_error_11 = Failed to find defined deployments. -view_bundle_deployWizard_error_12 = Failed to find defined bundles. +view_bundle_deployWizard_error_11 = \u67e5\u627e\u5b9a\u4e49\u7684\u90e8\u7f72\u5931\u8d25. +view_bundle_deployWizard_error_12 = \u67e5\u627e\u5b9a\u4e49\u7684bundles\u5931\u8d25. view_bundle_deployWizard_error_2 = Failed to delete new destination on Cancel view_bundle_deployWizard_error_3 = Failed to Schedule Deployment! view_bundle_deployWizard_error_4 = Failed to schedule deployment: {0} -view_bundle_deployWizard_error_5 = \u521B\u5EFA\u53D1\u5E03\u5931\u8D25! -view_bundle_deployWizard_error_6 = \u521B\u5EFA\u53D1\u5E03\u5931\u8D25: {0} -view_bundle_deployWizard_error_7 = Failed to get deployment name. -view_bundle_deployWizard_error_8 = You must select a valid resource group from the drop down +view_bundle_deployWizard_error_5 = \u521b\u5efa\u53d1\u5e03\u5931\u8d25! +view_bundle_deployWizard_error_6 = \u521b\u5efa\u53d1\u5e03\u5931\u8d25: {0} +view_bundle_deployWizard_error_7 = \u53d6\u5f97\u90e8\u7f72\u540d\u5931\u8d25. +view_bundle_deployWizard_error_8 = \u4f60\u5fc5\u987b\u4ece\u4e0b\u62c9\u6846\u4e2d\u9009\u62e9\u6709\u6548\u7684\u8d44\u6e90\u7ec4 view_bundle_deployWizard_error_9 = Failed to delete new destination in nextPage ##view_bundle_deployWizard_error_noBundleConfig = Failed to obtain bundle target information. Is the group you selected a valid compatible group that can be targeted for bundle deployments? view_bundle_deployWizard_getConfigSkip = No configuration needed for this bundle version. view_bundle_deployWizard_getConfigStep = Set Deployment Configuration -view_bundle_deployWizard_getDestStep = \u65B0\u5EFA\u76EE\u7684\u5730 +view_bundle_deployWizard_getDestStep = \u65b0\u5efa\u76ee\u7684\u5730 ##view_bundle_deployWizard_getDest_deployDir = Deployment Directory ##view_bundle_deployWizard_getDest_deployDir_help = The directory where the bundle will be deployed. This directory will be the same for all deployments on all resources but it is relative to the destination base directory location. This means that the absolute directory may have a different path on the different target resources depending on where the base location is on all the different target resources. -view_bundle_deployWizard_getDest_desc = \u76EE\u7684\u5730\u63CF\u8FF0 +view_bundle_deployWizard_getDest_desc = \u76ee\u7684\u5730\u63cf\u8ff0 ##view_bundle_deployWizard_getDest_destBaseDirName = Base Location ##view_bundle_deployWizard_getDest_group_help = The group whose members will be the destination targets for all bundle deployments. Only compatible groups that contain resources that support bundle deployments are selectable. -view_bundle_deployWizard_getDest_name = \u76EE\u7684\u5730\u540D +view_bundle_deployWizard_getDest_name = \u76ee\u7684\u5730\u540d ##view_bundle_deployWizard_getDest_name_help = The name of the destination, which will identify a particular group of resources and the destination directory on those resources for a particular bundle. -view_bundle_deployWizard_getInfoStep = \u63D0\u4F9B\u53D1\u5E03\u4FE1\u606F +view_bundle_deployWizard_getInfoStep = \u63d0\u4f9b\u53d1\u5e03\u4fe1\u606f view_bundle_deployWizard_getInfo_clean = Clean Deployment? (wipe deploy directory on destination platform) -view_bundle_deployWizard_getInfo_deploymentDesc = \u53D1\u5E03\u63CF\u8FF0 -view_bundle_deployWizard_getInfo_deploymentName = \u53D1\u5E03\u540D\u79F0 -view_bundle_deployWizard_getOptionsStep = \u53D1\u5E03\u9009\u9879 -view_bundle_deployWizard_getOptions_deployLater = \u7A0D\u5019\u53D1\u5E03 -view_bundle_deployWizard_getOptions_deployNow = \u9A6C\u4E0A\u53D1\u5E03 -view_bundle_deployWizard_getOptions_deployTime = \u53D1\u5E03\u65F6\u95F4 -view_bundle_deployWizard_selectBundleStep = Select Deployment Bundle +view_bundle_deployWizard_getInfo_deploymentDesc = \u53d1\u5e03\u63cf\u8ff0 +view_bundle_deployWizard_getInfo_deploymentName = \u53d1\u5e03\u540d\u79f0 +view_bundle_deployWizard_getOptionsStep = \u53d1\u5e03\u9009\u9879 +view_bundle_deployWizard_getOptions_deployLater = \u7a0d\u5019\u53d1\u5e03 +view_bundle_deployWizard_getOptions_deployNow = \u9a6c\u4e0a\u53d1\u5e03 +view_bundle_deployWizard_getOptions_deployTime = \u53d1\u5e03\u65f6\u95f4 +view_bundle_deployWizard_selectBundleStep = \u9009\u62e9\u90e8\u7f72Bundle view_bundle_deployWizard_selectBundle_single = Select only a single bundle for deployment. -view_bundle_deployWizard_selectVersionStep = Select Deployment Bundle Version -view_bundle_deployWizard_selectVersion_latest = \u6700\u65B0\u7248\u672C [{0}] -view_bundle_deployWizard_selectVersion_live = Live Version [{0}] -view_bundle_deployWizard_selectVersion_select = Select Version from List: -view_bundle_deployWizard_title = Bundle\u53D1\u5E03\u5411\u5BFC -view_bundle_deploy_action = \u64CD\u4F5C -view_bundle_deploy_backButton = \u8FD4\u56DE -view_bundle_deploy_clickForError = Click the icon for the error message -view_bundle_deploy_deleteConfirm = Are you sure you want to delete this bundle deployment? -view_bundle_deploy_deleteFailure = Failed to delete the bundle deployment [{0}] -view_bundle_deploy_deleteSuccessful = You successfully deleted the bundle deployment [{0}] -view_bundle_deploy_deployedBy = \u53D1\u5E03\u8005 -view_bundle_deploy_deploymentPlatforms = \u53D1\u5E03\u5E73\u53F0 -view_bundle_deploy_installDetails = \u5B89\u88C5\u7EC6\u8282 -view_bundle_deploy_loadBundleFailure = \u67E5\u627Ebundle\u5931\u8D25 +view_bundle_deployWizard_selectVersionStep = \u9009\u62e9\u90e8\u7f72Bundle\u7248\u672c +view_bundle_deployWizard_selectVersion_latest = \u6700\u65b0\u7248\u672c [{0}] +view_bundle_deployWizard_selectVersion_live = \u6d3b\u8dc3\u7248\u672c [{0}] +view_bundle_deployWizard_selectVersion_select = \u9009\u62e9\u7248\u672c: +view_bundle_deployWizard_title = Bundle\u53d1\u5e03\u5411\u5bfc +view_bundle_deploy_action = \u64cd\u4f5c +view_bundle_deploy_backButton = \u8fd4\u56de +view_bundle_deploy_clickForError = \u70b9\u51fb\u56fe\u6807\u67e5\u770b\u9519\u8bef\u6d88\u606f +view_bundle_deploy_deleteConfirm = \u662f\u5426\u786e\u5b9a\u8981\u5220\u9664bundle\u90e8\u7f72? +view_bundle_deploy_deleteFailure = \u65e0\u6cd5\u5220\u9664bundle\u90e8\u7f72 [{0}] +view_bundle_deploy_deleteSuccessful = \u6210\u529f\u5220\u9664bundle\u90e8\u7f72 [{0}] +view_bundle_deploy_deployedBy = \u53d1\u5e03\u8005 +view_bundle_deploy_deploymentPlatforms = \u53d1\u5e03\u5e73\u53f0 +view_bundle_deploy_installDetails = \u5b89\u88c5\u7ec6\u8282 +view_bundle_deploy_loadBundleFailure = \u67e5\u627ebundle\u5931\u8d25 view_bundle_deploy_loadDeployFailure = Failed to load bundle deployments view_bundle_deploy_loadFailure = Failed to load bundle deployment -view_bundle_deploy_name = \u53D1\u5E03\u540D -view_bundle_deploy_selectARow = \u9009\u4E2D\u884C\u663E\u793A\u5B89\u88C5\u7EC6\u8282 +view_bundle_deploy_name = \u53d1\u5e03\u540d +view_bundle_deploy_selectARow = \u9009\u4e2d\u884c\u663e\u793a\u5b89\u88c5\u7ec6\u8282 view_bundle_deploy_tagUpdateFailure = Failed to update bundle deployment tags view_bundle_deploy_tagUpdateSuccessful = You have successfully updated the bundle deployment tags -view_bundle_deploy_time = \u53D1\u5E03\u65F6\u95F4 -view_bundle_deployed = \u5DF2\u53D1\u5E03 -view_bundle_deployments = \u53D1\u5E03 -view_bundle_dest_backToBundle = \u8FD4\u56DEBundle +view_bundle_deploy_time = \u53d1\u5e03\u65f6\u95f4 +view_bundle_deployed = \u5df2\u53d1\u5e03 +view_bundle_deployments = \u53d1\u5e03 +view_bundle_dest_backToBundle = \u8fd4\u56deBundle ##view_bundle_dest_baseDirName = Base Location -view_bundle_dest_created = \u5DF2\u521B\u5EFA +view_bundle_dest_created = \u5df2\u521b\u5efa view_bundle_dest_deleteConfirm = Are you sure you want to delete this bundle destination? This only deletes it from the database; all bundle content that was deployed to this destination on remote machines will remain. view_bundle_dest_deleteFailure = Failed to delete the bundle destination [{0}] view_bundle_dest_deleteSuccessful = You successfully deleted the bundle destination [{0}] -view_bundle_dest_deployDir = \u53D1\u5E03\u76EE\u5F55 -view_bundle_dest_group = \u7EC4 -view_bundle_dest_lastDeployedVersion = \u4E0A\u6B21\u53D1\u5E03\u7248\u672C -view_bundle_dest_lastDeploymentDate = \u4E0A\u6B21\u53D1\u5E03\u65E5\u671F -view_bundle_dest_lastDeploymentStatus = \u4E0A\u6B21\u53D1\u5E03\u72B6\u6001 -view_bundle_dest_loadFailure = \u52A0\u8F7Dbundle\u76EE\u7684\u5730\u5931\u8D25 +view_bundle_dest_deployDir = \u53d1\u5e03\u76ee\u5f55 +view_bundle_dest_group = \u7ec4 +view_bundle_dest_lastDeployedVersion = \u4e0a\u6b21\u53d1\u5e03\u7248\u672c +view_bundle_dest_lastDeploymentDate = \u4e0a\u6b21\u53d1\u5e03\u65e5\u671f +view_bundle_dest_lastDeploymentStatus = \u4e0a\u6b21\u53d1\u5e03\u72b6\u6001 +view_bundle_dest_loadFailure = \u52a0\u8f7dbundle\u76ee\u7684\u5730\u5931\u8d25 view_bundle_dest_loadFailureVersionInfo = Failed to load bundle destination deployed version information view_bundle_dest_purgeConfirm = This will purge the bundle content from all remote machines. Are you sure you want to do this? view_bundle_dest_purgeFailure = Failed to purge the bundle destination [{0}] from some or all of the remote machines. view_bundle_dest_purgeSuccessful = You successfully purged the bundle destination [{0}] from all of the remote machines. view_bundle_dest_revertConfirm = This will revert all remote machines back to the previous bundle deployment. Are you sure you want to do this? -view_bundle_dest_tagUpdateFailure = Failed to update bundle destination tags +view_bundle_dest_tagUpdateFailure = \u66f4\u65b0bundle\u76ee\u7684\u5730\u6807\u7b7e\u5931\u8d25 view_bundle_dest_tagUpdateSuccessful = You have successfully updated the bundle destination tags -view_bundle_destinations = \u76EE\u7684\u5730 -view_bundle_fileListView_fileSize = \u6587\u4EF6\u5927\u5C0F -view_bundle_fileListView_loadFailure = \u52A0\u8F7Dbundle\u6587\u4EF6\u5931\u8D25 +view_bundle_destinations = \u76ee\u7684\u5730 +view_bundle_fileListView_fileSize = \u6587\u4ef6\u5927\u5c0f +view_bundle_fileListView_loadFailure = \u52a0\u8f7dbundle\u6587\u4ef6\u5931\u8d25 view_bundle_fileListView_md5 = MD5 view_bundle_fileListView_sha256 = SHA256 -view_bundle_files = \u6587\u4EF6 -view_bundle_latestVersion = \u6700\u65B0\u7248\u672C -view_bundle_list_backToAll = \u8FD4\u56DE\u6240\u6709Bundles -view_bundle_list_deleteConfirm = Are you sure you want to delete the selected bundles? -view_bundle_list_deleteFailure = Failed to delete the bundle [{0}] -view_bundle_list_deleteSuccessful = You successfully deleted the bundle [{0}] -view_bundle_list_deletesFailure = Failed to delete the bundles -view_bundle_list_deletesSuccessful = You successfully deleted the bundles -view_bundle_list_destinationsCount = Destinations Count +view_bundle_files = \u6587\u4ef6 +view_bundle_latestVersion = \u6700\u65b0\u7248\u672c +view_bundle_list_backToAll = \u8fd4\u56de\u6240\u6709Bundles +view_bundle_list_deleteConfirm = \u786e\u5b9a\u8981\u5220\u9664\u9009\u62e9\u7684bundles? +view_bundle_list_deleteFailure = \u5220\u9664bundle [{0}]\u5931\u8d25 +view_bundle_list_deleteSuccessful = \u5220\u9664bundle [{0}]\u6210\u529f +view_bundle_list_deletesFailure = \u5220\u9664bundles\u5931\u8d25 +view_bundle_list_deletesSuccessful = \u5220\u9664bundles\u6210\u529f +view_bundle_list_destinationsCount = \u76ee\u7684\u5730\u6570 view_bundle_list_error1 = Failed to load bundle to deploy [{0}] view_bundle_list_error2 = Failed to get a single bundle to deploy [{0}] -view_bundle_list_error3 = \u52A0\u8F7Dbundle\u5931\u8D25 +view_bundle_list_error3 = \u52a0\u8f7dbundle\u5931\u8d25 view_bundle_list_loadFailure = Failed to load the bundle to be deployed [{0}] view_bundle_list_loadWithLatestFailure = Failed to load bundle with the latest version data view_bundle_list_singleLoadFailure = Failed to get a single bundle to be deployed [{0}] -view_bundle_list_tagUpdateFailure = \u66F4\u65B0bundle\u6807\u8BB0\u5931\u8D25 -view_bundle_list_tagUpdateSuccessful = You have successfully updated the bundle tags -view_bundle_list_versionsCount = \u7248\u672C\u6570\u91CF -view_bundle_purge = \u6E05\u9664 +view_bundle_list_tagUpdateFailure = \u66f4\u65b0bundle\u6807\u8bb0\u5931\u8d25 +view_bundle_list_tagUpdateSuccessful = \u66f4\u65b0bundle\u6807\u7b7e\u6210\u529f +view_bundle_list_versionsCount = \u7248\u672c\u6570\u91cf +view_bundle_purge = \u6e05\u9664 view_bundle_recipe = Recipe view_bundle_resDeployDS_loadFailure = Failed to load bundle resource deployments -view_bundle_revert = \u8FD8\u539F +view_bundle_revert = \u8fd8\u539f view_bundle_revertWizard_confirmStep_confirmation = Reverting Live Deployment to Previous Deployment. Click "Next" to continue... view_bundle_revertWizard_confirmStep_failedToFindLiveDeployment = Failed to find live deployment; cannot revert view_bundle_revertWizard_confirmStep_liveDeployment = Live Deployment -view_bundle_revertWizard_confirmStep_name = \u53D1\u5E03\u8FD8\u539F\u786E\u8BA4 +view_bundle_revertWizard_confirmStep_name = \u53d1\u5e03\u8fd8\u539f\u786e\u8ba4 view_bundle_revertWizard_confirmStep_noLiveDeployment = No live deployment was found for the destination [{0}] view_bundle_revertWizard_confirmStep_noLiveDeployment_concise = No live deployment was found for the destination view_bundle_revertWizard_confirmStep_noPriorDeployment = The live deployment [{0}] cannot be reverted because there is no prior deployment for the destination [{1}] @@ -1015,442 +1021,442 @@ view_bundle_revertWizard_confirmStep_noPriorDeployment_concise = The live deploy view_bundle_revertWizard_confirmStep_prevDeployment = Previous Deployment view_bundle_revertWizard_getInfoStep_cleanDeploy = Clean Deployment? (this will delete an old, existing deploy directory prior to starting the revert deployment) view_bundle_revertWizard_getInfoStep_getNameFailure = Failed to get revert deployment name -view_bundle_revertWizard_getInfoStep_name = \u63D0\u4F9B\u8FD8\u539F\u4FE1\u606F -view_bundle_revertWizard_getInfoStep_revertDeployDesc = \u90E8\u7F72\u8FD8\u539F\u63CF\u8FF0 +view_bundle_revertWizard_getInfoStep_name = \u63d0\u4f9b\u8fd8\u539f\u4fe1\u606f +view_bundle_revertWizard_getInfoStep_revertDeployDesc = \u90e8\u7f72\u8fd8\u539f\u63cf\u8ff0 view_bundle_revertWizard_getInfoStep_revertDeployDescFull = [REVERT From]\\n{0}\\n\\n[REVERT To]\\n{1} -view_bundle_revertWizard_getInfoStep_revertDeployName = \u90E8\u7F72\u8FD8\u539F\u540D\u79F0 -view_bundle_revertWizard_revertStep_name = Deploy Bundle to Destination Platforms -view_bundle_revertWizard_revertStep_reverting = \u8FD8\u539F\u4E2D... +view_bundle_revertWizard_getInfoStep_revertDeployName = \u90e8\u7f72\u8fd8\u539f\u540d\u79f0 +view_bundle_revertWizard_revertStep_name = \u90e8\u7f72Bundle\u5230\u76ee\u7684\u5e73\u53f0 +view_bundle_revertWizard_revertStep_reverting = \u8fd8\u539f\u4e2d... view_bundle_revertWizard_revertStep_scheduled = You have successfully scheduled the revert deployment! view_bundle_revertWizard_revertStep_scheduledDetails = You have successfully scheduled to revert the bundle deployment [{0}] from resource group [{1}] view_bundle_revertWizard_revertStep_scheduledFailure = Failed to schedule revert deployment! -view_bundle_revertWizard_title = Bundle\u8FD8\u539F -view_bundle_revertWizard_windowTitle = Bundle\u8FD8\u539F\u5411\u5BFC -view_bundle_tree_loadFailure = \u52A0\u8F7Dbundle\u6570\u636E\u5931\u8D25 -view_bundle_version_backToBundle = \u8FD4\u56DEBundle -view_bundle_version_bundleVersionTagUpdateFailure = \u66F4\u65B0bundle\u7248\u672C\u6807\u8BB0\u5931\u8D25 -view_bundle_version_bundleVersionTagUpdateSuccessful = \u66F4\u65B0bundle\u7248\u672C\u6807\u8BB0\u6210\u529F -view_bundle_version_deleteConfirm = \u4F60\u786E\u5B9A\u8981\u5220\u9664bundle\u7248\u672C? -view_bundle_version_deleteFailure = \u5220\u9664bundle\u7248\u672C[{0}]\u5931\u8D25 -view_bundle_version_deleteSuccessful = \u5220\u9664bundle\u7248\u672C[{0}]\u6210\u529F -view_bundle_version_loadFailure = \u52A0\u8F7Dbundle\u7248\u672C\u5931\u8D25 -view_bundle_versions = \u7248\u672C -view_configCompare_comparingConfigs = \u6BD4\u8F83\u8BBE\u7F6E -view_configCompare_configCompare = \u914D\u7F6E\u6BD4\u8F83\u7ED3\u679C\u96C6 -view_configEdit_addItem = \u6DFB\u52A0\u6761\u76EE\u81F3\u5217\u8868. -view_configEdit_confirm_1 = \u786E\u5B9A\u8981\u4ECE\u96C6\u5408\u4E2D\u5220\u9664\u6307\u5B9A\u7684\u5C5E\u6027? -view_configEdit_confirm_2 = \u786E\u5B9A\u8981\u5220\u9664\u8BE5\u884C? -view_configEdit_confirm_3 = \u786E\u5B9A\u8981\u5220\u9664 [{0}]\u9879\u9009\u4E2D\u7684 [{1}]? -view_configEdit_editRow = \u7F16\u8F91\u884C -view_configEdit_enterPropName = \u8F93\u5165\u8981\u6DFB\u52A0\u7684\u5C5E\u6027\u540D\u79F0. -view_configEdit_error_1 = \u6B64\u8D44\u6E90\u65E0\u6CD5\u914D\u7F6E. -view_configEdit_error_2 = \u6B64\u8D44\u6E90\u65E0\u6CD5\u8FDB\u884C\u8FDE\u63A5\u8BBE\u7F6E. -view_configEdit_error_3 = \u65E0\u6CD5\u6DFB\u52A0\u540D\u4E3A[{0}]\u7684\u5C5E\u6027. \u5C5E\u6027\u540D\u5728\u96C6\u5408\u4E2D\u5DF2\u7ECF\u88AB\u4F7F\u7528. -view_configEdit_files = \u6587\u4EF6 -view_configEdit_hideAll = \u9690\u85CF\u6240\u6709 -view_configEdit_jumpToSection = \u8DF3\u81F3\u6A21\u5757 -view_configEdit_msg_1 = \u589E\u52A0\u5C5E\u6027 [{0}]\u5230\u96C6\u5408. -view_configEdit_msg_2 = \u79FB\u9664\u96C6\u5408\u5185\u6240\u6709\u7684\u5C5E\u6027. -view_configEdit_msg_3 = \u4ECE\u5217\u8868\u4E2D\u5220\u9664[{0} {1}]\u6210\u529F. -view_configEdit_msg_4 = \u6DFB\u52A0\u6761\u76EE\u81F3\u5217\u8868. -view_configEdit_properties = \u5C5E\u6027 -view_configEdit_tooltip_1 = \u4ECE\u5217\u8868\u4E2D\u5220\u9664\u9009\u4E2D\u7684\u6761\u76EE. -view_configEdit_tooltip_2 = \u6DFB\u52A0\u4E00\u9879\u6761\u76EE\u5230\u5217\u8868. -view_configEdit_viewRow = \u67E5\u770B\u884C -view_configurationDetails_allPropertiesValid = \u6240\u6709\u7684\u914D\u7F6E\u4FE1\u606F\u5DF2\u7ECF\u586B\u5199\u4E86\u6709\u6548\u7684\u503C, \u73B0\u5728\u4FDD\u5B58\u914D\u7F6E. -view_configurationDetails_configNotUpdatedDueToNoChange = \u7531\u4E8E\u65B0\u65E7\u914D\u7F6E\u4E00\u81F4\uFF0C\u6240\u4EE5\u914D\u7F6E\u6CA1\u6709\u66F4\u65B0. -view_configurationDetails_error_updateFailure = \u66F4\u65B0\u914D\u7F6E\u5931\u8D25. -view_configurationDetails_messageConcise = \u914D\u7F6E\u66F4\u65B0\u6210\u529F - \u76EE\u524D\u7248\u672C\u662F {0}. -view_configurationDetails_messageDetailed = \u8D44\u6E90 [{1}]\u7684\u914D\u7F6E\u7248\u672C\u66F4\u65B0\u5230 {0} . -view_configurationDetails_noPermission = \u60A8\u6CA1\u6709\u6743\u9650\u7F16\u8F91\u6B64\u8D44\u6E90\u7684\u914D\u7F6E\u4FE1\u606F. -view_configurationDetails_somePropertiesInvalid = \u4E0B\u9762\u7684\u914D\u7F6E\u4FE1\u606F\u586B\u5199\u4E86\u975E\u6CD5\u7684\u503C: {0}. \u5FC5\u987B\u4FEE\u6539\u6B64\u4FE1\u606F\u4EE5\u4FBF\u4FDD\u5B58\u6B64\u914D\u7F6E. -view_configurationHistoryDetails_error_loadFailure = \u65E0\u6CD5\u52A0\u8F7D\u5386\u53F2\u914D\u7F6E. -view_configurationHistoryList_cannotDeleteCurrent = \u9009\u4E2D\u7684\u5386\u53F2\u914D\u7F6E\u4E2D\u7684\u4E00\u9879\u662F\u73B0\u6709\u751F\u6548\u7684\u914D\u7F6E - \u4F60\u4E0D\u80FD\u5220\u9664\u5B83. -view_configurationHistoryList_cannotDeleteGroupItems = \u4E00\u4E2A\u6216\u591A\u4E2A\u9009\u4E2D\u7684\u5386\u53F2\u914D\u7F6E\u9879\u662F\u67D0\u4E2A\u7EC4\u914D\u7F6E\u7684\u4E00\u90E8\u5206\u3002 \u5728\u5220\u9664\u5355\u4E2A\u7684\u5386\u53F2\u914D\u7F6E\u4FE1\u606F\u4E4B\u524D\uFF0C\u5FC5\u987B\u5148\u5220\u9664 \u4E0A\u4E00\u7EA7\u7684\u5386\u53F2\u7EC4\u914D\u7F6E. -view_configurationHistoryList_delete_failure = \u5220\u9664\u5386\u53F2\u914D\u7F6E\u9879\u5931\u8D25 -view_configurationHistoryList_delete_success = \u60A8\u6210\u529F\u7684\u5220\u9664\u4E86\u9009\u4E2D\u7684\u5386\u53F2\u914D\u7F6E\u9879. -view_configurationHistoryList_rollback = \u56DE\u6EDA -view_configurationHistoryList_rollback_failure = \u56DE\u6EDA\u914D\u7F6E\u5931\u8D25. \u539F\u6765\u7684\u914D\u7F6E\u4F9D\u7136\u751F\u6548. -view_configurationHistoryList_rollback_success = \u60A8\u6210\u529F\u7684\u5C06\u8BE5\u914D\u7F6E\u56DE\u6EDA\u5230\u9009\u4E2D\u7684\u5386\u53F2\u914D\u7F6E. -view_configurationHistoryList_table_clickStatusIcon = \u70B9\u51FB\u72B6\u6001\u6309\u94AE\u83B7\u53D6\u8BE6\u7EC6\u7684\u4FE1\u606F -view_configurationHistoryList_table_statusFailure = \u6B64\u914D\u7F6E\u66F4\u65B0\u5931\u8D25 -view_configurationHistoryList_table_statusInprogress = \u66F4\u65B0\u6B64\u914D\u7F6E\u7684\u64CD\u4F5C\u6B63\u5728\u8FDB\u884C\u4E2D -view_configurationHistoryList_table_statusNochange = \u6CA1\u6709\u5BF9\u6B64\u914D\u7F6E\u505A\u4EFB\u4F55\u4FEE\u6539 -view_configurationHistoryList_table_statusSuccess = \u6B64\u914D\u7F6E\u6210\u529F\u66F4\u65B0 -view_configurationHistoryList_title = \u5386\u53F2\u914D\u7F6E -view_connectionSettingsDetails_allPropertiesValid = \u6240\u6709\u8FDE\u63A5\u8BBE\u7F6E\u7684\u914D\u7F6E\u5DF2\u7ECF\u586B\u5199\u4E86\u6709\u6548\u7684\u503C,\u73B0\u5728\u53EF\u4EE5\u4FDD\u5B58\u8BBE\u7F6E. -view_connectionSettingsDetails_error_updateFailure = \u66F4\u65B0\u8FDE\u63A5\u8BBE\u7F6E\u5931\u8D25. -##view_connectionSettingsDetails_messageConcise_updateSuccess = \u8FDE\u63A5\u8BBE\u7F6E\u5DF2\u66F4\u65B0. -##view_connectionSettingsDetails_messageDetailed_updateSuccess = \u8D44\u6E90 [{0}]\u7684\u8FDE\u63A5\u8BBE\u7F6E\u5DF2\u7ECF\u66F4\u65B0. -view_connectionSettingsDetails_noPermission = \u60A8\u6CA1\u6709\u6743\u9650\u7F16\u8F91\u6B64\u8D44\u6E90\u7684\u8FDE\u63A5\u8BBE\u7F6E. -view_connectionSettingsDetails_somePropertiesInvalid = \u4E0B\u9762\u7684\u8FDE\u63A5\u8BBE\u7F6E\u4FE1\u606F\u586B\u5199\u4E86\u975E\u6CD5\u7684\u503C: {0}. \u5FC5\u987B\u4FEE\u6539\u6B64\u4FE1\u606F\u4EE5\u4FBF\u4FDD\u5B58\u6B64\u8BBE\u7F6E. -view_core_error_1 = \u67E5\u627E\u65B0\u544A\u8B66\u4FE1\u606F\u5931\u8D25 -view_core_loggedOut = \u9000\u51FA\u767B\u5F55 -view_core_noRecentAlerts = \u6CA1\u6709\u65B0\u4EA7\u751F\u7684\u544A\u8B66\u4FE1\u606F -view_core_recentAlerts = \u65B0\u4EA7\u751F [{0}] \u6761\u544A\u8B66 - \u70B9\u51FB\u8DF3\u8F6C\u5230\u65B0\u544A\u8B66\u62A5\u8868\u754C\u9762 -view_core_uncaught = \u5168\u5C40\u672A\u6355\u6349\u7684\u5F02\u5E38 -view_dashboardManager_deleteFail = \u5220\u9664\u7EDF\u8BA1\u8868\u76D8\u5931\u8D25. -view_dashboardManager_deleted = \u6210\u529F\u5220\u9664\u7EDF\u8BA1\u8868\u76D8{0} -view_dashboardManager_error = \u4FDD\u5B58\u7EDF\u8BA1\u8868\u76D8\u5931\u8D25 -view_dashboardManager_saved = \u4FDD\u5B58\u7EDF\u8BA1\u8868\u76D8{0} -view_dashboardManager_success = \u6210\u529F\u4FDD\u5B58\u7EDF\u8BA1\u8868\u76D8 -view_dashboard_favorites_error1 = \u52A0\u8F7D\u5E38\u7528\u8D44\u6E90\u5931\u8D25. -view_dashboardsManager_error1 = \u6DFB\u52A0\u65B0\u7EDF\u8BA1\u8868\u76D8\u5931\u8D25 -view_dashboardsManager_message_title_details = <h1>\u6B22\u8FCE\u4F7F\u7528RHQ</h1>\nRHQ\u9879\u76EE\u662F\u4E00\u4E2A\u62BD\u8C61\u7684\u3001\u57FA\u4E8E\u63D2\u4EF6\u7684\u7CFB\u7EDF\u7BA1\u7406\u5957\u4EF6\u3002\u901A\u8FC7\u4E00\u7CFB\u5217\u6838\u5FC3\u529F\u80FD\u63D0\u4F9B\u591A\u4EA7\u54C1\u548C\u5E73\u53F0\u7684\u53EF\u6269\u5C55\u7684\u96C6\u6210\u7BA1\u7406. \u672C\u9879\u76EE\u5206\u5C42\u6A21\u5757\u5177\u6709\u7075\u6D3B\u53D1\u5E03\u67B6\u6784. \u5B83\u63D0\u4F9B\u4E86\u4E00\u4E2A\u6838\u5FC3\u7528\u6237\u754C\u9762\u4F9B\u8DE8\u6574\u4E2A\u4F01\u4E1A\u7684\u5BA1\u8BA1\u548C\u5386\u53F2\u7BA1\u7406. \u670D\u52A1\u5668/\u4EE3\u7406\u67B6\u6784\u63D0\u4F9B\u8FDC\u7A0B\u7BA1\u7406,\u63D2\u4EF6\u63D0\u4F9B\u7279\u5B9A\u4EA7\u54C1\u7684\u7BA1\u7406\u652F\u6301.\n \u901A\u8FC7\u5355\u51FB(\u7F16\u8F91\u6A21\u5F0F)\u6309\u94AE\u53EF\u4EE5\u7F16\u8F91\u9ED8\u8BA4\u7EDF\u8BA1\u8868\u76D8. -view_dashboards_confirm1 = \u60A8\u786E\u5B9A\u8981\u5220\u9664\uFF1F -view_dashboards_portlets_refresh_fail1 = \u4FEE\u6539portlets\u81EA\u52A8\u5237\u65B0\u7684\u95F4\u9694\u65F6\u95F4\u5931\u8D25 -view_dashboards_portlets_refresh_fail2 = \u505C\u7528portlets\u81EA\u52A8\u5237\u65B0\u7684\u91CD\u8F7D\u5931\u8D25 -view_dashboards_portlets_refresh_multiple_min = {0} \u5206\u949F -view_dashboards_portlets_refresh_none = \u65E0\u5237\u65B0 -view_dashboards_portlets_refresh_one_min = 1 \u5206\u652F -view_dashboards_portlets_refresh_success1 = \u6210\u529F\u4FEE\u6539portlets\u81EA\u52A8\u5237\u65B0\u7684\u95F4\u9694\u65F6\u95F4 -view_dashboards_portlets_refresh_success2 = \u6210\u529F\u505C\u7528portlets\u81EA\u52A8\u5237\u65B0\u7684\u91CD\u8F7D -view_dashboards_title = \u7EDF\u8BA1\u8868\u76D8 -view_dynagroup_children = \u5B50\u52A8\u6001\u7EC4 -view_dynagroup_compatible = \u517C\u5BB9\u6027 -view_dynagroup_definitionAlreadyExists = \u5DF2\u7ECF\u5B58\u5728\u4EE5\u8BE5\u540D\u79F0\u547D\u540D\u7684\u7EC4\u5B9A\u4E49 -view_dynagroup_definitionCreated = \u60A8\u6210\u529F\u7684\u521B\u5EFA\u540D\u79F0\u4E3A[{0}]\u7684\u7EC4\u5B9A\u4E49 -view_dynagroup_definitionLoadFailure = \u52A0\u8F7D\u6240\u6709\u7684\u7EC4\u5B9A\u4E49\u5931\u8D25 -view_dynagroup_definitions = \u52A8\u6001\u7EC4\u5B9A\u4E49 -view_dynagroup_deleteFailureSelection = \u5220\u9664\u9009\u4E2D\u7684\u7EC4\u5B9A\u4E49\u5931\u8D25 -view_dynagroup_deleteSuccessfulSelection = \u6210\u529F\u7684\u5220\u9664 [{0}]\u7EC4\u5B9A\u4E49 -view_dynagroup_editing = \u7F16\u8F91 [{0}] -view_dynagroup_exprBuilder_addExpression = \u6DFB\u52A0\u8868\u8FBE\u5F0F -view_dynagroup_exprBuilder_comparisonType = \u5BF9\u6BD4\u7C7B\u578B -view_dynagroup_exprBuilder_comparisonType_contains = \u5305\u542B -view_dynagroup_exprBuilder_comparisonType_endsWith = ends with -view_dynagroup_exprBuilder_comparisonType_equals = \u76F8\u7B49 -view_dynagroup_exprBuilder_comparisonType_startsWith = starts with -view_dynagroup_exprBuilder_comparisonType_tooltip = \u5BF9\u6BD4\u7C7B\u578B -view_dynagroup_exprBuilder_definingPlugin = \u5B9A\u4E49\u63D2\u4EF6 -view_dynagroup_exprBuilder_definingPlugin_tooltip = \u67E5\u627E\u63D2\u4EF6 -view_dynagroup_exprBuilder_expression = \u8868\u8FBE\u5F0F -view_dynagroup_exprBuilder_expressionType = \u8868\u8FBE\u5F0F\u7C7B\u578B -view_dynagroup_exprBuilder_expressionType_pluginConfig = \u63D2\u4EF6\u914D\u7F6E -view_dynagroup_exprBuilder_expressionType_resource = \u8D44\u6E90 -view_dynagroup_exprBuilder_expressionType_resourceCategory = \u8D44\u6E90\u79CD\u7C7B -view_dynagroup_exprBuilder_expressionType_resourceConfig = \u8D44\u6E90\u914D\u7F6E -view_dynagroup_exprBuilder_expressionType_resourceType = \u8D44\u6E90\u7C7B\u578B -view_dynagroup_exprBuilder_expressionType_tooltip = \u6B64\u8868\u8FBE\u5F0F\u6307\u5B9A\u8868\u8FBE\u5F0F\u7684\u5C5E\u6027\u7C7B\u578B: \u8D44\u6E90: \u8D44\u6E90\u5C5E\u6027\uFF1A\u6BD4\u5982\u540D\u79F0\u548C\u7248\u672C \u8D44\u6E90\u7C7B\u578B: \u641C\u5BFB\u6307\u5B9A\u7C7B\u578B\u7684\u8D44\u6E90 \u8D44\u6E90\u7C7B\u522B: \u6309\u7167\u7C7B\u522B\u67E5\u627E\u8D44\u6E90: \u5E73\u53F0, \u670D\u52A1\u5668, \u670D\u52A1 \u7279\u5F81: \u5B58\u5728\u76D1\u63A7\u70B9\u7684\u8D44\u6E90 \u63D2\u4EF6\u914D\u7F6E: \u6309\u7167\u63D2\u4EF6\u7EC4\u4EF6\u548C\u7EC4\u4EF6\u7684\u914D\u7F6E\u8BBE\u7F6E\u67E5\u8BE2 \u8D44\u6E90\u914D\u7F6E: \u6309\u7167\u88AB\u7BA1\u8D44\u6E90\u7684\u914D\u7F6E\u8BBE\u7F6E\u67E5\u8BE2 -view_dynagroup_exprBuilder_expressionType_trait = \u7279\u5F81 +view_bundle_revertWizard_title = Bundle\u8fd8\u539f +view_bundle_revertWizard_windowTitle = Bundle\u8fd8\u539f\u5411\u5bfc +view_bundle_tree_loadFailure = \u52a0\u8f7dbundle\u6570\u636e\u5931\u8d25 +view_bundle_version_backToBundle = \u8fd4\u56deBundle +view_bundle_version_bundleVersionTagUpdateFailure = \u66f4\u65b0bundle\u7248\u672c\u6807\u8bb0\u5931\u8d25 +view_bundle_version_bundleVersionTagUpdateSuccessful = \u66f4\u65b0bundle\u7248\u672c\u6807\u8bb0\u6210\u529f +view_bundle_version_deleteConfirm = \u4f60\u786e\u5b9a\u8981\u5220\u9664bundle\u7248\u672c? +view_bundle_version_deleteFailure = \u5220\u9664bundle\u7248\u672c[{0}]\u5931\u8d25 +view_bundle_version_deleteSuccessful = \u5220\u9664bundle\u7248\u672c[{0}]\u6210\u529f +view_bundle_version_loadFailure = \u52a0\u8f7dbundle\u7248\u672c\u5931\u8d25 +view_bundle_versions = \u7248\u672c +view_configCompare_comparingConfigs = \u6bd4\u8f83\u8bbe\u7f6e +view_configCompare_configCompare = \u914d\u7f6e\u6bd4\u8f83\u7ed3\u679c\u96c6 +view_configEdit_addItem = \u6dfb\u52a0\u6761\u76ee\u81f3\u5217\u8868. +view_configEdit_confirm_1 = \u786e\u5b9a\u8981\u4ece\u96c6\u5408\u4e2d\u5220\u9664\u6307\u5b9a\u7684\u5c5e\u6027? +view_configEdit_confirm_2 = \u786e\u5b9a\u8981\u5220\u9664\u8be5\u884c? +view_configEdit_confirm_3 = \u786e\u5b9a\u8981\u5220\u9664 [{0}]\u9879\u9009\u4e2d\u7684 [{1}]? +view_configEdit_editRow = \u7f16\u8f91\u884c +view_configEdit_enterPropName = \u8f93\u5165\u8981\u6dfb\u52a0\u7684\u5c5e\u6027\u540d\u79f0. +view_configEdit_error_1 = \u6b64\u8d44\u6e90\u65e0\u6cd5\u914d\u7f6e. +view_configEdit_error_2 = \u6b64\u8d44\u6e90\u65e0\u6cd5\u8fdb\u884c\u8fde\u63a5\u8bbe\u7f6e. +view_configEdit_error_3 = \u65e0\u6cd5\u6dfb\u52a0\u540d\u4e3a[{0}]\u7684\u5c5e\u6027. \u5c5e\u6027\u540d\u5728\u96c6\u5408\u4e2d\u5df2\u7ecf\u88ab\u4f7f\u7528. +view_configEdit_files = \u6587\u4ef6 +view_configEdit_hideAll = \u9690\u85cf\u6240\u6709 +view_configEdit_jumpToSection = \u8df3\u81f3\u6a21\u5757 +view_configEdit_msg_1 = \u589e\u52a0\u5c5e\u6027 [{0}]\u5230\u96c6\u5408. +view_configEdit_msg_2 = \u79fb\u9664\u96c6\u5408\u5185\u6240\u6709\u7684\u5c5e\u6027. +view_configEdit_msg_3 = \u4ece\u5217\u8868\u4e2d\u5220\u9664[{0} {1}]\u6210\u529f. +view_configEdit_msg_4 = \u6dfb\u52a0\u6761\u76ee\u81f3\u5217\u8868. +view_configEdit_properties = \u5c5e\u6027 +view_configEdit_tooltip_1 = \u4ece\u5217\u8868\u4e2d\u5220\u9664\u9009\u4e2d\u7684\u6761\u76ee. +view_configEdit_tooltip_2 = \u6dfb\u52a0\u4e00\u9879\u6761\u76ee\u5230\u5217\u8868. +view_configEdit_viewRow = \u67e5\u770b\u884c +view_configurationDetails_allPropertiesValid = \u6240\u6709\u7684\u914d\u7f6e\u4fe1\u606f\u5df2\u7ecf\u586b\u5199\u4e86\u6709\u6548\u7684\u503c, \u73b0\u5728\u4fdd\u5b58\u914d\u7f6e. +view_configurationDetails_configNotUpdatedDueToNoChange = \u7531\u4e8e\u65b0\u65e7\u914d\u7f6e\u4e00\u81f4\uff0c\u6240\u4ee5\u914d\u7f6e\u6ca1\u6709\u66f4\u65b0. +view_configurationDetails_error_updateFailure = \u66f4\u65b0\u914d\u7f6e\u5931\u8d25. +view_configurationDetails_messageConcise = \u914d\u7f6e\u66f4\u65b0\u6210\u529f - \u76ee\u524d\u7248\u672c\u662f {0}. +view_configurationDetails_messageDetailed = \u8d44\u6e90 [{1}]\u7684\u914d\u7f6e\u7248\u672c\u66f4\u65b0\u5230 {0} . +view_configurationDetails_noPermission = \u60a8\u6ca1\u6709\u6743\u9650\u7f16\u8f91\u6b64\u8d44\u6e90\u7684\u914d\u7f6e\u4fe1\u606f. +view_configurationDetails_somePropertiesInvalid = \u4e0b\u9762\u7684\u914d\u7f6e\u4fe1\u606f\u586b\u5199\u4e86\u975e\u6cd5\u7684\u503c: {0}. \u5fc5\u987b\u4fee\u6539\u6b64\u4fe1\u606f\u4ee5\u4fbf\u4fdd\u5b58\u6b64\u914d\u7f6e. +view_configurationHistoryDetails_error_loadFailure = \u65e0\u6cd5\u52a0\u8f7d\u5386\u53f2\u914d\u7f6e. +view_configurationHistoryList_cannotDeleteCurrent = \u9009\u4e2d\u7684\u5386\u53f2\u914d\u7f6e\u4e2d\u7684\u4e00\u9879\u662f\u73b0\u6709\u751f\u6548\u7684\u914d\u7f6e - \u4f60\u4e0d\u80fd\u5220\u9664\u5b83. +view_configurationHistoryList_cannotDeleteGroupItems = \u4e00\u4e2a\u6216\u591a\u4e2a\u9009\u4e2d\u7684\u5386\u53f2\u914d\u7f6e\u9879\u662f\u67d0\u4e2a\u7ec4\u914d\u7f6e\u7684\u4e00\u90e8\u5206\u3002 \u5728\u5220\u9664\u5355\u4e2a\u7684\u5386\u53f2\u914d\u7f6e\u4fe1\u606f\u4e4b\u524d\uff0c\u5fc5\u987b\u5148\u5220\u9664 \u4e0a\u4e00\u7ea7\u7684\u5386\u53f2\u7ec4\u914d\u7f6e. +view_configurationHistoryList_delete_failure = \u5220\u9664\u5386\u53f2\u914d\u7f6e\u9879\u5931\u8d25 +view_configurationHistoryList_delete_success = \u60a8\u6210\u529f\u7684\u5220\u9664\u4e86\u9009\u4e2d\u7684\u5386\u53f2\u914d\u7f6e\u9879. +view_configurationHistoryList_rollback = \u56de\u6eda +view_configurationHistoryList_rollback_failure = \u56de\u6eda\u914d\u7f6e\u5931\u8d25. \u539f\u6765\u7684\u914d\u7f6e\u4f9d\u7136\u751f\u6548. +view_configurationHistoryList_rollback_success = \u60a8\u6210\u529f\u7684\u5c06\u8be5\u914d\u7f6e\u56de\u6eda\u5230\u9009\u4e2d\u7684\u5386\u53f2\u914d\u7f6e. +view_configurationHistoryList_table_clickStatusIcon = \u70b9\u51fb\u72b6\u6001\u6309\u94ae\u83b7\u53d6\u8be6\u7ec6\u7684\u4fe1\u606f +view_configurationHistoryList_table_statusFailure = \u6b64\u914d\u7f6e\u66f4\u65b0\u5931\u8d25 +view_configurationHistoryList_table_statusInprogress = \u66f4\u65b0\u6b64\u914d\u7f6e\u7684\u64cd\u4f5c\u6b63\u5728\u8fdb\u884c\u4e2d +view_configurationHistoryList_table_statusNochange = \u6ca1\u6709\u5bf9\u6b64\u914d\u7f6e\u505a\u4efb\u4f55\u4fee\u6539 +view_configurationHistoryList_table_statusSuccess = \u6b64\u914d\u7f6e\u6210\u529f\u66f4\u65b0 +view_configurationHistoryList_title = \u5386\u53f2\u914d\u7f6e +view_connectionSettingsDetails_allPropertiesValid = \u6240\u6709\u8fde\u63a5\u8bbe\u7f6e\u7684\u914d\u7f6e\u5df2\u7ecf\u586b\u5199\u4e86\u6709\u6548\u7684\u503c,\u73b0\u5728\u53ef\u4ee5\u4fdd\u5b58\u8bbe\u7f6e. +view_connectionSettingsDetails_error_updateFailure = \u66f4\u65b0\u8fde\u63a5\u8bbe\u7f6e\u5931\u8d25. +##view_connectionSettingsDetails_messageConcise_updateSuccess = \u8fde\u63a5\u8bbe\u7f6e\u5df2\u66f4\u65b0. +##view_connectionSettingsDetails_messageDetailed_updateSuccess = \u8d44\u6e90 [{0}]\u7684\u8fde\u63a5\u8bbe\u7f6e\u5df2\u7ecf\u66f4\u65b0. +view_connectionSettingsDetails_noPermission = \u60a8\u6ca1\u6709\u6743\u9650\u7f16\u8f91\u6b64\u8d44\u6e90\u7684\u8fde\u63a5\u8bbe\u7f6e. +view_connectionSettingsDetails_somePropertiesInvalid = \u4e0b\u9762\u7684\u8fde\u63a5\u8bbe\u7f6e\u4fe1\u606f\u586b\u5199\u4e86\u975e\u6cd5\u7684\u503c: {0}. \u5fc5\u987b\u4fee\u6539\u6b64\u4fe1\u606f\u4ee5\u4fbf\u4fdd\u5b58\u6b64\u8bbe\u7f6e. +view_core_error_1 = \u67e5\u627e\u65b0\u544a\u8b66\u4fe1\u606f\u5931\u8d25 +view_core_loggedOut = \u9000\u51fa\u767b\u5f55 +view_core_noRecentAlerts = \u6ca1\u6709\u65b0\u4ea7\u751f\u7684\u544a\u8b66\u4fe1\u606f +view_core_recentAlerts = \u65b0\u4ea7\u751f [{0}] \u6761\u544a\u8b66 - \u70b9\u51fb\u8df3\u8f6c\u5230\u65b0\u544a\u8b66\u62a5\u8868\u754c\u9762 +view_core_uncaught = \u5168\u5c40\u672a\u6355\u6349\u7684\u5f02\u5e38 +view_dashboardManager_deleteFail = \u5220\u9664\u7edf\u8ba1\u8868\u76d8\u5931\u8d25. +view_dashboardManager_deleted = \u6210\u529f\u5220\u9664\u7edf\u8ba1\u8868\u76d8{0} +view_dashboardManager_error = \u4fdd\u5b58\u7edf\u8ba1\u8868\u76d8\u5931\u8d25 +view_dashboardManager_saved = \u4fdd\u5b58\u7edf\u8ba1\u8868\u76d8{0} +view_dashboardManager_success = \u6210\u529f\u4fdd\u5b58\u7edf\u8ba1\u8868\u76d8 +view_dashboard_favorites_error1 = \u52a0\u8f7d\u5e38\u7528\u8d44\u6e90\u5931\u8d25. +view_dashboardsManager_error1 = \u6dfb\u52a0\u65b0\u7edf\u8ba1\u8868\u76d8\u5931\u8d25 +view_dashboardsManager_message_title_details = <h1>\u6b22\u8fce\u4f7f\u7528RHQ</h1>\nRHQ\u9879\u76ee\u662f\u4e00\u4e2a\u62bd\u8c61\u7684\u3001\u57fa\u4e8e\u63d2\u4ef6\u7684\u7cfb\u7edf\u7ba1\u7406\u5957\u4ef6\u3002\u901a\u8fc7\u4e00\u7cfb\u5217\u6838\u5fc3\u529f\u80fd\u63d0\u4f9b\u591a\u4ea7\u54c1\u548c\u5e73\u53f0\u7684\u53ef\u6269\u5c55\u7684\u96c6\u6210\u7ba1\u7406. \u672c\u9879\u76ee\u5206\u5c42\u6a21\u5757\u5177\u6709\u7075\u6d3b\u53d1\u5e03\u67b6\u6784. \u5b83\u63d0\u4f9b\u4e86\u4e00\u4e2a\u6838\u5fc3\u7528\u6237\u754c\u9762\u4f9b\u8de8\u6574\u4e2a\u4f01\u4e1a\u7684\u5ba1\u8ba1\u548c\u5386\u53f2\u7ba1\u7406. \u670d\u52a1\u5668/\u4ee3\u7406\u67b6\u6784\u63d0\u4f9b\u8fdc\u7a0b\u7ba1\u7406,\u63d2\u4ef6\u63d0\u4f9b\u7279\u5b9a\u4ea7\u54c1\u7684\u7ba1\u7406\u652f\u6301.\n \u901a\u8fc7\u5355\u51fb(\u7f16\u8f91\u6a21\u5f0f)\u6309\u94ae\u53ef\u4ee5\u7f16\u8f91\u9ed8\u8ba4\u7edf\u8ba1\u8868\u76d8. +view_dashboards_confirm1 = \u60a8\u786e\u5b9a\u8981\u5220\u9664\uff1f +view_dashboards_portlets_refresh_fail1 = \u4fee\u6539portlets\u81ea\u52a8\u5237\u65b0\u7684\u95f4\u9694\u65f6\u95f4\u5931\u8d25 +view_dashboards_portlets_refresh_fail2 = \u505c\u7528portlets\u81ea\u52a8\u5237\u65b0\u7684\u91cd\u8f7d\u5931\u8d25 +view_dashboards_portlets_refresh_multiple_min = {0} \u5206\u949f +view_dashboards_portlets_refresh_none = \u65e0\u5237\u65b0 +view_dashboards_portlets_refresh_one_min = 1 \u5206\u652f +view_dashboards_portlets_refresh_success1 = \u6210\u529f\u4fee\u6539portlets\u81ea\u52a8\u5237\u65b0\u7684\u95f4\u9694\u65f6\u95f4 +view_dashboards_portlets_refresh_success2 = \u6210\u529f\u505c\u7528portlets\u81ea\u52a8\u5237\u65b0\u7684\u91cd\u8f7d +view_dashboards_title = \u7edf\u8ba1\u8868\u76d8 +view_dynagroup_children = \u5b50\u52a8\u6001\u7ec4 +view_dynagroup_compatible = \u517c\u5bb9\u6027 +view_dynagroup_definitionAlreadyExists = \u5df2\u7ecf\u5b58\u5728\u4ee5\u8be5\u540d\u79f0\u547d\u540d\u7684\u7ec4\u5b9a\u4e49 +view_dynagroup_definitionCreated = \u60a8\u6210\u529f\u7684\u521b\u5efa\u540d\u79f0\u4e3a[{0}]\u7684\u7ec4\u5b9a\u4e49 +view_dynagroup_definitionLoadFailure = \u52a0\u8f7d\u6240\u6709\u7684\u7ec4\u5b9a\u4e49\u5931\u8d25 +view_dynagroup_definitions = \u52a8\u6001\u7ec4\u5b9a\u4e49 +view_dynagroup_deleteFailureSelection = \u5220\u9664\u9009\u4e2d\u7684\u7ec4\u5b9a\u4e49\u5931\u8d25 +view_dynagroup_deleteSuccessfulSelection = \u6210\u529f\u7684\u5220\u9664 [{0}]\u7ec4\u5b9a\u4e49 +view_dynagroup_editing = \u7f16\u8f91 [{0}] +view_dynagroup_exprBuilder_addExpression = \u6dfb\u52a0\u8868\u8fbe\u5f0f +view_dynagroup_exprBuilder_comparisonType = \u5bf9\u6bd4\u7c7b\u578b +view_dynagroup_exprBuilder_comparisonType_contains = \u5305\u542b +view_dynagroup_exprBuilder_comparisonType_endsWith = \u7ed3\u5c3e +view_dynagroup_exprBuilder_comparisonType_equals = \u76f8\u7b49 +view_dynagroup_exprBuilder_comparisonType_startsWith = \u5f00\u59cb +view_dynagroup_exprBuilder_comparisonType_tooltip = \u5bf9\u6bd4\u7c7b\u578b +view_dynagroup_exprBuilder_definingPlugin = \u5b9a\u4e49\u63d2\u4ef6 +view_dynagroup_exprBuilder_definingPlugin_tooltip = \u67e5\u627e\u63d2\u4ef6 +view_dynagroup_exprBuilder_expression = \u8868\u8fbe\u5f0f +view_dynagroup_exprBuilder_expressionType = \u8868\u8fbe\u5f0f\u7c7b\u578b +view_dynagroup_exprBuilder_expressionType_pluginConfig = \u63d2\u4ef6\u914d\u7f6e +view_dynagroup_exprBuilder_expressionType_resource = \u8d44\u6e90 +view_dynagroup_exprBuilder_expressionType_resourceCategory = \u8d44\u6e90\u79cd\u7c7b +view_dynagroup_exprBuilder_expressionType_resourceConfig = \u8d44\u6e90\u914d\u7f6e +view_dynagroup_exprBuilder_expressionType_resourceType = \u8d44\u6e90\u7c7b\u578b +view_dynagroup_exprBuilder_expressionType_tooltip = \u6b64\u8868\u8fbe\u5f0f\u6307\u5b9a\u8868\u8fbe\u5f0f\u7684\u5c5e\u6027\u7c7b\u578b: \u8d44\u6e90: \u8d44\u6e90\u5c5e\u6027\uff1a\u6bd4\u5982\u540d\u79f0\u548c\u7248\u672c \u8d44\u6e90\u7c7b\u578b: \u641c\u5bfb\u6307\u5b9a\u7c7b\u578b\u7684\u8d44\u6e90 \u8d44\u6e90\u7c7b\u522b: \u6309\u7167\u7c7b\u522b\u67e5\u627e\u8d44\u6e90: \u5e73\u53f0, \u670d\u52a1\u5668, \u670d\u52a1 \u7279\u5f81: \u5b58\u5728\u76d1\u63a7\u70b9\u7684\u8d44\u6e90 \u63d2\u4ef6\u914d\u7f6e: \u6309\u7167\u63d2\u4ef6\u7ec4\u4ef6\u548c\u7ec4\u4ef6\u7684\u914d\u7f6e\u8bbe\u7f6e\u67e5\u8be2 \u8d44\u6e90\u914d\u7f6e: \u6309\u7167\u88ab\u7ba1\u8d44\u6e90\u7684\u914d\u7f6e\u8bbe\u7f6e\u67e5\u8be2 +view_dynagroup_exprBuilder_expressionType_trait = \u7279\u5f81 view_dynagroup_exprBuilder_expression_tooltip = This is the full expression that is represented by the selections in the form below. This text will be added to your group definition expression text when you click the "Add Expression" button. -view_dynagroup_exprBuilder_groupBy = \u5206\u7EC4 +view_dynagroup_exprBuilder_groupBy = \u5206\u7ec4 view_dynagroup_exprBuilder_groupBy_tooltip = GroupBy will cause the system to pivot on the values from the entered expressions creating a separate group for each value. For example, GroupBy on the cluster name to create a group for each cluster with all cluster members in it. -view_dynagroup_exprBuilder_noPlugins = --\u65E0\u63D2\u4EF6-- -view_dynagroup_exprBuilder_noProperties = -\u65E0\u5C5E\u6027-- -view_dynagroup_exprBuilder_noResourceTypes = --\u65E0\u8D44\u6E90\u7C7B\u578B-- -view_dynagroup_exprBuilder_pluginLoadFailure = \u65E0\u6CD5\u83B7\u53D6\u63D2\u4EF6\u5217\u8868 -view_dynagroup_exprBuilder_propLoadFailure = \u65E0\u6CD5\u83B7\u53D6\u5C5E\u6027\u5217\u8868 -view_dynagroup_exprBuilder_propertyName = \u5C5E\u6027\u540D\u79F0 -view_dynagroup_exprBuilder_propertyName_tooltip = \u7528\u4E8E\u67E5\u8BE2\u7684\u5C5E\u6027\u540D\u79F0. \u8FD9\u662F\u7531\u8868\u8FBE\u5F0F\u7C7B\u578B\u548C\u8D44\u6E90\u7C7B\u578B\u51B3\u5B9A\u7684. -view_dynagroup_exprBuilder_resTypeLoadFailure = \u65E0\u6CD5\u83B7\u53D6\u63D2\u4EF6[{0}]\u7684\u8D44\u6E90\u7C7B\u578B\u5217\u8868 -view_dynagroup_exprBuilder_resource = \u8D44\u6E90 -view_dynagroup_exprBuilder_resourceType = \u8D44\u6E90\u7C7B\u578B -view_dynagroup_exprBuilder_resourceType_tooltip = \u8D44\u6E90\u7C7B\u578B +view_dynagroup_exprBuilder_noPlugins = --\u65e0\u63d2\u4ef6-- +view_dynagroup_exprBuilder_noProperties = -\u65e0\u5c5e\u6027-- +view_dynagroup_exprBuilder_noResourceTypes = --\u65e0\u8d44\u6e90\u7c7b\u578b-- +view_dynagroup_exprBuilder_pluginLoadFailure = \u65e0\u6cd5\u83b7\u53d6\u63d2\u4ef6\u5217\u8868 +view_dynagroup_exprBuilder_propLoadFailure = \u65e0\u6cd5\u83b7\u53d6\u5c5e\u6027\u5217\u8868 +view_dynagroup_exprBuilder_propertyName = \u5c5e\u6027\u540d\u79f0 +view_dynagroup_exprBuilder_propertyName_tooltip = \u7528\u4e8e\u67e5\u8be2\u7684\u5c5e\u6027\u540d\u79f0. \u8fd9\u662f\u7531\u8868\u8fbe\u5f0f\u7c7b\u578b\u548c\u8d44\u6e90\u7c7b\u578b\u51b3\u5b9a\u7684. +view_dynagroup_exprBuilder_resTypeLoadFailure = \u65e0\u6cd5\u83b7\u53d6\u63d2\u4ef6[{0}]\u7684\u8d44\u6e90\u7c7b\u578b\u5217\u8868 +view_dynagroup_exprBuilder_resource = \u8d44\u6e90 +view_dynagroup_exprBuilder_resourceType = \u8d44\u6e90\u7c7b\u578b +view_dynagroup_exprBuilder_resourceType_tooltip = \u8d44\u6e90\u7c7b\u578b view_dynagroup_exprBuilder_resource_child = Child view_dynagroup_exprBuilder_resource_grandparent = Grandparent view_dynagroup_exprBuilder_resource_greatGrandparent = GreatGrandparent view_dynagroup_exprBuilder_resource_greatGreatGrandparent = GreatGreatGrandparent view_dynagroup_exprBuilder_resource_parent = Parent -view_dynagroup_exprBuilder_resource_resource = Resource -view_dynagroup_exprBuilder_resource_tooltip = \u9009\u62E9\u8981\u67E5\u8BE2\u8D44\u6E90\u6240\u5728\u7684\u5C42\u7EA7. \u4F8B\u5982, \u9009\u4E2D "parent"\u4F1A\u67E5\u8BE2\u51FA\u7236\u8D44\u6E90\u7684\u6EE1\u8DB3\u5269\u4F59\u8868\u8FBE\u5F0F\u7684\u8D44\u6E90. +view_dynagroup_exprBuilder_resource_resource = \u8d44\u6e90 +view_dynagroup_exprBuilder_resource_tooltip = \u9009\u62e9\u8981\u67e5\u8be2\u8d44\u6e90\u6240\u5728\u7684\u5c42\u7ea7. \u4f8b\u5982, \u9009\u4e2d "parent"\u4f1a\u67e5\u8be2\u51fa\u7236\u8d44\u6e90\u7684\u6ee1\u8db3\u5269\u4f59\u8868\u8fbe\u5f0f\u7684\u8d44\u6e90. ##view_dynagroup_exprBuilder_savedExpression = Saved Expression -view_dynagroup_exprBuilder_title = \u8868\u8FBE\u5F0F\u7F16\u8BD1 -view_dynagroup_exprBuilder_unset = \u6062\u590D\u8BBE\u7F6E +view_dynagroup_exprBuilder_title = \u8868\u8fbe\u5f0f\u7f16\u8bd1 +view_dynagroup_exprBuilder_unset = \u6062\u590d\u8bbe\u7f6e view_dynagroup_exprBuilder_unset_tooltip = Unset will find all of the values that have a null value in the database. This is not possible using the "=" operator because of how databases store and query data. -view_dynagroup_exprBuilder_value_tooltip = \u67E5\u8BE2\u8868\u8FBE\u5F0F\u5B57\u7B26\u4E32\u7684\u503C -view_dynagroup_expression = \u8868\u8FBE\u5F0F -view_dynagroup_expressionBuilderIconTooltip = \u8868\u8FBE\u5F0F\u7F16\u8BD1\u4E2D... -view_dynagroup_expressionSet = \u8868\u8FBE\u5F0F\u7EC4 -view_dynagroup_lastCalculationTime = \u4E0A\u6B21\u8BA1\u7B97\u6301\u7EED\u65F6\u95F4 -view_dynagroup_loadDefinitionFailure = \u52A0\u8F7D\u7EC4\u5B9A\u4E49 [{0}]\u5931\u8D25 -view_dynagroup_loadDefinitionMissing = \u6CA1\u6709ID\u662F[{0}]\u7684\u7EC4\u5B9A\u4E49 +view_dynagroup_exprBuilder_value_tooltip = \u67e5\u8be2\u8868\u8fbe\u5f0f\u5b57\u7b26\u4e32\u7684\u503c +view_dynagroup_expression = \u8868\u8fbe\u5f0f +view_dynagroup_expressionBuilderIconTooltip = \u8868\u8fbe\u5f0f\u7f16\u8bd1\u4e2d... +view_dynagroup_expressionSet = \u8868\u8fbe\u5f0f\u7ec4 +view_dynagroup_lastCalculationTime = \u4e0a\u6b21\u8ba1\u7b97\u6301\u7eed\u65f6\u95f4 +view_dynagroup_loadDefinitionFailure = \u52a0\u8f7d\u7ec4\u5b9a\u4e49 [{0}]\u5931\u8d25 +view_dynagroup_loadDefinitionMissing = \u6ca1\u6709ID\u662f[{0}]\u7684\u7ec4\u5b9a\u4e49 view_dynagroup_mixed = Mixed -view_dynagroup_newGroupDefinition = \u65B0\u5EFA\u7EC4\u5B9A\u4E49 -view_dynagroup_nextCalculationTime = \u4E0B\u6B21\u8BA1\u7B97\u6301\u7EED\u65F6\u95F4 -view_dynagroup_permDenied = \u60A8\u6CA1\u6709\u67E5\u770B\u7EC4\u5B9A\u4E49\u7684\u6743\u9650 -view_dynagroup_recalcFailure = \u91CD\u7B97\u7EC4\u5B9A\u4E49\u5931\u8D25 +view_dynagroup_newGroupDefinition = \u65b0\u5efa\u7ec4\u5b9a\u4e49 +view_dynagroup_nextCalculationTime = \u4e0b\u6b21\u8ba1\u7b97\u6301\u7eed\u65f6\u95f4 +view_dynagroup_permDenied = \u60a8\u6ca1\u6709\u67e5\u770b\u7ec4\u5b9a\u4e49\u7684\u6743\u9650 +view_dynagroup_recalcFailure = \u91cd\u7b97\u7ec4\u5b9a\u4e49\u5931\u8d25 view_dynagroup_recalcFailureSelection = Failed to recalculated the selected group definitions -view_dynagroup_recalcSuccessful = \u7EC4\u5B9A\u4E49\u5DF2\u7ECF\u91CD\u65B0\u8BA1\u7B97 +view_dynagroup_recalcSuccessful = \u7ec4\u5b9a\u4e49\u5df2\u7ecf\u91cd\u65b0\u8ba1\u7b97 view_dynagroup_recalcSuccessfulSelection = You have successfully recalculated [{0}] group definitions -view_dynagroup_recalculate = \u91CD\u7B97 -view_dynagroup_recalculationInterval = \u91CD\u7B97\u95F4\u9694 (ms) -view_dynagroup_recursive = \u9012\u5F52 -view_dynagroup_saveAndRecalculate = \u4FDD\u5B58&\u91CD\u7B97 -view_dynagroup_saveFailure = \u4FDD\u5B58\u540D\u79F0\u4E3A[{0}]\u7684\u7EC4\u5B9A\u4E49\u5931\u8D25 -view_dynagroup_saveSuccessful = \u60A8\u6210\u529F\u7684\u4FDD\u5B58\u4E86\u540D\u79F0\u4E3A[{0}]\u7684\u7EC4\u5B9A\u4E49 -view_dynagroup_singleSaveFailure = \u62A5\u9519\u4E86 - \u6B63\u5E38\u5E94\u8BE5\u53EA\u521B\u5EFA\u5355\u4E2A\u7EC4\u5B9A\u4E49, \u4F46\u662F\u5374\u521B\u5EFA\u4E86[{0}]\u4E2A. -view_dynagroup_template_customExpression = Custom Expression... +view_dynagroup_recalculate = \u91cd\u7b97 +view_dynagroup_recalculationInterval = \u91cd\u7b97\u95f4\u9694 (ms) +view_dynagroup_recursive = \u9012\u5f52 +view_dynagroup_saveAndRecalculate = \u4fdd\u5b58&\u91cd\u7b97 +view_dynagroup_saveFailure = \u4fdd\u5b58\u540d\u79f0\u4e3a[{0}]\u7684\u7ec4\u5b9a\u4e49\u5931\u8d25 +view_dynagroup_saveSuccessful = \u60a8\u6210\u529f\u7684\u4fdd\u5b58\u4e86\u540d\u79f0\u4e3a[{0}]\u7684\u7ec4\u5b9a\u4e49 +view_dynagroup_singleSaveFailure = \u62a5\u9519\u4e86 - \u6b63\u5e38\u5e94\u8be5\u53ea\u521b\u5efa\u5355\u4e2a\u7ec4\u5b9a\u4e49, \u4f46\u662f\u5374\u521b\u5efa\u4e86[{0}]\u4e2a. +view_dynagroup_template_customExpression = \u81ea\u5b9a\u4e49\u8868\u8fbe\u5f0f... view_dynagroup_template_downedResources = All resources currently down -view_dynagroup_template_jbossas4_clusters = JBossAS 4 - \u96C6\u7FA4 +view_dynagroup_template_jbossas4_clusters = JBossAS 4 - \u96c6\u7fa4 view_dynagroup_template_jbossas4_earClusters = JBossAS 4 - Clustered EARs view_dynagroup_template_jbossas4_hostingApp = JBossAS 4 - All hosting any version of "my" app view_dynagroup_template_jbossas4_nonsecured = JBossAS 4 - All non-secured view_dynagroup_template_jbossas4_uniqueVersions = JBossAS 4 - Unique versions -view_dynagroup_template_jbossas5_clusters = JBossAS 5/6 - \u96C6\u7FA4 -view_dynagroup_template_platforms = Platform resources in inventory -view_dynagroup_template_uniqueResourceTypes = Unique resource types in inventory +view_dynagroup_template_jbossas5_clusters = JBossAS 5/6 - \u96c6\u7fa4 +view_dynagroup_template_platforms = \u6e05\u5355\u4e2d\u5e73\u53f0 +view_dynagroup_template_uniqueResourceTypes = \u6e05\u5355\u4e2d\u552f\u4e00\u8d44\u6e90\u7c7b\u578b view_groupConfigEdit_member = \u6210\u5458 -view_groupConfigEdit_noListProps = \u7EC4\u914D\u7F6E\u76EE\u524D\u4E0D\u652F\u6301\u67E5\u770B\u5C5E\u6027\u4FE1\u606F. -view_groupConfigEdit_setAll = \u8BBE\u7F6E\u6240\u6709\u7684\u503C\u5230: -view_groupConfigEdit_tooltip_1 = \u6210\u5458\u503C\u6709\u5DEE\u5F02 - \u70B9\u51FB\u6309\u94AE\u7F16\u8F91. -view_groupConfigEdit_unset = \u56DE\u6EDA -view_groupConfigEdit_valsDiff = \u6210\u5458\u503C\u6709\u5DEE\u5F02 -view_groupConfigEdit_valsDiffForProp = \u5C5E\u6027 [{0}]\u7684\u6210\u5458\u503C -view_groupCreateWizard_createFailure = \u521B\u5EFA\u8D44\u6E90\u7EC4\u5931\u8D25 -view_groupCreateWizard_createStepName = \u7EC4\u8BBE\u7F6E -view_groupCreateWizard_createStep_recursive = \u9012\u5F52 -view_groupCreateWizard_createSuccessful_concise = \u6210\u529F\u7684\u521B\u5EFA\u4E86\u8D44\u6E90\u7EC4. [<a href="{0}">\u67E5\u770B\u7EC4</a>] -view_groupCreateWizard_createSuccessful_full = \u6210\u529F\u7684\u521B\u5EFA\u540D\u79F0\u662F [{1}]\u5305\u542B [{2}]\u4E2A\u8D44\u6E90\u6210\u5458\u7684[{0}]\u8D44\u6E90\u7EC4 -view_groupCreateWizard_membersStepName = \u9009\u62E9\u6210\u5458 -view_groupCreateWizard_title = \u521B\u5EFA\u7EC4 -view_groupCreateWizard_windowTitle = \u521B\u5EFA\u7EC4 -view_groupInventoryMembers_button_updateMembership = \u66F4\u65B0\u6210\u5458\u5173\u7CFB\u4E2D... -view_groupInventoryMembers_title_updateMembership = \u66F4\u65B0\u6210\u5458\u5173\u7CFB -view_group_detail_failLoad = \u52A0\u8F7D\u7EC4ID\u4E3A[{0}]\u7684\u7EC4\u4FE1\u606F\u5931\u8D25 -view_group_detail_failLoadComp = \u52A0\u8F7D\u7EC4ID\u4E3A[{0}]\u7684\u6DF7\u5408\u7EC4\u4FE1\u606F\u5931\u8D25 -view_group_detail_failRecursiveChange = \u4FEE\u6539\u7EC4[{0}]\u7684\u9012\u5F52\u8BBE\u7F6E\u5931\u8D25 -view_group_detail_recursiveChange = \u6210\u529F\u7684\u4FEE\u6539\u7EC4[{0}]\u7684\u9012\u5F52\u8BBE\u7F6E -view_group_inventory_activity_no_recent_metrics = \u6B64\u7EC4\u6CA1\u6709\u6700\u65B0\u516C\u544A -view_group_meas_schedules_title = Group Metric Collection Schedules -view_group_membership_failFetch = \u83B7\u53D6\u8D44\u6E90\u7EC4\u5931\u8D25 -view_group_membership_saveFailure = \u4FEE\u6539[{0}]\u7684\u7EC4\u6210\u5458\u5173\u7CFB\u5931\u8D25 -view_group_membership_saveSuccessful = \u6210\u529F\u7684\u4FEE\u6539[{0}]\u7684\u7EC4\u6210\u5458\u5173\u7CFB -view_group_operationScheduleDetails_failedToLoadMembers = \u52A0\u8F7D\u7EC4\u6210\u5458\u4FE1\u606F\u5931\u8D25. -view_group_operationScheduleDetails_field_execute = \u6267\u884C -view_group_operationScheduleDetails_field_haltOnFailure = \u5931\u8D25\u65F6\u505C\u6B62? -view_group_operationScheduleDetails_memberResource = \u6210\u5458\u4FE1\u606F -view_group_operationScheduleDetails_value_parallel = \u91C7\u53D6\u5E76\u884C\u7684\u65B9\u5F0F -view_group_operationScheduleDetails_value_sequential = \u6309\u7167\u5982\u4E0B\u7684\u987A\u5E8F (\u6DFB\u52A0\u6216\u8005\u5220\u9664\u6210\u5458\u4EE5\u4FEE\u6539\u987A\u5E8F) -view_group_pluginConfig_edit_currentGroupProperties = \u7EC4\u5F53\u524D\u5C5E\u6027 +view_groupConfigEdit_noListProps = \u7ec4\u914d\u7f6e\u76ee\u524d\u4e0d\u652f\u6301\u67e5\u770b\u5c5e\u6027\u4fe1\u606f. +view_groupConfigEdit_setAll = \u8bbe\u7f6e\u6240\u6709\u7684\u503c\u5230: +view_groupConfigEdit_tooltip_1 = \u6210\u5458\u503c\u6709\u5dee\u5f02 - \u70b9\u51fb\u6309\u94ae\u7f16\u8f91. +view_groupConfigEdit_unset = \u56de\u6eda +view_groupConfigEdit_valsDiff = \u6210\u5458\u503c\u6709\u5dee\u5f02 +view_groupConfigEdit_valsDiffForProp = \u5c5e\u6027 [{0}]\u7684\u6210\u5458\u503c +view_groupCreateWizard_createFailure = \u521b\u5efa\u8d44\u6e90\u7ec4\u5931\u8d25 +view_groupCreateWizard_createStepName = \u7ec4\u8bbe\u7f6e +view_groupCreateWizard_createStep_recursive = \u9012\u5f52 +view_groupCreateWizard_createSuccessful_concise = \u6210\u529f\u7684\u521b\u5efa\u4e86\u8d44\u6e90\u7ec4. [<a href="{0}">\u67e5\u770b\u7ec4</a>] +view_groupCreateWizard_createSuccessful_full = \u6210\u529f\u7684\u521b\u5efa\u540d\u79f0\u662f [{1}]\u5305\u542b [{2}]\u4e2a\u8d44\u6e90\u6210\u5458\u7684[{0}]\u8d44\u6e90\u7ec4 +view_groupCreateWizard_membersStepName = \u9009\u62e9\u6210\u5458 +view_groupCreateWizard_title = \u521b\u5efa\u7ec4 +view_groupCreateWizard_windowTitle = \u521b\u5efa\u7ec4 +view_groupInventoryMembers_button_updateMembership = \u66f4\u65b0\u6210\u5458\u5173\u7cfb\u4e2d... +view_groupInventoryMembers_title_updateMembership = \u66f4\u65b0\u6210\u5458\u5173\u7cfb +view_group_detail_failLoad = \u52a0\u8f7d\u7ec4ID\u4e3a[{0}]\u7684\u7ec4\u4fe1\u606f\u5931\u8d25 +view_group_detail_failLoadComp = \u52a0\u8f7d\u7ec4ID\u4e3a[{0}]\u7684\u6df7\u5408\u7ec4\u4fe1\u606f\u5931\u8d25 +view_group_detail_failRecursiveChange = \u4fee\u6539\u7ec4[{0}]\u7684\u9012\u5f52\u8bbe\u7f6e\u5931\u8d25 +view_group_detail_recursiveChange = \u6210\u529f\u7684\u4fee\u6539\u7ec4[{0}]\u7684\u9012\u5f52\u8bbe\u7f6e +view_group_inventory_activity_no_recent_metrics = \u6b64\u7ec4\u6ca1\u6709\u6700\u65b0\u516c\u544a +view_group_meas_schedules_title = \u7ec4\u6307\u6807\u96c6\u8ba1\u5212\u4efb\u52a1 +view_group_membership_failFetch = \u83b7\u53d6\u8d44\u6e90\u7ec4\u5931\u8d25 +view_group_membership_saveFailure = \u4fee\u6539[{0}]\u7684\u7ec4\u6210\u5458\u5173\u7cfb\u5931\u8d25 +view_group_membership_saveSuccessful = \u6210\u529f\u7684\u4fee\u6539[{0}]\u7684\u7ec4\u6210\u5458\u5173\u7cfb +view_group_operationScheduleDetails_failedToLoadMembers = \u52a0\u8f7d\u7ec4\u6210\u5458\u4fe1\u606f\u5931\u8d25. +view_group_operationScheduleDetails_field_execute = \u6267\u884c +view_group_operationScheduleDetails_field_haltOnFailure = \u5931\u8d25\u65f6\u505c\u6b62? +view_group_operationScheduleDetails_memberResource = \u6210\u5458\u4fe1\u606f +view_group_operationScheduleDetails_value_parallel = \u91c7\u53d6\u5e76\u884c\u7684\u65b9\u5f0f +view_group_operationScheduleDetails_value_sequential = \u6309\u7167\u5982\u4e0b\u7684\u987a\u5e8f (\u6dfb\u52a0\u6216\u8005\u5220\u9664\u6210\u5458\u4ee5\u4fee\u6539\u987a\u5e8f) +view_group_pluginConfig_edit_currentGroupProperties = \u7ec4\u5f53\u524d\u5c5e\u6027 view_group_pluginConfig_edit_invalid = The following connection setting properties have invalid values and must be corrected before the connection settings can be saved: [{0}] -view_group_pluginConfig_edit_noperm = \u60A8\u6CA1\u6709\u6743\u9650\u7F16\u8F91\u6B64\u7EC4\u8FDE\u63A5\u8BBE\u7F6E +view_group_pluginConfig_edit_noperm = \u60a8\u6ca1\u6709\u6743\u9650\u7f16\u8f91\u6b64\u7ec4\u8fde\u63a5\u8bbe\u7f6e view_group_pluginConfig_edit_saveFailure = Failed to initiate group connection setting update for [{0}] compatible group named [{1}] -view_group_pluginConfig_edit_saveInitiated_concise = \u7EC4\u8FDE\u63A5\u8BBE\u7F6E\u66F4\u65B0\u5DF2\u7ECF\u521D\u59CB\u5316 +view_group_pluginConfig_edit_saveInitiated_concise = \u7ec4\u8fde\u63a5\u8bbe\u7f6e\u66f4\u65b0\u5df2\u7ecf\u521d\u59cb\u5316 view_group_pluginConfig_edit_saveInitiated_full = The group connection setting updates have been initiated for the [{0}] compatible group named [{1}] -view_group_pluginConfig_edit_saveTooltip = \u66F4\u65B0\u6240\u6709\u7684\u7EC4\u6210\u5458\u8FDE\u63A5\u8BBE\u7F6E +view_group_pluginConfig_edit_saveTooltip = \u66f4\u65b0\u6240\u6709\u7684\u7ec4\u6210\u5458\u8fde\u63a5\u8bbe\u7f6e view_group_pluginConfig_edit_valid = All connection setting properties have valid values, so the connection settings can now be saved -view_group_pluginConfig_members_fetchFailure = \u83B7\u53D6[{0}]\u7EC4\u6210\u5458\u7684\u63D2\u4EF6\u914D\u7F6E\u66F4\u65B0\u5386\u53F2\u5931\u8D25 -view_group_pluginConfig_members_fetchFailureConn = \u68C0\u7D22[{0}]\u7684\u6210\u5458\u8FDE\u63A5\u8BBE\u7F6E\u5931\u8D25 -view_group_pluginConfig_members_fetchFailureConnInProgress = \u5F53\u524D\u5DF2\u5B58\u5728\u7EC4\u63D2\u4EF6\u914D\u7F6E\u66F4\u65B0\u8FDB\u7A0B . \u5728\u67E5\u770B\u7EC4\u8BBE\u7F6E\u4E4B\u524D\u9700\u8981\u7B49\u5F85\u66F4\u65B0\u5B8C\u6210. -view_group_pluginConfig_members_statusDetails = \u8BE6\u7EC6\u72B6\u6001 -view_group_pluginConfig_members_statusFailure = \u672A\u77E5\u9519\u8BEF\uFF0C\u914D\u7F6E\u4FEE\u6539\u5931\u8D25 -view_group_pluginConfig_members_statusInprogress = \u6B63\u5728\u4FEE\u6539\u914D\u7F6E\u4E2D -view_group_pluginConfig_members_statusNochange = \u6CA1\u6709\u5BF9\u914D\u7F6E\u505A\u4EFB\u4F55\u4FEE\u6539 -view_group_pluginConfig_members_statusSuccess = \u4FEE\u6539\u914D\u7F6E\u6210\u529F -view_group_pluginConfig_members_title = \u7EC4\u6210\u5458\u8FDE\u63A5\u8BBE\u7F6E\u5386\u53F2 -view_group_pluginConfig_table_clickStatusIcon = \u70B9\u51FB\u72B6\u6001\u6309\u94AE\u83B7\u53D6\u8BE6\u7EC6\u4FE1\u606F -view_group_pluginConfig_table_deleteFailure = \u5220\u9664\u7EC4\u63D2\u4EF6\u914D\u7F6E\u5386\u53F2\u5931\u8D25 -view_group_pluginConfig_table_deleteSuccessful = \u60A8\u5220\u9664\u4E86 [{0}] \u5386\u53F2\u9879 -view_group_pluginConfig_table_failFetch = \u83B7\u53D6\u7EC4\u63D2\u4EF6\u914D\u7F6E\u5386\u53F2\u5931\u8D25 -view_group_pluginConfig_table_msg1 = \u67E5\u770B\u5355\u72EC\u8D44\u6E90\u7684\u6210\u5458\u5386\u53F2\u72B6\u6001 -view_group_pluginConfig_table_statusDetails = \u8BE6\u7EC6\u72B6\u6001 -view_group_pluginConfig_table_statusFailure = \u4FEE\u6539\u6B64\u7EC4\u914D\u7F6E\u5931\u8D25 -view_group_pluginConfig_table_statusInprogress = \u7EC4\u914D\u7F6E\u66F4\u65B0\u4E2D -view_group_pluginConfig_table_statusNochange = \u6CA1\u6709\u5BF9\u6B64\u7EC4\u914D\u7F6E\u505A\u4EFB\u4F55\u4FEE\u6539 -view_group_pluginConfig_table_statusSuccess = \u7EC4\u914D\u7F6E\u66F4\u65B0\u6210\u529F -view_group_pluginConfig_table_title = \u5386\u53F2\u8FDE\u63A5\u8BBE\u7F6E\u7EC4 -view_group_pluginConfig_table_viewMemberHistory = \u67E5\u770B\u5386\u53F2\u6210\u5458 -view_group_pluginConfig_table_viewSettings = \u67E5\u770B\u8BBE\u7F6E -view_group_pluginConfig_view_groupProperties = \u7EC4\u5C5E\u6027 -view_group_pluginConfig_view_noperm = \u60A8\u6CA1\u6709\u67E5\u770B\u8FDE\u63A5\u8BBE\u7F6E\u7684\u6743\u9650 -view_group_resConfig_edit_invalid = \u4E0B\u9762\u7684\u5C5E\u6027\u914D\u7F6E\u586B\u5199\u4E86\u65E0\u6548\u7684\u503C ,\u63D0\u4EA4\u4E4B\u524D\u8BF7\u4FEE\u6539: [{0}] -view_group_resConfig_edit_loadFail = \u68C0\u7D22[{0}]\u7684\u6210\u5458\u8D44\u6E90\u914D\u7F6E\u5931\u8D25 -view_group_resConfig_edit_noperm = \u60A8\u6CA1\u6709\u6743\u9650\u7F16\u8F91\u7EC4\u914D\u7F6E -view_group_resConfig_edit_saveFailure = \u521D\u59CB\u5316\u8D44\u6E90\u7C7B\u578B[{0}],\u540D\u79F0\u4E3A[{1}]\u7684\u517C\u5BB9\u7EC4\u7EC4\u914D\u7F6E\u66F4\u65B0\u5931\u8D25 -view_group_resConfig_edit_saveInitiated_concise = \u521D\u59CB\u5316\u7EC4\u914D\u7F6E\u66F4\u65B0\u5B8C\u6210 -view_group_resConfig_edit_saveInitiated_full = \u6210\u529F\u521D\u59CB\u5316\u8D44\u6E90\u7C7B\u578B[{0}],\u540D\u79F0\u4E3A[{1}]\u7684\u517C\u5BB9\u7EC4\u7EC4\u914D\u7F6E\u66F4\u65B0 -view_group_resConfig_edit_saveTooltip = \u4FEE\u6539\u6240\u6709\u7684\u7EC4\u6210\u5458\u914D\u7F6E -view_group_resConfig_edit_valid = \u6240\u6709\u7684\u5C5E\u6027\u914D\u7F6E\u5747\u6709\u6548,\u53EF\u4EE5\u63D0\u4EA4\u4FDD\u5B58 -view_group_resConfig_members_fetchFailure = \u83B7\u53D6\u8D44\u6E90\u7EC4[{0}]\u7684\u6210\u5458\u914D\u7F6E\u4FEE\u6539\u5386\u53F2\u8BB0\u5F55\u5931\u8D25 -view_group_resConfig_members_fetchFailureConfig = \u6062\u590D\u8D44\u6E90\u6210\u5458 [{0}]\u7684\u914D\u7F6E\u8BBE\u7F6E -view_group_resConfig_members_fetchFailureConfigInProgress = \u6B64\u8D44\u6E90\u7EC4\u914D\u7F6E\u7684\u6B63\u5728\u4FEE\u6539\u4E2D\uFF0C\u5982\u679C\u8981\u67E5\u770B\u7EC4\u8BBE\u7F6E\uFF0C\u9700\u8981\u7B49\u5F85\u6B64\u4FEE\u6539\u5168\u90E8\u5B8C\u6210. -view_group_resConfig_members_statusDetails = \u8BE6\u7EC6\u72B6\u6001 -view_group_resConfig_members_statusFailure = \u672A\u77E5\u9519\u8BEF\uFF0C\u4FEE\u6539\u914D\u7F6E\u5931\u8D25 -view_group_resConfig_members_statusInprogress = \u6B63\u4FEE\u6539\u6B64\u914D\u7F6E\u4E2D -view_group_resConfig_members_statusNochange = \u6CA1\u6709\u5BF9\u6B64\u914D\u7F6E\u505A\u4EFB\u4F55\u4FEE\u6539 -view_group_resConfig_members_statusSuccess = \u6210\u529F\u7684\u4FEE\u6539\u6B64\u914D\u7F6E -view_group_resConfig_members_title = \u8D44\u6E90\u7EC4\u914D\u7F6E\u5386\u53F2\u6210\u5458 -view_group_resConfig_table_clickStatusIcon = \u70B9\u51FB\u72B6\u6001\u6309\u94AE\u83B7\u53D6\u8BE6\u7EC6\u4FE1\u606F -view_group_resConfig_table_deleteFailure = \u5220\u9664\u5386\u53F2\u8D44\u6E90\u7EC4\u914D\u7F6E\u5931\u8D25 -view_group_resConfig_table_deleteSuccessful = \u6210\u529F\u5220\u9664 [{0}] \u5386\u53F2\u9879 -view_group_resConfig_table_failFetch = \u83B7\u53D6\u8D44\u6E90\u7EC4\u5386\u53F2\u914D\u7F6E\u5931\u8D25 -view_group_resConfig_table_msg1 = \u67E5\u770B\u6BCF\u4E2A\u5355\u72EC\u8D44\u6E90\u7684\u6210\u5458\u5386\u53F2\u72B6\u6001 -view_group_resConfig_table_statusDetails = \u8BE6\u7EC6\u72B6\u6001 -view_group_resConfig_table_statusFailure = \u7EC4\u914D\u7F6E\u4FEE\u6539\u5931\u8D25 -view_group_resConfig_table_statusInprogress = \u6B64\u7EC4\u914D\u7F6E\u7684\u4FEE\u6539\u6B63\u5728\u8FDB\u884C\u4E2D -view_group_resConfig_table_statusNochange = \u6CA1\u6709\u5BF9\u6B64\u7EC4\u914D\u7F6E\u505A\u4EFB\u4F55\u4FEE\u6539 -view_group_resConfig_table_statusSuccess = \u6210\u529F\u4FEE\u6539\u7EC4\u914D\u7F6E -view_group_resConfig_table_title = \u5386\u53F2\u8D44\u6E90\u7EC4\u914D\u7F6E -view_group_resConfig_table_viewMemberHistory = \u67E5\u770B\u5386\u53F2\u6210\u5458 -view_group_resConfig_table_viewSettings = \u67E5\u770B\u8BBE\u7F6E -view_group_resConfig_view_groupProperties = \u7EC4\u5C5E\u6027 -view_group_resConfig_view_noperm = \u60A8\u6CA1\u6709\u6743\u9650\u67E5\u770B\u8D44\u6E90\u914D\u7F6E\u8BBE\u7F6E -view_group_summary_compatible = \u517C\u5BB9\u7684 -view_group_summary_descUpdateFailure = \u4FEE\u6539ID\u4E3A[{0}]\u7684\u8D44\u6E90\u7EC4\u63CF\u8FF0\u4FE1\u606F\u5931\u8D25 -view_group_summary_descUpdateSuccessful = \u6210\u529F\u4FEE\u6539\u6B64\u8D44\u6E90\u7EC4\u7684\u63CF\u8FF0 -view_group_summary_dynamic = \u52A8\u6001 -view_group_summary_dynamicNote = \u52A8\u6001\u7EC4\u7684\u540D\u79F0\u548C\u63CF\u8FF0\u662F\u7BA1\u7406\u5C5E\u6027,\u6240\u4EE5\u4E0D\u80FD\u4FEE\u6539 -view_group_summary_groupDefinition = \u7EC4\u5B9A\u4E49 +view_group_pluginConfig_members_fetchFailure = \u83b7\u53d6[{0}]\u7ec4\u6210\u5458\u7684\u63d2\u4ef6\u914d\u7f6e\u66f4\u65b0\u5386\u53f2\u5931\u8d25 +view_group_pluginConfig_members_fetchFailureConn = \u68c0\u7d22[{0}]\u7684\u6210\u5458\u8fde\u63a5\u8bbe\u7f6e\u5931\u8d25 +view_group_pluginConfig_members_fetchFailureConnInProgress = \u5f53\u524d\u5df2\u5b58\u5728\u7ec4\u63d2\u4ef6\u914d\u7f6e\u66f4\u65b0\u8fdb\u7a0b . \u5728\u67e5\u770b\u7ec4\u8bbe\u7f6e\u4e4b\u524d\u9700\u8981\u7b49\u5f85\u66f4\u65b0\u5b8c\u6210. +view_group_pluginConfig_members_statusDetails = \u8be6\u7ec6\u72b6\u6001 +view_group_pluginConfig_members_statusFailure = \u672a\u77e5\u9519\u8bef\uff0c\u914d\u7f6e\u4fee\u6539\u5931\u8d25 +view_group_pluginConfig_members_statusInprogress = \u6b63\u5728\u4fee\u6539\u914d\u7f6e\u4e2d +view_group_pluginConfig_members_statusNochange = \u6ca1\u6709\u5bf9\u914d\u7f6e\u505a\u4efb\u4f55\u4fee\u6539 +view_group_pluginConfig_members_statusSuccess = \u4fee\u6539\u914d\u7f6e\u6210\u529f +view_group_pluginConfig_members_title = \u7ec4\u6210\u5458\u8fde\u63a5\u8bbe\u7f6e\u5386\u53f2 +view_group_pluginConfig_table_clickStatusIcon = \u70b9\u51fb\u72b6\u6001\u6309\u94ae\u83b7\u53d6\u8be6\u7ec6\u4fe1\u606f +view_group_pluginConfig_table_deleteFailure = \u5220\u9664\u7ec4\u63d2\u4ef6\u914d\u7f6e\u5386\u53f2\u5931\u8d25 +view_group_pluginConfig_table_deleteSuccessful = \u60a8\u5220\u9664\u4e86 [{0}] \u5386\u53f2\u9879 +view_group_pluginConfig_table_failFetch = \u83b7\u53d6\u7ec4\u63d2\u4ef6\u914d\u7f6e\u5386\u53f2\u5931\u8d25 +view_group_pluginConfig_table_msg1 = \u67e5\u770b\u5355\u72ec\u8d44\u6e90\u7684\u6210\u5458\u5386\u53f2\u72b6\u6001 +view_group_pluginConfig_table_statusDetails = \u8be6\u7ec6\u72b6\u6001 +view_group_pluginConfig_table_statusFailure = \u4fee\u6539\u6b64\u7ec4\u914d\u7f6e\u5931\u8d25 +view_group_pluginConfig_table_statusInprogress = \u7ec4\u914d\u7f6e\u66f4\u65b0\u4e2d +view_group_pluginConfig_table_statusNochange = \u6ca1\u6709\u5bf9\u6b64\u7ec4\u914d\u7f6e\u505a\u4efb\u4f55\u4fee\u6539 +view_group_pluginConfig_table_statusSuccess = \u7ec4\u914d\u7f6e\u66f4\u65b0\u6210\u529f +view_group_pluginConfig_table_title = \u5386\u53f2\u8fde\u63a5\u8bbe\u7f6e\u7ec4 +view_group_pluginConfig_table_viewMemberHistory = \u67e5\u770b\u5386\u53f2\u6210\u5458 +view_group_pluginConfig_table_viewSettings = \u67e5\u770b\u8bbe\u7f6e +view_group_pluginConfig_view_groupProperties = \u7ec4\u5c5e\u6027 +view_group_pluginConfig_view_noperm = \u60a8\u6ca1\u6709\u67e5\u770b\u8fde\u63a5\u8bbe\u7f6e\u7684\u6743\u9650 +view_group_resConfig_edit_invalid = \u4e0b\u9762\u7684\u5c5e\u6027\u914d\u7f6e\u586b\u5199\u4e86\u65e0\u6548\u7684\u503c ,\u63d0\u4ea4\u4e4b\u524d\u8bf7\u4fee\u6539: [{0}] +view_group_resConfig_edit_loadFail = \u68c0\u7d22[{0}]\u7684\u6210\u5458\u8d44\u6e90\u914d\u7f6e\u5931\u8d25 +view_group_resConfig_edit_noperm = \u60a8\u6ca1\u6709\u6743\u9650\u7f16\u8f91\u7ec4\u914d\u7f6e +view_group_resConfig_edit_saveFailure = \u521d\u59cb\u5316\u8d44\u6e90\u7c7b\u578b[{0}],\u540d\u79f0\u4e3a[{1}]\u7684\u517c\u5bb9\u7ec4\u7ec4\u914d\u7f6e\u66f4\u65b0\u5931\u8d25 +view_group_resConfig_edit_saveInitiated_concise = \u521d\u59cb\u5316\u7ec4\u914d\u7f6e\u66f4\u65b0\u5b8c\u6210 +view_group_resConfig_edit_saveInitiated_full = \u6210\u529f\u521d\u59cb\u5316\u8d44\u6e90\u7c7b\u578b[{0}],\u540d\u79f0\u4e3a[{1}]\u7684\u517c\u5bb9\u7ec4\u7ec4\u914d\u7f6e\u66f4\u65b0 +view_group_resConfig_edit_saveTooltip = \u4fee\u6539\u6240\u6709\u7684\u7ec4\u6210\u5458\u914d\u7f6e +view_group_resConfig_edit_valid = \u6240\u6709\u7684\u5c5e\u6027\u914d\u7f6e\u5747\u6709\u6548,\u53ef\u4ee5\u63d0\u4ea4\u4fdd\u5b58 +view_group_resConfig_members_fetchFailure = \u83b7\u53d6\u8d44\u6e90\u7ec4[{0}]\u7684\u6210\u5458\u914d\u7f6e\u4fee\u6539\u5386\u53f2\u8bb0\u5f55\u5931\u8d25 +view_group_resConfig_members_fetchFailureConfig = \u6062\u590d\u8d44\u6e90\u6210\u5458 [{0}]\u7684\u914d\u7f6e\u8bbe\u7f6e +view_group_resConfig_members_fetchFailureConfigInProgress = \u6b64\u8d44\u6e90\u7ec4\u914d\u7f6e\u7684\u6b63\u5728\u4fee\u6539\u4e2d\uff0c\u5982\u679c\u8981\u67e5\u770b\u7ec4\u8bbe\u7f6e\uff0c\u9700\u8981\u7b49\u5f85\u6b64\u4fee\u6539\u5168\u90e8\u5b8c\u6210. +view_group_resConfig_members_statusDetails = \u8be6\u7ec6\u72b6\u6001 +view_group_resConfig_members_statusFailure = \u672a\u77e5\u9519\u8bef\uff0c\u4fee\u6539\u914d\u7f6e\u5931\u8d25 +view_group_resConfig_members_statusInprogress = \u6b63\u4fee\u6539\u6b64\u914d\u7f6e\u4e2d +view_group_resConfig_members_statusNochange = \u6ca1\u6709\u5bf9\u6b64\u914d\u7f6e\u505a\u4efb\u4f55\u4fee\u6539 +view_group_resConfig_members_statusSuccess = \u6210\u529f\u7684\u4fee\u6539\u6b64\u914d\u7f6e +view_group_resConfig_members_title = \u8d44\u6e90\u7ec4\u914d\u7f6e\u5386\u53f2\u6210\u5458 +view_group_resConfig_table_clickStatusIcon = \u70b9\u51fb\u72b6\u6001\u6309\u94ae\u83b7\u53d6\u8be6\u7ec6\u4fe1\u606f +view_group_resConfig_table_deleteFailure = \u5220\u9664\u5386\u53f2\u8d44\u6e90\u7ec4\u914d\u7f6e\u5931\u8d25 +view_group_resConfig_table_deleteSuccessful = \u6210\u529f\u5220\u9664 [{0}] \u5386\u53f2\u9879 +view_group_resConfig_table_failFetch = \u83b7\u53d6\u8d44\u6e90\u7ec4\u5386\u53f2\u914d\u7f6e\u5931\u8d25 +view_group_resConfig_table_msg1 = \u67e5\u770b\u6bcf\u4e2a\u5355\u72ec\u8d44\u6e90\u7684\u6210\u5458\u5386\u53f2\u72b6\u6001 +view_group_resConfig_table_statusDetails = \u8be6\u7ec6\u72b6\u6001 +view_group_resConfig_table_statusFailure = \u7ec4\u914d\u7f6e\u4fee\u6539\u5931\u8d25 +view_group_resConfig_table_statusInprogress = \u6b64\u7ec4\u914d\u7f6e\u7684\u4fee\u6539\u6b63\u5728\u8fdb\u884c\u4e2d +view_group_resConfig_table_statusNochange = \u6ca1\u6709\u5bf9\u6b64\u7ec4\u914d\u7f6e\u505a\u4efb\u4f55\u4fee\u6539 +view_group_resConfig_table_statusSuccess = \u6210\u529f\u4fee\u6539\u7ec4\u914d\u7f6e +view_group_resConfig_table_title = \u5386\u53f2\u8d44\u6e90\u7ec4\u914d\u7f6e +view_group_resConfig_table_viewMemberHistory = \u67e5\u770b\u5386\u53f2\u6210\u5458 +view_group_resConfig_table_viewSettings = \u67e5\u770b\u8bbe\u7f6e +view_group_resConfig_view_groupProperties = \u7ec4\u5c5e\u6027 +view_group_resConfig_view_noperm = \u60a8\u6ca1\u6709\u6743\u9650\u67e5\u770b\u8d44\u6e90\u914d\u7f6e\u8bbe\u7f6e +view_group_summary_compatible = \u517c\u5bb9\u7684 +view_group_summary_descUpdateFailure = \u4fee\u6539ID\u4e3a[{0}]\u7684\u8d44\u6e90\u7ec4\u63cf\u8ff0\u4fe1\u606f\u5931\u8d25 +view_group_summary_descUpdateSuccessful = \u6210\u529f\u4fee\u6539\u6b64\u8d44\u6e90\u7ec4\u7684\u63cf\u8ff0 +view_group_summary_dynamic = \u52a8\u6001 +view_group_summary_dynamicNote = \u52a8\u6001\u7ec4\u7684\u540d\u79f0\u548c\u63cf\u8ff0\u662f\u7ba1\u7406\u5c5e\u6027,\u6240\u4ee5\u4e0d\u80fd\u4fee\u6539 +view_group_summary_groupDefinition = \u7ec4\u5b9a\u4e49 view_group_summary_memberCount = \u6210\u5458\u6570 -view_group_summary_memberType = \u6210\u5458\u7C7B\u578B -view_group_summary_mixed = \u6DF7\u5408 +view_group_summary_memberType = \u6210\u5458\u7c7b\u578b +view_group_summary_mixed = \u6df7\u5408 view_group_summary_nameUpdateFailure = Failed to change the name of the resource group with ID [{0}] - could not change from [{1}] to [{2}] view_group_summary_nameUpdateSuccessful = You have changed the name of the resource group with ID [{0}] from [{1}] to [{2}] -view_group_summary_recursive = \u9012\u5F52 -view_helpTop_description = \u8BE5\u90E8\u5206\u5185\u5BB9\u63D0\u4F9B\u4E86\u4EA7\u54C1\u6587\u6863, \u6559\u7A0B, \u7248\u672C\u53F7\u548C\u5176\u4ED6\u6709\u7528\u7684\u4FE1\u606F. -view_help_section_product = \u4EA7\u54C1\u5E2E\u52A9 -view_help_section_product_about = \u5173\u4E8E\u4EA7\u54C1\u5E2E\u52A9 -view_inventory_adq = Discovery Queue -view_inventory_allGroups = \u6240\u6709\u7EC4 -view_inventory_allResources = \u6240\u6709\u8D44\u6E90 -view_inventory_collectionInterval = \u641C\u96C6\u95F4\u9694 -view_inventory_dynagroupDefs = \u52A8\u6001\u7EC4\u5B9A\u4E49 -view_inventory_eventDetails_loadFailed = \u52A0\u8F7D\u4E8B\u4EF6\u8BE6\u60C5\u5931\u8D25 -view_inventory_eventHistory_deleteFailed = Failed to deleted selected events for [{0}] -view_inventory_eventHistory_deleteSuccessful = You have successfully deleted [{0}] events for [{1}] -view_inventory_eventHistory_details = \u8BE6\u60C5 -view_inventory_eventHistory_detailsFilter = \u8BE6\u60C5\u8FC7\u6EE4 -view_inventory_eventHistory_groupEventHistory = \u7EC4\u5386\u53F2\u4E8B\u4EF6 -view_inventory_eventHistory_purgeFailed = \u4E3A[{0}]\u79FB\u9664\u4E8B\u4EF6\u5931\u8D25 -view_inventory_eventHistory_purgeSuccessful = \u6210\u529F\u5220\u9664[{0}]\u4E2A\u4E8B\u4EF6\u4E3A[{1}] -view_inventory_eventHistory_resourceEventHistory = \u8D44\u6E90\u5386\u53F2\u4E8B\u4EF6 -view_inventory_eventHistory_severity = \u4E25\u91CD\u7EA7\u522B -view_inventory_eventHistory_severityFilter = \u4E25\u91CD\u7EA7\u8FC7\u6EE4 -view_inventory_eventHistory_sourceFilter = Source\u8FC7\u6EE4 -view_inventory_eventHistory_sourceLocation = Source\u4F4D\u7F6E -view_inventory_eventHistory_timestamp = \u65F6\u95F4\u6233 -view_inventory_groups = \u7EC4 -view_inventory_groups_children = \u5B50\u7EC4 -view_inventory_groups_deleteFailed = \u5220\u9664\u6307\u5B9A\u7684\u8D44\u6E90\u7EC4\u5931\u8D25 -view_inventory_groups_deleteSuccessful = \u6210\u529F\u7684\u5220\u9664\u6307\u5B9A\u7684\u8D44\u6E90\u7EC4 -view_inventory_groups_descendants = \u540E\u4EE3\u7EC4 -view_inventory_groups_loadFailed = \u52A0\u8F7D\u7EC4\u7EC4\u5408\u6570\u636E\u5931\u8D25 -view_inventory_groups_resourceGroups = \u8D44\u6E90\u7EC4 -view_inventory_mixed = \u6DF7\u5408 -view_inventory_platforms = \u5E73\u53F0 -view_inventory_problemGroups = \u95EE\u9898\u7EC4 -view_inventory_resource_loadFailed = id\u4E3A [{0}]\u7684\u8D44\u6E90\u4E0D\u5B58\u5728\u6216\u8005\u4E0D\u53EF\u8FBE -view_inventory_resources_deleteConfirm = \u786E\u5B9A\u5220\u9664\u9009\u4E2D\u7684\u8D44\u6E90\uFF1F -view_inventory_resources_deleteFailed = \u5220\u9664\u6307\u5B9A\u7684\u8D44\u6E90\u5931\u8D25 -view_inventory_resources_deleteSuccessful = \u6210\u529F\u7684\u5220\u9664\u6307\u5B9A\u7684\u8D44\u6E90 -view_inventory_resources_loadFailed = \u52A0\u8F7D\u8D44\u6E90\u7EC4\u5408\u6570\u636E\u5931\u8D25 -view_inventory_resources_title = Resources -view_inventory_resources_title_children = \u5B50\u8D44\u6E90 -view_inventory_resources_title_members = \u6210\u5458\u8D44\u6E90 -view_inventory_resources_uninventoryConfirm = \u786E\u5B9A\u628A\u9009\u4E2D\u7684\u8D44\u6E90\u4ECE\u6E05\u5355\u4E2D\u5220\u9664? \u6CE8\u610F\uFF1A\u5982\u679C\u67D0\u4E2A\u9009\u4E2D\u7684\u8D44\u6E90\u4F9D\u7136\u5B58\u5728, \u5219\u7CFB\u7EDF\u4F1A\u5728\u6B64\u8D44\u6E90\u7684\u5BA2\u6237\u7AEF\u7A0B\u5E8F\u4E0B\u6B21\u63A2\u7D22\u626B\u63CF\u65F6\u91CD\u65B0\u52A0\u8F7D\u6B64\u8D44\u6E90. -view_inventory_resources_uninventoryFailed = \u4ECE\u6E05\u5355\u4E2D\u5220\u9664\u9009\u4E2D\u7684\u8D44\u6E90\u5931\u8D25 -view_inventory_resources_uninventorySuccessful = \u6210\u529F\u4ECE\u6E05\u5355\u4E2D\u5220\u9664\u9009\u4E2D\u7684\u8D44\u6E90 -view_inventory_sectionHelp = \u6B64\u6A21\u5757\u53EF\u4EE5\u67E5\u770B\u548C\u7BA1\u7406\u65B0\u53D1\u73B0\u7684\u8D44\u6E90,\u5206\u7C7B\u7684\u8D44\u6E90\u548C\u7EC4. -view_inventory_servers = \u670D\u52A1\u5668 -view_inventory_services = \u670D\u52A1 -view_inventory_summary_agent_error1 = \u67E5\u627E\u5BA2\u6237\u7AEF\u7BA1\u7406\u7684\u8D44\u6E90id\u5931\u8D25 -view_inventory_summary_agent_error2 = \u5BA2\u6237\u7AEF\u7BA1\u7406\u7684\u8D44\u6E90ping\u4E0D\u901A -view_inventory_summary_agent_error3 = \u6CA1\u6709\u6743\u9650\u67E5\u770B\u6B64\u5BA2\u6237\u7AEF\u7684\u8BE6\u7EC6\u4FE1\u606F. +view_group_summary_recursive = \u9012\u5f52 +view_helpTop_description = \u8be5\u90e8\u5206\u5185\u5bb9\u63d0\u4f9b\u4e86\u4ea7\u54c1\u6587\u6863, \u6559\u7a0b, \u7248\u672c\u53f7\u548c\u5176\u4ed6\u6709\u7528\u7684\u4fe1\u606f. +view_help_section_product = \u4ea7\u54c1\u5e2e\u52a9 +view_help_section_product_about = \u5173\u4e8e\u4ea7\u54c1\u5e2e\u52a9 +view_inventory_adq = \u53d1\u73b0\u961f\u5217 +view_inventory_allGroups = \u6240\u6709\u7ec4 +view_inventory_allResources = \u6240\u6709\u8d44\u6e90 +view_inventory_collectionInterval = \u641c\u96c6\u95f4\u9694 +view_inventory_dynagroupDefs = \u52a8\u6001\u7ec4\u5b9a\u4e49 +view_inventory_eventDetails_loadFailed = \u52a0\u8f7d\u4e8b\u4ef6\u8be6\u60c5\u5931\u8d25 +view_inventory_eventHistory_deleteFailed = \u4e3a[{0}]\u5220\u9664\u9009\u62e9\u7684\u4e8b\u4ef6\u5931\u8d25 +view_inventory_eventHistory_deleteSuccessful = \u5220\u9664[{0}]\u4e8b\u4ef6\u6210\u529f\u4e3a [{1}] +view_inventory_eventHistory_details = \u8be6\u60c5 +view_inventory_eventHistory_detailsFilter = \u8be6\u60c5\u8fc7\u6ee4 +view_inventory_eventHistory_groupEventHistory = \u7ec4\u5386\u53f2\u4e8b\u4ef6 +view_inventory_eventHistory_purgeFailed = \u4e3a[{0}]\u79fb\u9664\u4e8b\u4ef6\u5931\u8d25 +view_inventory_eventHistory_purgeSuccessful = \u6210\u529f\u5220\u9664[{0}]\u4e2a\u4e8b\u4ef6\u4e3a[{1}] +view_inventory_eventHistory_resourceEventHistory = \u8d44\u6e90\u5386\u53f2\u4e8b\u4ef6 +view_inventory_eventHistory_severity = \u4e25\u91cd\u7ea7\u522b +view_inventory_eventHistory_severityFilter = \u4e25\u91cd\u7ea7\u8fc7\u6ee4 +view_inventory_eventHistory_sourceFilter = \u6e90\u8fc7\u6ee4 +view_inventory_eventHistory_sourceLocation = \u6e90\u4f4d\u7f6e +view_inventory_eventHistory_timestamp = \u65f6\u95f4\u6233 +view_inventory_groups = \u7ec4 +view_inventory_groups_children = \u5b50\u7ec4 +view_inventory_groups_deleteFailed = \u5220\u9664\u6307\u5b9a\u7684\u8d44\u6e90\u7ec4\u5931\u8d25 +view_inventory_groups_deleteSuccessful = \u6210\u529f\u7684\u5220\u9664\u6307\u5b9a\u7684\u8d44\u6e90\u7ec4 +view_inventory_groups_descendants = \u540e\u4ee3\u7ec4 +view_inventory_groups_loadFailed = \u52a0\u8f7d\u7ec4\u7ec4\u5408\u6570\u636e\u5931\u8d25 +view_inventory_groups_resourceGroups = \u8d44\u6e90\u7ec4 +view_inventory_mixed = \u6df7\u5408 +view_inventory_platforms = \u5e73\u53f0 +view_inventory_problemGroups = \u95ee\u9898\u7ec4 +view_inventory_resource_loadFailed = id\u4e3a [{0}]\u7684\u8d44\u6e90\u4e0d\u5b58\u5728\u6216\u8005\u4e0d\u53ef\u8fbe +view_inventory_resources_deleteConfirm = \u786e\u5b9a\u5220\u9664\u9009\u4e2d\u7684\u8d44\u6e90\uff1f +view_inventory_resources_deleteFailed = \u5220\u9664\u6307\u5b9a\u7684\u8d44\u6e90\u5931\u8d25 +view_inventory_resources_deleteSuccessful = \u6210\u529f\u7684\u5220\u9664\u6307\u5b9a\u7684\u8d44\u6e90 +view_inventory_resources_loadFailed = \u52a0\u8f7d\u8d44\u6e90\u7ec4\u5408\u6570\u636e\u5931\u8d25 +view_inventory_resources_title = \u8d44\u6e90 +view_inventory_resources_title_children = \u5b50\u8d44\u6e90 +view_inventory_resources_title_members = \u6210\u5458\u8d44\u6e90 +view_inventory_resources_uninventoryConfirm = \u786e\u5b9a\u628a\u9009\u4e2d\u7684\u8d44\u6e90\u4ece\u6e05\u5355\u4e2d\u5220\u9664? \u6ce8\u610f\uff1a\u5982\u679c\u67d0\u4e2a\u9009\u4e2d\u7684\u8d44\u6e90\u4f9d\u7136\u5b58\u5728, \u5219\u7cfb\u7edf\u4f1a\u5728\u6b64\u8d44\u6e90\u7684\u5ba2\u6237\u7aef\u7a0b\u5e8f\u4e0b\u6b21\u63a2\u7d22\u626b\u63cf\u65f6\u91cd\u65b0\u52a0\u8f7d\u6b64\u8d44\u6e90. +view_inventory_resources_uninventoryFailed = \u4ece\u6e05\u5355\u4e2d\u5220\u9664\u9009\u4e2d\u7684\u8d44\u6e90\u5931\u8d25 +view_inventory_resources_uninventorySuccessful = \u6210\u529f\u4ece\u6e05\u5355\u4e2d\u5220\u9664\u9009\u4e2d\u7684\u8d44\u6e90 +view_inventory_sectionHelp = \u6b64\u6a21\u5757\u53ef\u4ee5\u67e5\u770b\u548c\u7ba1\u7406\u65b0\u53d1\u73b0\u7684\u8d44\u6e90,\u5206\u7c7b\u7684\u8d44\u6e90\u548c\u7ec4. +view_inventory_servers = \u670d\u52a1\u5668 +view_inventory_services = \u670d\u52a1 +view_inventory_summary_agent_error1 = \u67e5\u627e\u5ba2\u6237\u7aef\u7ba1\u7406\u7684\u8d44\u6e90id\u5931\u8d25 +view_inventory_summary_agent_error2 = \u5ba2\u6237\u7aef\u7ba1\u7406\u7684\u8d44\u6e90ping\u4e0d\u901a +view_inventory_summary_agent_error3 = \u6ca1\u6709\u6743\u9650\u67e5\u770b\u6b64\u5ba2\u6237\u7aef\u7684\u8be6\u7ec6\u4fe1\u606f. view_inventory_summary_agent_fullEnpoint = Full Endpoint view_inventory_summary_agent_fullEnpoint_err1 = !No remote endpoint associated with this resource! -view_inventory_summary_agent_last_title = \u6700\u540E\u63A5\u6536\u5230\u7684\u53EF\u7528\u4FE1\u606F\u62A5\u544A -view_inventory_summary_agent_status_title = \u5BA2\u6237\u7AEF\u901A\u4FE1\u72B6\u6001 -view_inventory_summary_agent_title = \u5BA2\u6237\u7AEF\u7BA1\u7406\u6B64\u8D44\u6E90 -view_inventory_unavailableServers = \u4E0D\u53EF\u7528\u7684\u670D\u52A1 -view_leftNav_unknownPage = \u6A21\u5757[{1}]\u4E0B\u672A\u77E5\u7684\u9875\u9762[{0}] - \u94FE\u63A5\u65E0\u6548. -view_login_invalidEmail = \u65E0\u6548\u7684\u90AE\u7BB1\u5730\u5740 -view_login_login = \u767B\u5F55 -view_login_logout = \u6CE8\u9500 -view_login_noBackend = \u540E\u7AEF\u6570\u636E\u4E0D\u53EF\u8FBE. -view_login_noLdap = \u63D0\u793A: \u83B7\u53D6\u53EF\u9009\u7684ldap\u4FE1\u606F\u5931\u8D25. \u9700\u8981\u624B\u5DE5\u8F93\u5165. -view_login_noUser = \u7528\u6237\u540D\u6216\u8005\u5BC6\u7801\u4E0D\u5339\u914D. -view_login_prompt = \u8BF7\u767B\u5F55 -view_login_registerLater = (\u53D6\u6D88 - \u7A0D\u540E\u5B8C\u6210\u6CE8\u518C.) -view_login_registerLdapSuccess = \u6210\u529F\u6CE8\u518C\u65B0\u7684LDAP\u7528\u6237. -view_login_registerUser = \u7528\u6237\u6CE8\u518C -view_login_welcome = \u6B22\u8FCE -view_login_welcomeMsg = \u6B22\u8FCE\u6765\u5230 RHQ! \u8F93\u5165\u6216\u8005\u4FEE\u6539\u4E0B\u9762\u7684\u4FE1\u606F\uFF0C\u4EE5\u5B8C\u6210\u6CE8\u518C \u70B9\u51FB"OK", \u5C31\u53EF\u4EE5\u767B\u5F55\u7CFB\u7EDF. -view_measureRange_last = \u65F6\u95F4\u8303\u56F4 - \u5148\u524D\u7684 -view_measureRange_simple = \u4E00\u822C... -view_measureRange_start = \u65F6\u95F4\u8303\u56F4 - \u8D77\u59CB -view_measureTable_chartMetricValues = Chart Selected Metrics -view_measureTable_getLive = Get Live Value +view_inventory_summary_agent_last_title = \u6700\u540e\u63a5\u6536\u5230\u7684\u53ef\u7528\u4fe1\u606f\u62a5\u544a +view_inventory_summary_agent_status_title = \u5ba2\u6237\u7aef\u901a\u4fe1\u72b6\u6001 +view_inventory_summary_agent_title = \u5ba2\u6237\u7aef\u7ba1\u7406\u6b64\u8d44\u6e90 +view_inventory_unavailableServers = \u4e0d\u53ef\u7528\u7684\u670d\u52a1 +view_leftNav_unknownPage = \u6a21\u5757[{1}]\u4e0b\u672a\u77e5\u7684\u9875\u9762[{0}] - \u94fe\u63a5\u65e0\u6548. +view_login_invalidEmail = \u65e0\u6548\u7684\u90ae\u7bb1\u5730\u5740 +view_login_login = \u767b\u5f55 +view_login_logout = \u6ce8\u9500 +view_login_noBackend = \u540e\u7aef\u6570\u636e\u4e0d\u53ef\u8fbe. +view_login_noLdap = \u63d0\u793a: \u83b7\u53d6\u53ef\u9009\u7684ldap\u4fe1\u606f\u5931\u8d25. \u9700\u8981\u624b\u5de5\u8f93\u5165. +view_login_noUser = \u7528\u6237\u540d\u6216\u8005\u5bc6\u7801\u4e0d\u5339\u914d. +view_login_prompt = \u8bf7\u767b\u5f55 +view_login_registerLater = (\u53d6\u6d88 - \u7a0d\u540e\u5b8c\u6210\u6ce8\u518c.) +view_login_registerLdapSuccess = \u6210\u529f\u6ce8\u518c\u65b0\u7684LDAP\u7528\u6237. +view_login_registerUser = \u7528\u6237\u6ce8\u518c +view_login_welcome = \u6b22\u8fce +view_login_welcomeMsg = \u6b22\u8fce\u6765\u5230 RHQ! \u8f93\u5165\u6216\u8005\u4fee\u6539\u4e0b\u9762\u7684\u4fe1\u606f\uff0c\u4ee5\u5b8c\u6210\u6ce8\u518c \u70b9\u51fb"OK", \u5c31\u53ef\u4ee5\u767b\u5f55\u7cfb\u7edf. +view_measureRange_last = \u65f6\u95f4\u8303\u56f4 - \u5148\u524d\u7684 +view_measureRange_simple = \u4e00\u822c... +view_measureRange_start = \u65f6\u95f4\u8303\u56f4 - \u8d77\u59cb +view_measureTable_chartMetricValues = \u751f\u6210\u6307\u6807\u56fe +view_measureTable_getLive = \u53d6\u5f97\u6d3b\u52a8\u6570\u636e view_measureTable_getLive_failure = Cannot get live values for those metrics. Make sure the agent is running and the managed resource is up. -view_measureTable_live_title = \u52A8\u6001\u6570\u636E -view_measure_nan = --\u65E0\u6570\u636E-- -view_measurementOob_title = Suspect Metrics -view_menuBar_logout = \u6CE8\u9500 -view_messageCenter_clearAllMessages = \u6E05\u9664\u6240\u6709\u7684\u6D88\u606F -view_messageCenter_lastNMessages = \u6700\u540E {0} \u6761\u4FE1\u606F -view_messageCenter_maxMessages = \u6700\u5927\u6D88\u606F\u91CF -view_messageCenter_messageBarShowDetails = \u663E\u793A\u5185\u5BB9 -view_messageCenter_messageDetail = \u8BE6\u7EC6\u5185\u5BB9 -view_messageCenter_messageSeverity = \u91CD\u8981\u7EA7\u522B -view_messageCenter_messageTime = \u65F6\u95F4 -view_messageCenter_messageTitle = \u6D88\u606F\u4E2D\u5FC3 -view_messageCenter_noRecentMessages = \u65E0\u8FD1\u671F\u6D88\u606F -view_messageCenter_stackTraceFollows = --- \u540E\u9762\u662F\u5F02\u5E38\u4FE1\u606F --- -view_metric_traits = Traits +view_measureTable_live_title = \u52a8\u6001\u6570\u636e +view_measure_nan = --\u65e0\u6570\u636e-- +view_measurementOob_title = \u53ef\u7591\u7684\u6307\u6807 +view_menuBar_logout = \u6ce8\u9500 +view_messageCenter_clearAllMessages = \u6e05\u9664\u6240\u6709\u7684\u6d88\u606f +view_messageCenter_lastNMessages = \u6700\u540e {0} \u6761\u4fe1\u606f +view_messageCenter_maxMessages = \u6700\u5927\u6d88\u606f\u91cf +view_messageCenter_messageBarShowDetails = \u663e\u793a\u5185\u5bb9 +view_messageCenter_messageDetail = \u8be6\u7ec6\u5185\u5bb9 +view_messageCenter_messageSeverity = \u91cd\u8981\u7ea7\u522b +view_messageCenter_messageTime = \u65f6\u95f4 +view_messageCenter_messageTitle = \u6d88\u606f\u4e2d\u5fc3 +view_messageCenter_noRecentMessages = \u65e0\u8fd1\u671f\u6d88\u606f +view_messageCenter_stackTraceFollows = --- \u540e\u9762\u662f\u5f02\u5e38\u4fe1\u606f --- +view_metric_traits = \u7279\u5f81 view_metric_viewTraitHistory = Value History for Trait [{0}] -view_operationHistoryDetails_dateCompleted = Date Completed -view_operationHistoryDetails_dateSubmitted = Date Submitted -view_operationHistoryDetails_error_fetchFailure = \u52A0\u8F7D\u64CD\u4F5C\u5386\u53F2\u5931\u8D25. -view_operationHistoryDetails_noResults = \u6B64\u64CD\u4F5C\u6CA1\u6709\u4EFB\u4F55\u8FD4\u56DE. -view_operationHistoryDetails_operation = \u64CD\u4F5C -view_operationHistoryDetails_parameters = \u53C2\u6570 -view_operationHistoryDetails_requestor = \u8BF7\u6C42 -view_operationHistoryDetails_results = \u7ED3\u679C -view_operationHistoryDetails_status = \u72B6\u6001 -view_operationHistoryList_button_forceDelete = \u5F3A\u5236\u5220\u9664 -view_operationHistoryList_button_runOperation = \u6267\u884C\u64CD\u4F5C -view_operationHistoryList_notYetStarted = \u8FD8\u672A\u5F00\u59CB -view_operationHistoryList_title = \u64CD\u4F5C\u5386\u53F2 -view_operationScheduleDetails_enterParametersBelow = \u8F93\u5165\u4E0B\u9762\u7684\u53C2\u6570... -view_operationScheduleDetails_fieldDefault_description = \u9009\u62E9\u64CD\u4F5C\u67E5\u770B\u63CF\u8FF0. -view_operationScheduleDetails_fieldDefault_parameters = \u9009\u62E9\u64CD\u4F5C\u67E5\u770B\u6240\u9700\u7684\u53C2\u6570. -view_operationScheduleDetails_fieldHelp_description = \u6B64\u8C03\u5EA6\u64CD\u4F5C\u7684\u53EF\u9009\u63CF\u8FF0 (e.g. \u6BCF\u591C\u7EF4\u62A4\u5E94\u7528\u670D\u52A1\u91CD\u542F) -view_operationScheduleDetails_fieldHelp_timeout = \u64CD\u4F5C\u6301\u7EED\u65F6\u95F4 - \u5982\u679C\u6307\u5B9A, \u5E76\u4E14\u8D85\u8FC7\u4E86\u6307\u5B9A\u7684\u65F6\u95F4\u64CD\u4F5C\u6CA1\u6709\u5B8C\u6210, RHQ \u670D\u52A1\u5224\u5B9A\u6B64\u64CD\u4F5C\u8D85\u65F6\u5E76\u4E14\u6807\u4E3A\u5931\u8D25; \u63D0\u793A, \u901A\u5E38 \u4E0D\u53EF\u80FD\u7EC8\u6B62\u5DF2\u7ECF\u5F00\u59CB\u8FD0\u884C\u7684\u540E\u53F0\u8D44\u6E90\u7BA1\u7406\u7684\u64CD\u4F5C. -view_operationScheduleDetails_field_description = \u63CF\u8FF0 -view_operationScheduleDetails_field_parameters = \u53C2\u6570 -view_operationScheduleDetails_field_timeout = \u8D85\u65F6 -view_operationScheduleDetails_noParameters = \u6B64\u64CD\u4F5C\u4E0D\u9700\u8981\u4EFB\u4F55\u53C2\u6570. -view_operationScheduleDetails_operationSchedule = \u64CD\u4F5C\u8BA1\u5212 -view_portlet_autodiscovery_setting_platforms = \u5E73\u53F0\u7ED3\u679C\u96C6 -view_portlet_configure_definitionDesc = portlet\u914D\u7F6E\u8BBE\u7F6E\u63CF\u8FF0. -view_portlet_configure_definitionTitle = Portlet\u914D\u7F6E -view_portlet_configure_needed = \u70B9\u51FB\u8BBE\u7F6E\u6309\u94AE\u914D\u7F6Eportlet. -view_portlet_configure_notNeeded = \u6B64 portlet\u65E0\u9700\u914D\u7F6E. -view_portlet_defaultName_autodiscovery = \u63A2\u7D22\u961F\u5217 -view_portlet_defaultName_favoriteResources = \u5E38\u7528\u8D44\u6E90 -view_portlet_defaultName_groupMetric = \u516C\u7528\u8D44\u6E90\u7EC4\u56FE\u6807 -view_portlet_defaultName_group_alerts = \u7EC4: \u544A\u8B66 -view_portlet_defaultName_group_bundles = \u7EC4: \u7C7B\u53D1\u5E03 -view_portlet_defaultName_group_config_updates = \u7EC4: \u914D\u7F6E\u66F4\u65B0 -view_portlet_defaultName_group_events = \u7EC4: \u4E8B\u4EF6\u7EDF\u8BA1 -view_portlet_defaultName_group_metrics = \u7EC4: Metrics -view_portlet_defaultName_group_oobs = \u7EC4: OOB\u72B6\u6001 -view_portlet_defaultName_group_operations = \u7EC4: \u64CD\u4F5C\u96C6 -view_portlet_defaultName_group_pkg_hisory = \u7EC4: \u5386\u53F2\u6570\u636E\u5305 -view_portlet_defaultName_inventorySummary = \u6E05\u5355\u6982\u8981 +view_operationHistoryDetails_dateCompleted = \u5b8c\u6210\u65e5\u671f +view_operationHistoryDetails_dateSubmitted = \u63d0\u4ea4\u65e5\u671f +view_operationHistoryDetails_error_fetchFailure = \u52a0\u8f7d\u64cd\u4f5c\u5386\u53f2\u5931\u8d25. +view_operationHistoryDetails_noResults = \u6b64\u64cd\u4f5c\u6ca1\u6709\u4efb\u4f55\u8fd4\u56de. +view_operationHistoryDetails_operation = \u64cd\u4f5c +view_operationHistoryDetails_parameters = \u53c2\u6570 +view_operationHistoryDetails_requestor = \u8bf7\u6c42 +view_operationHistoryDetails_results = \u7ed3\u679c +view_operationHistoryDetails_status = \u72b6\u6001 +view_operationHistoryList_button_forceDelete = \u5f3a\u5236\u5220\u9664 +view_operationHistoryList_button_runOperation = \u6267\u884c\u64cd\u4f5c +view_operationHistoryList_notYetStarted = \u8fd8\u672a\u5f00\u59cb +view_operationHistoryList_title = \u64cd\u4f5c\u5386\u53f2 +view_operationScheduleDetails_enterParametersBelow = \u8f93\u5165\u4e0b\u9762\u7684\u53c2\u6570... +view_operationScheduleDetails_fieldDefault_description = \u9009\u62e9\u64cd\u4f5c\u67e5\u770b\u63cf\u8ff0. +view_operationScheduleDetails_fieldDefault_parameters = \u9009\u62e9\u64cd\u4f5c\u67e5\u770b\u6240\u9700\u7684\u53c2\u6570. +view_operationScheduleDetails_fieldHelp_description = \u6b64\u8c03\u5ea6\u64cd\u4f5c\u7684\u53ef\u9009\u63cf\u8ff0 (e.g. \u6bcf\u591c\u7ef4\u62a4\u5e94\u7528\u670d\u52a1\u91cd\u542f) +view_operationScheduleDetails_fieldHelp_timeout = \u64cd\u4f5c\u6301\u7eed\u65f6\u95f4 - \u5982\u679c\u6307\u5b9a, \u5e76\u4e14\u8d85\u8fc7\u4e86\u6307\u5b9a\u7684\u65f6\u95f4\u64cd\u4f5c\u6ca1\u6709\u5b8c\u6210, RHQ \u670d\u52a1\u5224\u5b9a\u6b64\u64cd\u4f5c\u8d85\u65f6\u5e76\u4e14\u6807\u4e3a\u5931\u8d25; \u63d0\u793a, \u901a\u5e38 \u4e0d\u53ef\u80fd\u7ec8\u6b62\u5df2\u7ecf\u5f00\u59cb\u8fd0\u884c\u7684\u540e\u53f0\u8d44\u6e90\u7ba1\u7406\u7684\u64cd\u4f5c. +view_operationScheduleDetails_field_description = \u63cf\u8ff0 +view_operationScheduleDetails_field_parameters = \u53c2\u6570 +view_operationScheduleDetails_field_timeout = \u8d85\u65f6 +view_operationScheduleDetails_noParameters = \u6b64\u64cd\u4f5c\u4e0d\u9700\u8981\u4efb\u4f55\u53c2\u6570. +view_operationScheduleDetails_operationSchedule = \u64cd\u4f5c\u8ba1\u5212 +view_portlet_autodiscovery_setting_platforms = \u5e73\u53f0\u7ed3\u679c\u96c6 +view_portlet_configure_definitionDesc = portlet\u914d\u7f6e\u8bbe\u7f6e\u63cf\u8ff0. +view_portlet_configure_definitionTitle = Portlet\u914d\u7f6e +view_portlet_configure_needed = \u70b9\u51fb\u8bbe\u7f6e\u6309\u94ae\u914d\u7f6eportlet. +view_portlet_configure_notNeeded = \u6b64 portlet\u65e0\u9700\u914d\u7f6e. +view_portlet_defaultName_autodiscovery = \u63a2\u7d22\u961f\u5217 +view_portlet_defaultName_favoriteResources = \u5e38\u7528\u8d44\u6e90 +view_portlet_defaultName_groupMetric = \u516c\u7528\u8d44\u6e90\u7ec4\u56fe\u6807 +view_portlet_defaultName_group_alerts = \u7ec4: \u544a\u8b66 +view_portlet_defaultName_group_bundles = \u7ec4: \u7c7b\u53d1\u5e03 +view_portlet_defaultName_group_config_updates = \u7ec4: \u914d\u7f6e\u66f4\u65b0 +view_portlet_defaultName_group_events = \u7ec4: \u4e8b\u4ef6\u7edf\u8ba1 +view_portlet_defaultName_group_metrics = \u7ec4: \u6307\u6807 +view_portlet_defaultName_group_oobs = \u7ec4: OOB\u72b6\u6001 +view_portlet_defaultName_group_operations = \u7ec4: \u64cd\u4f5c\u96c6 +view_portlet_defaultName_group_pkg_hisory = \u7ec4: \u5386\u53f2\u6570\u636e\u5305 +view_portlet_defaultName_inventorySummary = \u6e05\u5355\u6982\u8981 view_portlet_defaultName_mashup = Mashup -view_portlet_defaultName_message = \u4FE1\u606F -view_portlet_defaultName_operations = \u8FD1\u671F\u64CD\u4F5C -view_portlet_defaultName_platformSummary = \u5E73\u53F0\u5229\u7528\u7387 -view_portlet_defaultName_problemResources = \u544A\u8B66\u6216\u8005\u4E0D\u53EF\u7528\u7684\u8D44\u6E90 -view_portlet_defaultName_recentAlerts = \u65B0\u544A\u8B66 -view_portlet_defaultName_recentlyAddedResources = \u65B0\u6DFB\u52A0\u8D44\u6E90 -view_portlet_defaultName_resourceMetric = \u516C\u7528\u8D44\u6E90\u56FE\u6807 -view_portlet_defaultName_resource_alerts = \u8D44\u6E90: \u544A\u8B66 -view_portlet_defaultName_resource_bundles = \u8D44\u6E90: \u7C7B\u53D1\u5E03 -view_portlet_defaultName_resource_config_updates = \u8D44\u6E90: \u914D\u7F6E\u66F4\u65B0 -view_portlet_defaultName_resource_events = \u8D44\u6E90: \u4E8B\u4EF6\u7EDF\u8BA1 -view_portlet_defaultName_resource_metrics = \u8D44\u6E90: \u5C5E\u6027 -view_portlet_defaultName_resource_oobs = \u8D44\u6E90: OOB Metrics -view_portlet_defaultName_resource_operations = \u8D44\u6E90: \u64CD\u4F5C -view_portlet_defaultName_resource_pkg_hisory = \u8D44\u6E90: \u5386\u53F2\u6570\u636E\u5305 -view_portlet_defaultName_tagCloud = \u6807\u7B7E\u4E91 -view_portlet_factory_invalidPortlet = \u8FD9\u662F\u4E00\u4E2A\u9648\u65E7\u5E76\u4E14\u5DF2\u7ECF\u5931\u6548\u7684portlet. \u8BF7\u5220\u9664. +view_portlet_defaultName_message = \u4fe1\u606f +view_portlet_defaultName_operations = \u8fd1\u671f\u64cd\u4f5c +view_portlet_defaultName_platformSummary = \u5e73\u53f0\u5229\u7528\u7387 +view_portlet_defaultName_problemResources = \u544a\u8b66\u6216\u8005\u4e0d\u53ef\u7528\u7684\u8d44\u6e90 +view_portlet_defaultName_recentAlerts = \u65b0\u544a\u8b66 +view_portlet_defaultName_recentlyAddedResources = \u65b0\u6dfb\u52a0\u8d44\u6e90 +view_portlet_defaultName_resourceMetric = \u516c\u7528\u8d44\u6e90\u56fe\u6807 +view_portlet_defaultName_resource_alerts = \u8d44\u6e90: \u544a\u8b66 +view_portlet_defaultName_resource_bundles = \u8d44\u6e90: \u7c7b\u53d1\u5e03 +view_portlet_defaultName_resource_config_updates = \u8d44\u6e90: \u914d\u7f6e\u66f4\u65b0 +view_portlet_defaultName_resource_events = \u8d44\u6e90: \u4e8b\u4ef6\u7edf\u8ba1 +view_portlet_defaultName_resource_metrics = \u8d44\u6e90: \u5c5e\u6027 +view_portlet_defaultName_resource_oobs = \u8d44\u6e90: OOB\u6307\u6807 +view_portlet_defaultName_resource_operations = \u8d44\u6e90: \u64cd\u4f5c +view_portlet_defaultName_resource_pkg_hisory = \u8d44\u6e90: \u5386\u53f2\u6570\u636e\u5305 +view_portlet_defaultName_tagCloud = \u6807\u7b7e\u4e91 +view_portlet_factory_invalidPortlet = \u8fd9\u662f\u4e00\u4e2a\u9648\u65e7\u5e76\u4e14\u5df2\u7ecf\u5931\u6548\u7684portlet. \u8bf7\u5220\u9664. view_portlet_graph_configure_metricDefinition_graph = The metric definition id to graph view_portlet_graph_configure_resource_graph = The resource to graph -view_portlet_help_autodiscovery = \u6B64portlet\u5141\u8BB8\u5BFC\u5165 \u6216\u8005\u5931\u6548\u65B0\u53D1\u73B0\u7684\u8D44\u6E90. \u5BFC\u5165\u7684\u8D44\u6E90\u5C06\u4F1A\u6DFB\u52A0\u81F3\u76D1\u63A7\u548C\u7BA1\u7406\u6E05\u5355\u4E2D\uFF0C\u5931\u6548\u7684\u8D44\u6E90\u5C06\u4E0D\u4F1A\u88AB\u5BFC\u5165\u5E76\u4E14 \u662F\u4E0D\u53EF\u89C1\u7684\uFF0C\u9664\u975E\u660E\u786E\u6307\u5B9A\u4E0D\u53EF\u5931\u6548. -view_portlet_help_bundle_deps = \u6B64portlet\u5C55\u793A\u57FA\u4E8E\u6807\u51C6\u914D\u7F6E\u663E\u793A\u7684\u76F8\u5173\u53D1\u5E03\u7C7B. -view_portlet_help_config_updates = \u6B64portlet\u5C55\u793A\u4E0E\u914D\u7F6E\u8BBE\u7F6E\u517C\u5BB9\u7684\u6700\u65B0\u7684\u914D\u7F6E\u4FEE\u6539. +view_portlet_help_autodiscovery = \u6b64portlet\u5141\u8bb8\u5bfc\u5165 \u6216\u8005\u5931\u6548\u65b0\u53d1\u73b0\u7684\u8d44\u6e90. \u5bfc\u5165\u7684\u8d44\u6e90\u5c06\u4f1a\u6dfb\u52a0\u81f3\u76d1\u63a7\u548c\u7ba1\u7406\u6e05\u5355\u4e2d\uff0c\u5931\u6548\u7684\u8d44\u6e90\u5c06\u4e0d\u4f1a\u88ab\u5bfc\u5165\u5e76\u4e14 \u662f\u4e0d\u53ef\u89c1\u7684\uff0c\u9664\u975e\u660e\u786e\u6307\u5b9a\u4e0d\u53ef\u5931\u6548. +view_portlet_help_bundle_deps = \u6b64portlet\u5c55\u793a\u57fa\u4e8e\u6807\u51c6\u914d\u7f6e\u663e\u793a\u7684\u76f8\u5173\u53d1\u5e03\u7c7b. +view_portlet_help_config_updates = \u6b64portlet\u5c55\u793a\u4e0e\u914d\u7f6e\u8bbe\u7f6e\u517c\u5bb9\u7684\u6700\u65b0\u7684\u914d\u7f6e\u4fee\u6539. view_portlet_help_eventcounts = This portlet displays Event counts consistent with display criteria configured. view_portlet_help_favoriteResources = This portlet displays the current user''s favorite resources. view_portlet_help_graph = This portlet displays the resource metric graph. @@ -1458,7 +1464,7 @@ view_portlet_help_inventorySummary = This portlet displays a short summary of th view_portlet_help_mashup = This portlet displays the returned content of a remote HTTP request (via an iframe). view_portlet_help_message = This portlet displays a static HTML message. The message property must be configured. view_portlet_help_metrics = This portlet graphs relevant recent metric data based on display criteria configured. -view_portlet_help_none = \u8FD9\u4E2Aportlet\u6CA1\u6709\u5E2E\u52A9. +view_portlet_help_none = \u8fd9\u4e2aportlet\u6ca1\u6709\u5e2e\u52a9. view_portlet_help_oobs = This portlet displays OOB(Out of Bound) metric conditions. view_portlet_help_operations = This portlet displays the most recently executed operations for the current user''s inventory. view_portlet_help_operations_criteria = This portlet displays Operations consistent with display criteria configured. @@ -1469,332 +1475,332 @@ view_portlet_help_recentAlerts = This portlet displays alerts recently fired on view_portlet_help_recentlyAdded = This portlet displays resources that have recently been imported into inventory. view_portlet_help_scheduledOperations = This portlet displays the next scheduled operations for the current user''s inventory. view_portlet_help_tagCloud = This portlet displays the relative tag counts for the current user''s inventory. -view_portlet_inventory_error1 = Failed to retrieve inventory summary -view_portlet_inventory_tooltip_collapse = Click to hide details for this resource. -view_portlet_inventory_tooltip_expand = Click to show more details for this resource. -view_portlet_message_title = \u663E\u793A\u4FE1\u606F. -view_portlet_operations_config_completed = \u5DF2\u5B8C\u6210\u7684\u64CD\u4F5C -view_portlet_operations_config_completed_enable = \u662F\u5426\u5BF9\u7EDF\u8BA1\u8868\u76D8\u7684\u5DF2\u5B8C\u6210\u64CD\u4F5C\u7684\u7ED3\u679C\u5206\u7EC4. -view_portlet_operations_config_completed_maximum = \u80FD\u5C55\u793A\u7684\u5DF2\u5B8C\u6210\u64CD\u4F5C\u7684\u6700\u5927\u6570. -view_portlet_operations_config_scheduled_enable = \u662F\u5426\u5BF9\u7EDF\u8BA1\u8868\u76D8\u7684\u8C03\u5EA6\u4E2D\u64CD\u4F5C\u7684\u7ED3\u679C\u5206\u7EC4. -view_portlet_operations_config_scheduled_maximum = \u80FD\u5C55\u793A\u7684\u8C03\u5EA6\u64CD\u4F5C\u7684\u6700\u5927\u6570. +view_portlet_inventory_error1 = \u65e0\u6cd5\u68c0\u7d22\u6e05\u5355\u6c47\u603b +view_portlet_inventory_tooltip_collapse = \u70b9\u51fb\u9690\u85cf\u6b64\u8d44\u6e90\u7684\u8be6\u7ec6\u4fe1\u606f. +view_portlet_inventory_tooltip_expand = \u70b9\u51fb\u663e\u793a\u6b64\u8d44\u6e90\u7684\u66f4\u591a\u7ec6\u8282. +view_portlet_message_title = \u663e\u793a\u4fe1\u606f. +view_portlet_operations_config_completed = \u5df2\u5b8c\u6210\u7684\u64cd\u4f5c +view_portlet_operations_config_completed_enable = \u662f\u5426\u5bf9\u7edf\u8ba1\u8868\u76d8\u7684\u5df2\u5b8c\u6210\u64cd\u4f5c\u7684\u7ed3\u679c\u5206\u7ec4. +view_portlet_operations_config_completed_maximum = \u80fd\u5c55\u793a\u7684\u5df2\u5b8c\u6210\u64cd\u4f5c\u7684\u6700\u5927\u6570. +view_portlet_operations_config_scheduled_enable = \u662f\u5426\u5bf9\u7edf\u8ba1\u8868\u76d8\u7684\u8c03\u5ea6\u4e2d\u64cd\u4f5c\u7684\u7ed3\u679c\u5206\u7ec4. +view_portlet_operations_config_scheduled_maximum = \u80fd\u5c55\u793a\u7684\u8c03\u5ea6\u64cd\u4f5c\u7684\u6700\u5927\u6570. view_portlet_operations_config_show_last = show last view_portlet_operations_config_show_next = show next -view_portlet_operations_disabled = (\u76EE\u524D\u7ED3\u679C\u96C6\u7981\u7528.\u4FEE\u6539\u8BBE\u7F6E\u4F7F\u5176\u751F\u6548. -view_portlet_platform_platform_error_1 = \u52A0\u8F7D\u5E73\u53F0\u6307\u6807\u5931\u8D25 -view_portlet_platform_type_error_1 = \u65E0\u6CD5\u52A0\u8F7D\u7C7B\u578B\u6570\u636E -view_portlet_problemResources_config_display_maximum = \u80FD\u5C55\u793A\u7684\u95EE\u9898\u8D44\u6E90\u7684\u6700\u5927\u6570. -view_portlet_problemResources_config_display_range = \u663E\u793A\u6570\u5C0F\u65F6\u5185\u6062\u590D\u6B63\u5E38\u7684\u95EE\u9898\u8D44\u6E90. -view_portlet_problemResources_config_display_range2 = \u4ECE {0} \u5230 {1} -view_portlet_problemResources_maxDisplaySetting = \u8D44\u6E90\u6700\u5927\u6570. -view_portlet_recentAlerts_config_members = \u9009\u62E9\u6210\u5458 -view_portlet_recentAlerts_config_priority_label = \u4E4B\u524D\u7684\u544A\u8B66, -view_portlet_recentAlerts_config_when = \u5728\u8FC7\u53BB -view_portlet_recentAlerts_fail_msg = \u52A0\u8F7D\u544A\u8B66\u8FC7\u6EE4\u7684\u6307\u5B9A\u8D44\u6E90\u5931\u8D25. -view_portlet_recentlyAdded_error1 = \u52A0\u8F7D\u6700\u65B0\u6DFB\u52A0\u7684\u8D44\u6E90\u5931\u8D25 -view_portlet_recentlyAdded_setting_addedPlatforms = \u65B0\u6DFB\u52A0\u5E73\u53F0 -view_portlet_results_empty = \u4F7F\u7528\u6307\u5B9A\u7684\u6807\u51C6\u65E0\u7ED3\u679C\u8FD4\u56DE. -view_remoteAgentInstall_agentStatus = \u4EE3\u7406\u72B6\u6001 -view_remoteAgentInstall_agentStatusDefault = -\u5355\u51FB\u66F4\u65B0\u72B6\u6001\u6309\u94AE- -view_remoteAgentInstall_buttonFindAgent = \u67E5\u627E\u4EE3\u7406 -view_remoteAgentInstall_connInfo = \u8FDE\u63A5\u4FE1\u606F -view_remoteAgentInstall_error_1 = \u67E5\u627E\u4EE3\u7406\u5B89\u88C5\u8DEF\u5F84\u65F6\u53D1\u751F\u9519\u8BEF -view_remoteAgentInstall_error_2 = \u65E0\u6CD5\u5728\u901A\u5E38\u4F4D\u7F6E\u53D1\u73B0\u5B89\u88C5\u7684\u4EE3\u7406 -view_remoteAgentInstall_error_3 = \u65E0\u6CD5\u770B\u5230\u5728[{0}]\u4E2D\u5B89\u88C5\u4E86\u4EE3\u7406 -view_remoteAgentInstall_error_4 = \u5B89\u88C5\u4EE3\u7406\u5931\u8D25 -view_remoteAgentInstall_error_5 = \u542F\u52A8\u4EE3\u7406\u5931\u8D25 -view_remoteAgentInstall_error_6 = \u505C\u6B62\u4EE3\u7406\u5931\u8D25 -view_remoteAgentInstall_installAgent = \u5B89\u88C5\u4EE3\u7406 -view_remoteAgentInstall_installInfo = \u4EE3\u7406\u5B89\u88C5\u4FE1\u606F -view_remoteAgentInstall_installPath = \u4EE3\u7406\u5B89\u88C5\u8DEF\u5F84 +view_portlet_operations_disabled = (\u76ee\u524d\u7ed3\u679c\u96c6\u7981\u7528.\u4fee\u6539\u8bbe\u7f6e\u4f7f\u5176\u751f\u6548. +view_portlet_platform_platform_error_1 = \u52a0\u8f7d\u5e73\u53f0\u6307\u6807\u5931\u8d25 +view_portlet_platform_type_error_1 = \u65e0\u6cd5\u52a0\u8f7d\u7c7b\u578b\u6570\u636e +view_portlet_problemResources_config_display_maximum = \u80fd\u5c55\u793a\u7684\u95ee\u9898\u8d44\u6e90\u7684\u6700\u5927\u6570. +view_portlet_problemResources_config_display_range = \u663e\u793a\u6570\u5c0f\u65f6\u5185\u6062\u590d\u6b63\u5e38\u7684\u95ee\u9898\u8d44\u6e90. +view_portlet_problemResources_config_display_range2 = \u4ece {0} \u5230 {1} +view_portlet_problemResources_maxDisplaySetting = \u8d44\u6e90\u6700\u5927\u6570. +view_portlet_recentAlerts_config_members = \u9009\u62e9\u6210\u5458 +view_portlet_recentAlerts_config_priority_label = \u4e4b\u524d\u7684\u544a\u8b66, +view_portlet_recentAlerts_config_when = \u5728\u8fc7\u53bb +view_portlet_recentAlerts_fail_msg = \u52a0\u8f7d\u544a\u8b66\u8fc7\u6ee4\u7684\u6307\u5b9a\u8d44\u6e90\u5931\u8d25. +view_portlet_recentlyAdded_error1 = \u52a0\u8f7d\u6700\u65b0\u6dfb\u52a0\u7684\u8d44\u6e90\u5931\u8d25 +view_portlet_recentlyAdded_setting_addedPlatforms = \u65b0\u6dfb\u52a0\u5e73\u53f0 +view_portlet_results_empty = \u4f7f\u7528\u6307\u5b9a\u7684\u6807\u51c6\u65e0\u7ed3\u679c\u8fd4\u56de. +view_remoteAgentInstall_agentStatus = \u4ee3\u7406\u72b6\u6001 +view_remoteAgentInstall_agentStatusDefault = -\u5355\u51fb\u66f4\u65b0\u72b6\u6001\u6309\u94ae- +view_remoteAgentInstall_buttonFindAgent = \u67e5\u627e\u4ee3\u7406 +view_remoteAgentInstall_connInfo = \u8fde\u63a5\u4fe1\u606f +view_remoteAgentInstall_error_1 = \u67e5\u627e\u4ee3\u7406\u5b89\u88c5\u8def\u5f84\u65f6\u53d1\u751f\u9519\u8bef +view_remoteAgentInstall_error_2 = \u65e0\u6cd5\u5728\u901a\u5e38\u4f4d\u7f6e\u53d1\u73b0\u5b89\u88c5\u7684\u4ee3\u7406 +view_remoteAgentInstall_error_3 = \u65e0\u6cd5\u770b\u5230\u5728[{0}]\u4e2d\u5b89\u88c5\u4e86\u4ee3\u7406 +view_remoteAgentInstall_error_4 = \u5b89\u88c5\u4ee3\u7406\u5931\u8d25 +view_remoteAgentInstall_error_5 = \u542f\u52a8\u4ee3\u7406\u5931\u8d25 +view_remoteAgentInstall_error_6 = \u505c\u6b62\u4ee3\u7406\u5931\u8d25 +view_remoteAgentInstall_installAgent = \u5b89\u88c5\u4ee3\u7406 +view_remoteAgentInstall_installInfo = \u4ee3\u7406\u5b89\u88c5\u4fe1\u606f +view_remoteAgentInstall_installPath = \u4ee3\u7406\u5b89\u88c5\u8def\u5f84 view_remoteAgentInstall_owner = \u6240\u6709\u8005 view_remoteAgentInstall_promptHost = The host where the agent is or will be installed view_remoteAgentInstall_promptInstallPath = Where the agent is or will be installed. If you aren''t sure where an agent is installed, enter a parent directory and click the ''Find Agent'' button to scan that directory and below. If you enter an empty path, common locations are searched on the host for an agent install. view_remoteAgentInstall_promptPassword = The credentials that are used to authenticate the user on the host via SSH view_remoteAgentInstall_promptPort = The port the SSH server is listening to. If not specified, the default is 22 view_remoteAgentInstall_promptUser = The name of the user whose credentials are passed to the host via SSH -view_remoteAgentInstall_result = \u7ED3\u679C +view_remoteAgentInstall_result = \u7ed3\u679c view_remoteAgentInstall_resultCode = ResultCode -view_remoteAgentInstall_startAgent = \u542F\u52A8\u4EE3\u7406 -view_remoteAgentInstall_startAgentResults = \u4EE3\u7406\u542F\u52A8\u7ED3\u679C: [{0}] +view_remoteAgentInstall_startAgent = \u542f\u52a8\u4ee3\u7406 +view_remoteAgentInstall_startAgentResults = \u4ee3\u7406\u542f\u52a8\u7ed3\u679c: [{0}] view_remoteAgentInstall_step = Step -view_remoteAgentInstall_stopAgent = \u505C\u6B62\u4EE3\u7406 -view_remoteAgentInstall_stopAgentResults = \u4EE3\u7406\u505C\u6B62\u7ED3\u679C: [{0}] -view_remoteAgentInstall_success = \u4EE3\u7406\u5B89\u88C5\u5B8C\u6210 -view_remoteAgentInstall_updateStatus = \u66F4\u65B0\u72B6\u6001 -view_reportsTop_description = \u8BE5\u90E8\u5206\u5185\u5BB9\u63D0\u4F9B\u4E86\u5168\u5C40\u62A5\u8868\u7684\u5165\u53E3. -view_reportsTop_title = \u62A5\u8868 -view_reports_alertDefinitions = \u544A\u8B66\u5B9A\u4E49 -view_reports_alertDefinitions_parentHover = \u70B9\u51FB\u5230\u7236\u7EA7\u544A\u8B66\u83DC\u5355 -view_reports_alertDefinitions_resTypeLoadError = \u65E0\u6CD5\u83B7\u53D6\u8D44\u6E90\u6A21\u677F\u7C7B\u578B - \u65E0\u6CD5\u67E5\u770B\u544A\u8B66\u6A21\u677F. -view_reports_inventorySummary_failFetch = \u83B7\u53D6\u7EDF\u8BA1\u6E05\u5355\u5931\u8D25 -view_reports_platforms = \u5E73\u53F0\u4F7F\u7528\u7387\u62A5\u8868 -view_reports_subsystems = \u5B50\u7CFB\u7EDF\u62A5\u8868 -view_resourceResourceGroupList_error_fetchFailure = \u83B7\u53D6\u8D44\u6E90\u7EC4\u4FE1\u606F\u5931\u8D25. -view_resourceResourceGroupList_error_updateFailure = \u66F4\u65B0\u6307\u5B9A\u7684\u8D44\u6E90\u7EC4\u5931\u8D25. -view_resourceResourceGroupList_message_updateSuccess = [{0}]\u7684\u7EC4\u6210\u5458\u5DF2\u7ECF\u66F4\u65B0. +view_remoteAgentInstall_stopAgent = \u505c\u6b62\u4ee3\u7406 +view_remoteAgentInstall_stopAgentResults = \u4ee3\u7406\u505c\u6b62\u7ed3\u679c: [{0}] +view_remoteAgentInstall_success = \u4ee3\u7406\u5b89\u88c5\u5b8c\u6210 +view_remoteAgentInstall_updateStatus = \u66f4\u65b0\u72b6\u6001 +view_reportsTop_description = \u8be5\u90e8\u5206\u5185\u5bb9\u63d0\u4f9b\u4e86\u5168\u5c40\u62a5\u8868\u7684\u5165\u53e3. +view_reportsTop_title = \u62a5\u8868 +view_reports_alertDefinitions = \u544a\u8b66\u5b9a\u4e49 +view_reports_alertDefinitions_parentHover = \u70b9\u51fb\u5230\u7236\u7ea7\u544a\u8b66\u83dc\u5355 +view_reports_alertDefinitions_resTypeLoadError = \u65e0\u6cd5\u83b7\u53d6\u8d44\u6e90\u6a21\u677f\u7c7b\u578b - \u65e0\u6cd5\u67e5\u770b\u544a\u8b66\u6a21\u677f. +view_reports_inventorySummary_failFetch = \u83b7\u53d6\u7edf\u8ba1\u6e05\u5355\u5931\u8d25 +view_reports_platforms = \u5e73\u53f0\u4f7f\u7528\u7387\u62a5\u8868 +view_reports_subsystems = \u5b50\u7cfb\u7edf\u62a5\u8868 +view_resourceResourceGroupList_error_fetchFailure = \u83b7\u53d6\u8d44\u6e90\u7ec4\u4fe1\u606f\u5931\u8d25. +view_resourceResourceGroupList_error_updateFailure = \u66f4\u65b0\u6307\u5b9a\u7684\u8d44\u6e90\u7ec4\u5931\u8d25. +view_resourceResourceGroupList_message_updateSuccess = [{0}]\u7684\u7ec4\u6210\u5458\u5df2\u7ecf\u66f4\u65b0. view_resource_inventory_activity_changed_by = Changed by view_resource_inventory_activity_criteria_no_recent_events = No event counts based off display criteria. -view_resource_inventory_activity_no_recent_alerts = \u65E0\u6700\u65B0\u544A\u8B66 -view_resource_inventory_activity_no_recent_bundle_deploy = No recent bundle deployments -view_resource_inventory_activity_no_recent_config_history = No configuration change history -view_resource_inventory_activity_no_recent_events = No events in the last 24 hours -view_resource_inventory_activity_no_recent_metrics = This resource has no recent metrics -view_resource_inventory_activity_no_recent_oob = No OOB conditions found -view_resource_inventory_activity_no_recent_operations = \u6CA1\u6709\u6700\u65B0\u64CD\u4F5C\u5386\u53F2 -view_resource_inventory_activity_no_recent_pkg_history = \u6CA1\u6709\u6700\u65B0\u5305\u5386\u53F2 -view_resource_inventory_childhistory_createdChild = Created Child -view_resource_inventory_childhistory_deletedChild = Deleted Child -view_resource_inventory_childhistory_filterTitle = Past N Days +view_resource_inventory_activity_no_recent_alerts = \u65e0\u6700\u65b0\u544a\u8b66 +view_resource_inventory_activity_no_recent_bundle_deploy = \u6700\u8fd1\u6ca1\u6709bundle\u90e8\u7f72 +view_resource_inventory_activity_no_recent_config_history = \u6ca1\u6709\u914d\u7f6e\u53d8\u66f4\u5386\u53f2 +view_resource_inventory_activity_no_recent_events = \u8fc7\u53bb24\u5c0f\u65f6\u6ca1\u6709\u4e8b\u4ef6 +view_resource_inventory_activity_no_recent_metrics = \u8fd9\u4e2a\u8d44\u6e90\u65e0\u6700\u65b0\u6307\u6807 +view_resource_inventory_activity_no_recent_oob = \u65e0OOB\u6761\u4ef6\u53d1\u73b0 +view_resource_inventory_activity_no_recent_operations = \u6ca1\u6709\u6700\u65b0\u64cd\u4f5c\u5386\u53f2 +view_resource_inventory_activity_no_recent_pkg_history = \u6ca1\u6709\u6700\u65b0\u5305\u5386\u53f2 +view_resource_inventory_childhistory_createdChild = \u521b\u5efa\u5b50 +view_resource_inventory_childhistory_deletedChild = \u5220\u9664\u5b50 +view_resource_inventory_childhistory_filterTitle = \u8fc7\u53bbN\u5929 view_resource_inventory_childhistory_status_invalidArtifact = Invalid Artifact -view_resource_inventory_childhistory_status_invalidConfig = \u65E0\u6548\u914D\u7F6E -view_resource_monitor_availability_loadFailed = \u52A0\u8F7D\u53EF\u7528\u6027\u5386\u53F2\u8BB0\u5F55\u5931\u8D25 -view_resource_monitor_calltime_average = Average -view_resource_monitor_calltime_count = Count +view_resource_inventory_childhistory_status_invalidConfig = \u65e0\u6548\u914d\u7f6e +view_resource_monitor_availability_loadFailed = \u52a0\u8f7d\u53ef\u7528\u6027\u5386\u53f2\u8bb0\u5f55\u5931\u8d25 +view_resource_monitor_calltime_average = \u5e73\u5747 +view_resource_monitor_calltime_count = \u6570\u91cf view_resource_monitor_calltime_destination = Call Destination view_resource_monitor_calltime_editFailed = Call time data can not be edited view_resource_monitor_calltime_loadFailed = Could not load call time data view_resource_monitor_calltime_lookupFailed = Could not load resource for call time -view_resource_monitor_calltime_maximum = Maximum -view_resource_monitor_calltime_minimum = Minimum +view_resource_monitor_calltime_maximum = \u6700\u5927 +view_resource_monitor_calltime_minimum = \u6700\u5c0f view_resource_monitor_calltime_title = Call Time Data -view_resource_monitor_calltime_total = Total -view_resource_monitor_detailed_graph_label = Detailed Graph +view_resource_monitor_calltime_total = \u6240\u6709 +view_resource_monitor_detailed_graph_label = \u8be6\u7ec6\u56fe view_resource_monitor_graph_instructions = Point your mouse to a data point on the chart view_resource_monitor_graph_live_tooltip = Click for a live graph of current values -view_resource_monitor_graphs_loadFailed = \u52A0\u8F7D\u7ED8\u56FE\u6570\u636E\u5931\u8D25 +view_resource_monitor_graphs_loadFailed = \u52a0\u8f7d\u7ed8\u56fe\u6570\u636e\u5931\u8d25 view_resource_monitor_graphs_lookupFailed = Failed to find resource for graph -view_resource_monitor_graphs_noneAvailable = No graphs available +view_resource_monitor_graphs_noneAvailable = \u6ca1\u6709\u53ef\u7528\u56fe view_resource_monitor_schedules_title = Resource Metric Collection Schedules -view_resource_monitor_table_alerts = Alerts -view_resource_monitor_table_avg = Average +view_resource_monitor_table_alerts = \u544a\u8b66 +view_resource_monitor_table_avg = \u5e73\u5747 view_resource_monitor_table_last = Last -view_resource_monitor_table_max = Maximum -view_resource_monitor_table_min = Minimum -view_resource_title_component_errors_tooltip = Shows managed component errors. Click for details -view_resource_title_tagUpdateFailed = Failed to update resource tags -view_searchBar_defaultPattern = \u5B9A\u4E49\u81EA\u5DF1\u7684\u6837\u5F0F -view_searchBar_error_selectSavedSearch = ''\u9009\u62E9\u4FDD\u5B58\u7684\u641C\u7D22\u65F6\u51FA\u9519'' -view_searchBar_query = \u67E5\u8BE2 -view_searchBar_resourceGroups = \u8D44\u6E90\u7EC4 -view_searchBar_resources = \u8D44\u6E90 -view_searchBar_welcomeMessage = \u641C\u7D22\u4E86{0}\u79D2 -view_searchGUI_loginStatus = \u65E0\u6CD5\u786E\u5B9A\u767B\u5F55\u72B6\u6001\uFF0C\u8BF7\u68C0\u67E5\u670D\u52A1 -view_selector_assigned = \u6307\u5B9A\u7684 {0} -view_selector_available = \u53EF\u7528\u7684 {0} -view_subTab_error_disabled = \u65E0\u6CD5\u9009\u4E2D\u7981\u7528\u7684\u5B50\u8868 [{0}]. -view_summaryDashboard_resetConfirm = \u6062\u590D\u5230\u9ED8\u8BA4\u7684\u7EDF\u8BA1\u56FE\u8868 (\u653E\u5F03\u4E4B\u524D\u4FDD\u5B58\u7684\u4FE1\u606F)? +view_resource_monitor_table_max = \u6700\u5927 +view_resource_monitor_table_min = \u6700\u5c0f +view_resource_title_component_errors_tooltip = \u663e\u793a\u88ab\u7ba1\u7ec4\u4ef6\u9519\u8bef.\u5355\u51fb\u67e5\u770b\u8be6\u60c5 +view_resource_title_tagUpdateFailed = \u66f4\u65b0\u8d44\u6e90\u6807\u7b7e\u5931\u8d25 +view_searchBar_defaultPattern = \u5b9a\u4e49\u81ea\u5df1\u7684\u6837\u5f0f +view_searchBar_error_selectSavedSearch = ''\u9009\u62e9\u4fdd\u5b58\u7684\u641c\u7d22\u65f6\u51fa\u9519'' +view_searchBar_query = \u67e5\u8be2 +view_searchBar_resourceGroups = \u8d44\u6e90\u7ec4 +view_searchBar_resources = \u8d44\u6e90 +view_searchBar_welcomeMessage = \u641c\u7d22\u4e86{0}\u79d2 +view_searchGUI_loginStatus = \u65e0\u6cd5\u786e\u5b9a\u767b\u5f55\u72b6\u6001\uff0c\u8bf7\u68c0\u67e5\u670d\u52a1 +view_selector_assigned = \u6307\u5b9a\u7684 {0} +view_selector_available = \u53ef\u7528\u7684 {0} +view_subTab_error_disabled = \u65e0\u6cd5\u9009\u4e2d\u7981\u7528\u7684\u5b50\u8868 [{0}]. +view_summaryDashboard_resetConfirm = \u6062\u590d\u5230\u9ed8\u8ba4\u7684\u7edf\u8ba1\u56fe\u8868 (\u653e\u5f03\u4e4b\u524d\u4fdd\u5b58\u7684\u4fe1\u606f)? view_summaryOverviewForm_error_descriptionChangeFailure = Failed to change description of Resource with id {0} from [{1}] to [{2}]. view_summaryOverviewForm_error_locationChangeFailure = Failed to change location of Resource with id {0} from [{1}] to [{2}]. view_summaryOverviewForm_error_nameChangeFailure = Failed to change name of Resource with id {0} from [{1}] to [{2}]. -view_summaryOverviewForm_error_traitsLoadFailure = \u52A0\u8F7D {0}\u7684\u5C5E\u6027\u4FE1\u606F\u5931\u8D25. -view_summaryOverviewForm_field_description = \u63CF\u8FF0 -view_summaryOverviewForm_field_location = \u4F4D\u7F6E -view_summaryOverviewForm_field_name = \u5B57\u6BB5\u540D -view_summaryOverviewForm_field_type = \u7C7B\u578B -view_summaryOverviewForm_field_version = \u7248\u672C\u53F7 -view_summaryOverviewForm_header_summary = \u7EDF\u8BA1 -view_summaryOverviewForm_label_plugin = \u63D2\u4EF6\u6807\u7B7E: -view_summaryOverviewForm_label_type = \u6807\u7B7E\u7C7B\u578B: -view_summaryOverviewForm_message_descriptionChangeSuccess = Description of Resource with id {0} was changed from [{1}] to [{2}]. -view_summaryOverviewForm_message_locationChangeSuccess = Location of Resource with id {0} was changed from [{1}] to [{2}]. -view_summaryOverviewForm_message_nameChangeSuccess = Name of Resource with id {0} was changed from [{1}] to [{2}]. -view_summaryOverview_header_detectedErrors = \u5DF2\u68C0\u6D4B\u5230\u7684\u9519\u8BEF -view_summaryOverview_title_errorDetailsWindow = \u9519\u8BEF\u8BE6\u7EC6 -view_summaryOverview_tooltip_detectedErrors = \u70B9\u51FB\u5BF9\u5E94\u7684\u884C\u67E5\u770B\u9519\u8BEF\u4FE1\u606F. -view_tableSection_backButton = \u8FD4\u56DE\u5217\u8868 -view_tableSection_error_badId = \u65E0\u6CD5\u5C55\u793A [{0}]\u7684\u8BE6\u7EC6\u4FE1\u606F. \u65E0\u6548\u7684 'id': [{1}]. \u8BF7\u62A5\u544A\u6B64BUG -view_tableSection_error_noId = \u8868\u5355 [{0}] \u8BB0\u5F55\u7F3A\u5C11'id'\u5C5E\u6027 - \u8BF7\u62A5\u544A\u6B64BUG. -view_table_drawFail = \u751F\u6210\u8868\u683C[{0}]\u5931\u8D25. -view_table_matchingRows = \u5339\u914D\u7684\u884C: {0} (\u9009\u4E2D: {1}) -view_table_totalRows = \u6240\u6709\u7684\u884C: {0} (\u9009\u4E2D: {1}) -view_tabs_common_activity = \u6D3B\u52A8 -view_tabs_common_agent = \u4EE3\u7406 -view_tabs_common_alerts = \u544A\u8B66 -view_tabs_common_availability = \u53EF\u7528\u6027 +view_summaryOverviewForm_error_traitsLoadFailure = \u52a0\u8f7d {0}\u7684\u5c5e\u6027\u4fe1\u606f\u5931\u8d25. +view_summaryOverviewForm_field_description = \u63cf\u8ff0 +view_summaryOverviewForm_field_location = \u4f4d\u7f6e +view_summaryOverviewForm_field_name = \u5b57\u6bb5\u540d +view_summaryOverviewForm_field_type = \u7c7b\u578b +view_summaryOverviewForm_field_version = \u7248\u672c\u53f7 +view_summaryOverviewForm_header_summary = \u7edf\u8ba1 +view_summaryOverviewForm_label_plugin = \u63d2\u4ef6\u6807\u7b7e: +view_summaryOverviewForm_label_type = \u6807\u7b7e\u7c7b\u578b: +view_summaryOverviewForm_message_descriptionChangeSuccess = \u8d44\u6e90{0}\u63cf\u8ff0\u4ece[{1}] \u6539\u4e3a [{2}]. +view_summaryOverviewForm_message_locationChangeSuccess = \u8d44\u6e90{0}\u4f4d\u7f6e\u4ece[{1}]\u6539\u4e3a[{2}]. +view_summaryOverviewForm_message_nameChangeSuccess = \u8d44\u6e90{0}\u540d\u79f0\u4ece[{1}]\u6539\u4e3a[{2}]. +view_summaryOverview_header_detectedErrors = \u5df2\u68c0\u6d4b\u5230\u7684\u9519\u8bef +view_summaryOverview_title_errorDetailsWindow = \u9519\u8bef\u8be6\u7ec6 +view_summaryOverview_tooltip_detectedErrors = \u70b9\u51fb\u5bf9\u5e94\u7684\u884c\u67e5\u770b\u9519\u8bef\u4fe1\u606f. +view_tableSection_backButton = \u8fd4\u56de\u5217\u8868 +view_tableSection_error_badId = \u65e0\u6cd5\u5c55\u793a [{0}]\u7684\u8be6\u7ec6\u4fe1\u606f. \u65e0\u6548\u7684 'id': [{1}]. \u8bf7\u62a5\u544a\u6b64BUG +view_tableSection_error_noId = \u8868\u5355 [{0}] \u8bb0\u5f55\u7f3a\u5c11'id'\u5c5e\u6027 - \u8bf7\u62a5\u544a\u6b64BUG. +view_table_drawFail = \u751f\u6210\u8868\u683c[{0}]\u5931\u8d25. +view_table_matchingRows = \u5339\u914d\u7684\u884c: {0} (\u9009\u4e2d: {1}) +view_table_totalRows = \u6240\u6709\u7684\u884c: {0} (\u9009\u4e2d: {1}) +view_tabs_common_activity = \u6d3b\u52a8 +view_tabs_common_agent = \u4ee3\u7406 +view_tabs_common_alerts = \u544a\u8b66 +view_tabs_common_availability = \u53ef\u7528\u6027 view_tabs_common_calltime = Calltime -view_tabs_common_child_history = \u5B50\u5386\u53F2 -view_tabs_common_child_resources = \u5B50\u8D44\u6E90 -view_tabs_common_configuration = \u914D\u7F6E -view_tabs_common_connectionSettings = \u8FDE\u63A5\u8BBE\u7F6E -view_tabs_common_connectionSettingsHistory = \u5386\u53F2\u8FDE\u63A5\u8BBE\u7F6E -view_tabs_common_content = \u5185\u5BB9 -view_tabs_common_current = \u5F53\u524D -view_tabs_common_dashboard = \u7EDF\u8BA1\u8868\u76D8 -view_tabs_common_definitions = \u5B9A\u4E49 -view_tabs_common_deployed = \u5DF2\u53D1\u5E03 -view_tabs_common_events = \u4E8B\u4EF6 -view_tabs_common_graphs = Graphs -view_tabs_common_group_members = \u7EC4\u5458 -view_tabs_common_group_membership = \u7EC4\u6210\u5458\u5173\u7CFB -view_tabs_common_groups = Groups -view_tabs_common_history = \u5386\u53F2 -view_tabs_common_inventory = \u6E05\u5355 -view_tabs_common_members = Members -view_tabs_common_monitoring = \u76D1\u63A7 +view_tabs_common_child_history = \u5b50\u5386\u53f2 +view_tabs_common_child_resources = \u5b50\u8d44\u6e90 +view_tabs_common_configuration = \u914d\u7f6e +view_tabs_common_connectionSettings = \u8fde\u63a5\u8bbe\u7f6e +view_tabs_common_connectionSettingsHistory = \u5386\u53f2\u8fde\u63a5\u8bbe\u7f6e +view_tabs_common_content = \u5185\u5bb9 +view_tabs_common_current = \u5f53\u524d +view_tabs_common_dashboard = \u7edf\u8ba1\u8868\u76d8 +view_tabs_common_definitions = \u5b9a\u4e49 +view_tabs_common_deployed = \u5df2\u53d1\u5e03 +view_tabs_common_events = \u4e8b\u4ef6 +view_tabs_common_graphs = \u56fe +view_tabs_common_group_members = \u7ec4\u5458 +view_tabs_common_group_membership = \u7ec4\u6210\u5458\u5173\u7cfb +view_tabs_common_groups = \u7ec4 +view_tabs_common_history = \u5386\u53f2 +view_tabs_common_inventory = \u6e05\u5355 +view_tabs_common_members = \u6210\u5458 +view_tabs_common_monitoring = \u76d1\u63a7 view_tabs_common_new = new -view_tabs_common_operations = \u64CD\u4F5C -view_tabs_common_overview = \u6982\u89C8 -view_tabs_common_schedule = \u8C03\u5EA6 -view_tabs_common_schedules = Schedules -view_tabs_common_subscriptions = \u8FD0\u884C\u673A\u5236 +view_tabs_common_operations = \u64cd\u4f5c +view_tabs_common_overview = \u6982\u89c8 +view_tabs_common_schedule = \u8c03\u5ea6 +view_tabs_common_schedules = \u8ba1\u5212\u4efb\u52a1 +view_tabs_common_subscriptions = \u8fd0\u884c\u673a\u5236 view_tabs_common_summary = \u6982\u8981 -view_tabs_common_tables = Tables -view_tabs_common_timeline = \u65F6\u95F4\u8F74 -view_tabs_common_traits = Traits -view_tabs_invalidSubTab = \u65E0\u6548\u7684\u5B50\u8868: {0} -view_tabs_invalidTab = \u65E0\u6548\u7684\u8868: {0} -view_tagCloud_deleteTag = \u5220\u9664\u6807\u7B7E -view_tagCloud_deleteTagFailure = \u5220\u9664\u6807\u7B7E [{0}] \u5931\u8D25 -view_tagCloud_deleteTagSuccess = \u6210\u529F\u7684\u5220\u9664\u4E86\u6807\u7B7E [{0}] -view_tagCloud_error_fetchFailure = \u52A0\u8F7D\u6807\u7B7E\u5931\u8D25. -view_tagCloud_error_tagUsedCount = \u6807\u7B7E\u4F7F\u7528 {0} \u6B21. -view_tagCloud_title = \u6807\u7B7E\u96C6 -view_taggedResources_title = \u8D44\u6E90 -view_tags_error_1 = \u52A0\u8F7D\u6807\u7B7E\u5931\u8D25 -view_tags_tags = \u6807\u7B7E -view_tags_tooltip_1 = \u5220\u9664\u6807\u7B7E -view_tags_tooltip_2 = \u7F16\u8F91\u6807\u7B7E -view_tags_tooltip_3 = \u8F93\u5165\u6309\u7167\u4EE5\u4E0B\u683C\u5F0F\u7684\u6807\u7B7E: (namespace:)(semantic=)tagname (e.g. it:env=QA, or owner=John) -view_testTop_description = \u8FD9\u90E8\u5206\u9875\u9762\u7528\u4E8E\u6D4B\u8BD5\u5404\u79CDGUI\u7EC4\u4EF6. -view_testTop_title = \u6D4B\u8BD5 -view_titleBar_common_addedFav = \u6DFB\u52A0 [{0}]\u5230\u5E38\u7528\u83DC\u5355 -view_titleBar_common_addedFavFailure = \u6DFB\u52A0[{0}]\u5230\u6536\u85CF\u5939\u5931\u8D25 -view_titleBar_common_clickToAddFav = \u6DFB\u52A0\u5230\u6536\u85CF\u5939 -view_titleBar_common_clickToRemoveFav = \u5355\u51FB\u79FB\u51FA\u6536\u85CF\u5939 -view_titleBar_common_loadTagsFailure = \u4E3A[{0}]\u52A0\u8F7D\u6807\u7B7E\u5931\u8D25 -view_titleBar_common_removedFav = \u79FB\u52A8[{0}]\u5230\u5E38\u7528\u83DC\u5355 -view_titleBar_common_removedFavFailure = \u79FB\u52A8[{0}]\u5230\u5E38\u7528\u83DC\u5355\u5931\u8D25 -view_titleBar_common_updateTagsFailure = \u4E3A[{0}]\u66F4\u65B0\u6807\u7B7E\u5931\u8D25 -view_titleBar_common_updateTagsSuccessful = [{0}]\u7684\u6807\u7B7E\u5DF2\u7ECF\u66F4\u65B0 -view_titleBar_group_failInfo = Failed to get general info on group [{0}] with ID [{1}] -view_titleBar_group_summary_collapsedTooltip = \u70B9\u51FB\u67E5\u770B\u6B64\u7EC4\u7684\u66F4\u591A\u4FE1\u606F -view_titleBar_group_summary_expandedTooltip = \u70B9\u51FB\u9690\u85CF\u6B64\u7EC4\u7684\u66F4\u591A\u4FE1\u606F -view_tree_common_contextMenu_addChartToDashboard = \u6DFB\u52A0\u56FE\u5230\u7EDF\u8BA1\u8868\u76D8[{0}] -view_tree_common_contextMenu_editPluginConfiguration = \u7F16\u8F91[{0}]\u63D2\u4EF6\u914D\u7F6E -view_tree_common_contextMenu_editResourceConfiguration = \u7F16\u8F91[{0}]\u8D44\u6E90\u914D\u7F6E -view_tree_common_contextMenu_groupGraph = Group Metric Graph +view_tabs_common_tables = \u8868\u683c +view_tabs_common_timeline = \u65f6\u95f4\u8f74 +view_tabs_common_traits = \u7279\u5f81 +view_tabs_invalidSubTab = \u65e0\u6548\u7684\u5b50\u8868: {0} +view_tabs_invalidTab = \u65e0\u6548\u7684\u8868: {0} +view_tagCloud_deleteTag = \u5220\u9664\u6807\u7b7e +view_tagCloud_deleteTagFailure = \u5220\u9664\u6807\u7b7e [{0}] \u5931\u8d25 +view_tagCloud_deleteTagSuccess = \u6210\u529f\u7684\u5220\u9664\u4e86\u6807\u7b7e [{0}] +view_tagCloud_error_fetchFailure = \u52a0\u8f7d\u6807\u7b7e\u5931\u8d25. +view_tagCloud_error_tagUsedCount = \u6807\u7b7e\u4f7f\u7528 {0} \u6b21. +view_tagCloud_title = \u6807\u7b7e\u96c6 +view_taggedResources_title = \u8d44\u6e90 +view_tags_error_1 = \u52a0\u8f7d\u6807\u7b7e\u5931\u8d25 +view_tags_tags = \u6807\u7b7e +view_tags_tooltip_1 = \u5220\u9664\u6807\u7b7e +view_tags_tooltip_2 = \u7f16\u8f91\u6807\u7b7e +view_tags_tooltip_3 = \u8f93\u5165\u6309\u7167\u4ee5\u4e0b\u683c\u5f0f\u7684\u6807\u7b7e: (namespace:)(semantic=)tagname (e.g. it:env=QA, or owner=John) +view_testTop_description = \u8fd9\u90e8\u5206\u9875\u9762\u7528\u4e8e\u6d4b\u8bd5\u5404\u79cdGUI\u7ec4\u4ef6. +view_testTop_title = \u6d4b\u8bd5 +view_titleBar_common_addedFav = \u6dfb\u52a0 [{0}]\u5230\u5e38\u7528\u83dc\u5355 +view_titleBar_common_addedFavFailure = \u6dfb\u52a0[{0}]\u5230\u6536\u85cf\u5939\u5931\u8d25 +view_titleBar_common_clickToAddFav = \u6dfb\u52a0\u5230\u6536\u85cf\u5939 +view_titleBar_common_clickToRemoveFav = \u5355\u51fb\u79fb\u51fa\u6536\u85cf\u5939 +view_titleBar_common_loadTagsFailure = \u4e3a[{0}]\u52a0\u8f7d\u6807\u7b7e\u5931\u8d25 +view_titleBar_common_removedFav = \u79fb\u52a8[{0}]\u5230\u5e38\u7528\u83dc\u5355 +view_titleBar_common_removedFavFailure = \u79fb\u52a8[{0}]\u5230\u5e38\u7528\u83dc\u5355\u5931\u8d25 +view_titleBar_common_updateTagsFailure = \u4e3a[{0}]\u66f4\u65b0\u6807\u7b7e\u5931\u8d25 +view_titleBar_common_updateTagsSuccessful = [{0}]\u7684\u6807\u7b7e\u5df2\u7ecf\u66f4\u65b0 +view_titleBar_group_failInfo = \u53d6\u5f97\u7ec4[{0}]\u57fa\u672c\u4fe1\u606f\u5931\u8d25ID [{1}] +view_titleBar_group_summary_collapsedTooltip = \u70b9\u51fb\u67e5\u770b\u6b64\u7ec4\u7684\u66f4\u591a\u4fe1\u606f +view_titleBar_group_summary_expandedTooltip = \u70b9\u51fb\u9690\u85cf\u6b64\u7ec4\u7684\u66f4\u591a\u4fe1\u606f +view_tree_common_contextMenu_addChartToDashboard = \u6dfb\u52a0\u56fe\u5230\u7edf\u8ba1\u8868\u76d8[{0}] +view_tree_common_contextMenu_editPluginConfiguration = \u7f16\u8f91[{0}]\u63d2\u4ef6\u914d\u7f6e +view_tree_common_contextMenu_editResourceConfiguration = \u7f16\u8f91[{0}]\u8d44\u6e90\u914d\u7f6e +view_tree_common_contextMenu_groupGraph = \u7ec4\u6307\u6807\u56fe view_tree_common_contextMenu_loadFail_children = Failed to load platform manual add children -view_tree_common_contextMenu_loadFail_dashboards = \u52A0\u8F7D\u7528\u6237\u7EDF\u8BA1\u8868\u76D8\u5931\u8D25 -view_tree_common_contextMenu_loadFail_group = \u52A0\u8F7Dgroup for context menu\u5931\u8D25 -view_tree_common_contextMenu_loadFailed_dashboard = \u52A0\u8F7D\u7528\u6237\u7EDF\u8BA1\u8868\u76D8\u5931\u8D25 -view_tree_common_contextMenu_loadFailed_manualAddChildren = \u52A0\u8F7Dplatform manual add children\u5931\u8D25 -view_tree_common_contextMenu_measurements = Measurements -view_tree_common_contextMenu_operations = \u64CD\u4F5C +view_tree_common_contextMenu_loadFail_dashboards = \u52a0\u8f7d\u7528\u6237\u7edf\u8ba1\u8868\u76d8\u5931\u8d25 +view_tree_common_contextMenu_loadFail_group = \u4e0a\u4e0b\u6587\u83dc\u5355\u52a0\u8f7d\u7ec4\u5931\u8d25 +view_tree_common_contextMenu_loadFailed_dashboard = \u52a0\u8f7d\u7528\u6237\u7edf\u8ba1\u8868\u76d8\u5931\u8d25 +view_tree_common_contextMenu_loadFailed_manualAddChildren = \u52a0\u8f7dplatform manual add children\u5931\u8d25 +view_tree_common_contextMenu_measurements = \u76d1\u6d4b +view_tree_common_contextMenu_operations = \u64cd\u4f5c view_tree_common_contextMenu_operations_loadFailed = Failure to start wizard for running operations -view_tree_common_contextMenu_resourceConfiguration = \u8D44\u6E90\u914D\u7F6E -view_tree_common_contextMenu_resourceGraph = Resource Metric Graph -view_tree_common_contextMenu_saveChartToDashboardFailure = \u4FDD\u5B58\u7EDF\u8BA1\u8868\u76D8\u5931\u8D25 -view_tree_common_contextMenu_saveChartToDashboardSuccessful = \u6210\u529F\u4FDD\u5B58\u7EDF\u8BA1\u8868\u76D8 [{0}] -view_tree_common_contextMenu_type_name_label = Type: {0} +view_tree_common_contextMenu_resourceConfiguration = \u8d44\u6e90\u914d\u7f6e +view_tree_common_contextMenu_resourceGraph = \u8d44\u6e90\u6307\u6807\u56fe +view_tree_common_contextMenu_saveChartToDashboardFailure = \u4fdd\u5b58\u7edf\u8ba1\u8868\u76d8\u5931\u8d25 +view_tree_common_contextMenu_saveChartToDashboardSuccessful = \u6210\u529f\u4fdd\u5b58\u7edf\u8ba1\u8868\u76d8 [{0}] +view_tree_common_contextMenu_type_name_label = \u7c7b\u578b: {0} view_tree_common_createFailed_autoCluster = Failed to create or update autocluster backing group -view_tree_common_loadFailed_children = \u52A0\u8F7D\u5B50\u8282\u70B9\u5931\u8D25 +view_tree_common_loadFailed_children = \u52a0\u8f7d\u5b50\u8282\u70b9\u5931\u8d25 view_tree_common_loadFailed_create = Failed to create view for this node view_tree_common_loadFailed_descendants = Failed to load descendants for tree -view_tree_common_loadFailed_generic = \u52A0\u8F7D\u6811\u5931\u8D25 -view_tree_common_loadFailed_group = \u52A0\u8F7Did\u4E3A[{0}]\u7684\u7EC4\u5931\u8D25 -view_tree_common_loadFailed_groupTree = \u52A0\u8F7D\u7EC4\u6811\u5931\u8D25 -view_tree_common_loadFailed_node = \u52A0\u8F7D\u8FD9\u4E2A\u8282\u70B9\u6570\u636E\u5931\u8D25 -view_tree_common_loadFailed_root = \u52A0\u8F7D\u6811\u6839\u8282\u70B9\u5931\u8D25 -view_tree_common_loadFailed_selection = Failed to select this node +view_tree_common_loadFailed_generic = \u52a0\u8f7d\u6811\u5931\u8d25 +view_tree_common_loadFailed_group = \u52a0\u8f7did\u4e3a[{0}]\u7684\u7ec4\u5931\u8d25 +view_tree_common_loadFailed_groupTree = \u52a0\u8f7d\u7ec4\u6811\u5931\u8d25 +view_tree_common_loadFailed_node = \u52a0\u8f7d\u8fd9\u4e2a\u8282\u70b9\u6570\u636e\u5931\u8d25 +view_tree_common_loadFailed_root = \u52a0\u8f7d\u6811\u6839\u8282\u70b9\u5931\u8d25 +view_tree_common_loadFailed_selection = \u9009\u62e9\u8fd9\u4e2a\u8282\u70b9\u5931\u8d25 view_tree_common_loadFailed_update = Failed to update view for this node view_tree_group_error_updateAutoCluster = Failed to create or update autocluster backing group. key: [{0}] view_type_parentId = \u7236ID -view_type_resourceTypes = \u8D44\u6E90\u7C7B\u578B -view_type_typeTreeLoadFailure = \u52A0\u8F7D\u8D44\u6E90\u7C7B\u578B\u6811\u5931\u8D25 -view_upload_alreadyUploaded = \u6587\u4EF6\u5DF2\u7ECF\u4E0A\u4F20 -view_upload_bundleDistFile = \u5206\u7C7B\u6587\u4EF6 -view_upload_error_bundleDistFile = \u4E0A\u4F20\u5206\u7C7B\u6587\u4EF6\u5931\u8D25 -view_upload_error_file = \u4E0A\u4F20\u6587\u4EF6\u51FA\u73B0\u9519\u8BEF -view_upload_error_fileName = \u4E0A\u4F20\u6587\u4EF6 [{0}]\u51FA\u73B0\u9519\u8BEF -view_upload_error_fileName_2 = \u4E0A\u4F20\u6587\u4EF6 [{0}]\u51FA\u73B0\u9519\u8BEF, \u68C0\u67E5\u6587\u4EF6\u8DEF\u5F84. -view_upload_error_packageVersionFile = \u4E0A\u4F20\u5305\u7248\u672C\u6587\u4EF6\u51FA\u73B0\u9519\u8BEF -view_upload_error_results = \u4E0A\u4F20\u6587\u4EF6\u5931\u8D25, \u65E0\u6CD5\u9884\u6599\u7684\u7ED3\u679C: [{0}] -view_upload_inProgress = \u65E0\u6CD5\u63D0\u4EA4, \u6587\u4EF6\u4E0A\u4F20\u6B63\u5728\u8FDB\u884C -view_upload_prompt_1 = \u8BF7\u9009\u62E9\u4E00\u4E2A\u6587\u4EF6\u4E0A\u4F20[{0}] -view_upload_prompt_2 = \u8981\u4E0A\u4F20\u7684\u6587\u4EF6 -view_upload_success = \u6587\u4EF6\u4E0A\u4F20\u6210\u529F -view_upload_tooltip_1a = \u9009\u62E9\u4E00\u4E2A\u6587\u4EF6\u4E0A\u4F20,\u7136\u540E\u70B9\u51FBUpload\u6216\u8005Next -view_upload_tooltip_1b = \u9009\u62E9\u4E00\u4E2A\u6587\u4EF6\u4E0A\u4F20, \u7136\u540E\u70B9\u51FB Next -view_upload_tooltip_2 = \u6587\u4EF6\u4E0A\u4F20 \u524D\u53D1\u751F\u9519\u8BEF -view_upload_upload = \u4E0A\u4F20 -view_upload_uploadFile = \u4E0A\u4F20\u6587\u4EF6 -widget_colorPicker_tooltip = \u9009\u62E9\u989C\u8272 -widget_durationItem_inputUnitLessThanTargetUnit = \u8F93\u5165\u5355\u4F4D\u662F\u5C0F\u4E8E\u76EE\u6807\u5355\u4F4D. -widget_durationItem_unitTypeNotSupported = \u5355\u4F4D\u7C7B\u578B[{0}]\u4E0D\u88ABDurationItem\u652F\u6301. +view_type_resourceTypes = \u8d44\u6e90\u7c7b\u578b +view_type_typeTreeLoadFailure = \u52a0\u8f7d\u8d44\u6e90\u7c7b\u578b\u6811\u5931\u8d25 +view_upload_alreadyUploaded = \u6587\u4ef6\u5df2\u7ecf\u4e0a\u4f20 +view_upload_bundleDistFile = \u5206\u7c7b\u6587\u4ef6 +view_upload_error_bundleDistFile = \u4e0a\u4f20\u5206\u7c7b\u6587\u4ef6\u5931\u8d25 +view_upload_error_file = \u4e0a\u4f20\u6587\u4ef6\u51fa\u73b0\u9519\u8bef +view_upload_error_fileName = \u4e0a\u4f20\u6587\u4ef6 [{0}]\u51fa\u73b0\u9519\u8bef +view_upload_error_fileName_2 = \u4e0a\u4f20\u6587\u4ef6 [{0}]\u51fa\u73b0\u9519\u8bef, \u68c0\u67e5\u6587\u4ef6\u8def\u5f84. +view_upload_error_packageVersionFile = \u4e0a\u4f20\u5305\u7248\u672c\u6587\u4ef6\u51fa\u73b0\u9519\u8bef +view_upload_error_results = \u4e0a\u4f20\u6587\u4ef6\u5931\u8d25, \u65e0\u6cd5\u9884\u6599\u7684\u7ed3\u679c: [{0}] +view_upload_inProgress = \u65e0\u6cd5\u63d0\u4ea4, \u6587\u4ef6\u4e0a\u4f20\u6b63\u5728\u8fdb\u884c +view_upload_prompt_1 = \u8bf7\u9009\u62e9\u4e00\u4e2a\u6587\u4ef6\u4e0a\u4f20[{0}] +view_upload_prompt_2 = \u8981\u4e0a\u4f20\u7684\u6587\u4ef6 +view_upload_success = \u6587\u4ef6\u4e0a\u4f20\u6210\u529f +view_upload_tooltip_1a = \u9009\u62e9\u4e00\u4e2a\u6587\u4ef6\u4e0a\u4f20,\u7136\u540e\u70b9\u51fbUpload\u6216\u8005Next +view_upload_tooltip_1b = \u9009\u62e9\u4e00\u4e2a\u6587\u4ef6\u4e0a\u4f20, \u7136\u540e\u70b9\u51fb Next +view_upload_tooltip_2 = \u6587\u4ef6\u4e0a\u4f20 \u524d\u53d1\u751f\u9519\u8bef +view_upload_upload = \u4e0a\u4f20 +view_upload_uploadFile = \u4e0a\u4f20\u6587\u4ef6 +widget_colorPicker_tooltip = \u9009\u62e9\u989c\u8272 +widget_durationItem_inputUnitLessThanTargetUnit = \u8f93\u5165\u5355\u4f4d\u662f\u5c0f\u4e8e\u76ee\u6807\u5355\u4f4d. +widget_durationItem_unitTypeNotSupported = \u5355\u4f4d\u7c7b\u578b[{0}]\u4e0d\u88abDurationItem\u652f\u6301. widget_jobTriggerEditor_fieldHelp_repeatDuration = keep running this operation this many times or until this amount of time has elapsed -widget_jobTriggerEditor_fieldHelp_repeatInterval = \u591A\u4E45\u6267\u884C\u64CD\u4F5C -widget_jobTriggerEditor_fieldHelp_startDelay = \u6267\u884C\u64CD\u4F5C\u5EF6\u65F6 -widget_jobTriggerEditor_field_cronExpression = Cron\u8868\u8FBE\u5F0F +widget_jobTriggerEditor_fieldHelp_repeatInterval = \u591a\u4e45\u6267\u884c\u64cd\u4f5c +widget_jobTriggerEditor_fieldHelp_startDelay = \u6267\u884c\u64cd\u4f5c\u5ef6\u65f6 +widget_jobTriggerEditor_field_cronExpression = Cron\u8868\u8fbe\u5f0f widget_jobTriggerEditor_field_mode = Schedule using -widget_jobTriggerEditor_field_repeatInterval_later = \u91CD\u590D\u6BCF +widget_jobTriggerEditor_field_repeatInterval_later = \u91cd\u590d\u6bcf widget_jobTriggerEditor_field_repeatInterval_now = Run now and every widget_jobTriggerEditor_field_startType = Run -widget_jobTriggerEditor_message_endTimeMustBeAfterStartTime = \u7ED3\u675F\u65F6\u95F4\u5FC5\u987B\u665A\u4E8E\u5F00\u59CB\u65F6\u95F4. -widget_jobTriggerEditor_message_endTimeMustBeInFuture = \u7ED3\u675F\u65F6\u95F4\u5FC5\u987B\u662F\u672A\u6765\u65F6\u95F4. -widget_jobTriggerEditor_message_startTimeMustBeInFuture = \u5F00\u59CB\u65F6\u95F4\u5FC5\u987B\u662F\u672A\u6765\u65F6\u95F4. -widget_jobTriggerEditor_tab_examples = \u4F8B\u5B50 -widget_jobTriggerEditor_tab_format = \u683C\u5F0F -widget_jobTriggerEditor_value_calendar = \u65E5\u5386 -widget_jobTriggerEditor_value_cronExpression = Cron\u8868\u8FBE\u5F0F +widget_jobTriggerEditor_message_endTimeMustBeAfterStartTime = \u7ed3\u675f\u65f6\u95f4\u5fc5\u987b\u665a\u4e8e\u5f00\u59cb\u65f6\u95f4. +widget_jobTriggerEditor_message_endTimeMustBeInFuture = \u7ed3\u675f\u65f6\u95f4\u5fc5\u987b\u662f\u672a\u6765\u65f6\u95f4. +widget_jobTriggerEditor_message_startTimeMustBeInFuture = \u5f00\u59cb\u65f6\u95f4\u5fc5\u987b\u662f\u672a\u6765\u65f6\u95f4. +widget_jobTriggerEditor_tab_examples = \u4f8b\u5b50 +widget_jobTriggerEditor_tab_format = \u683c\u5f0f +widget_jobTriggerEditor_value_calendar = \u65e5\u5386 +widget_jobTriggerEditor_value_cronExpression = Cron\u8868\u8fbe\u5f0f widget_jobTriggerEditor_value_for = For widget_jobTriggerEditor_value_in = in -widget_jobTriggerEditor_value_indefinitely = Indefinitely -widget_jobTriggerEditor_value_later = Later +widget_jobTriggerEditor_value_indefinitely = \u65e0\u9650\u671f +widget_jobTriggerEditor_value_later = widget_jobTriggerEditor_value_laterAndRepeat = Later & Repeat widget_jobTriggerEditor_value_now = Now widget_jobTriggerEditor_value_nowAndRepeat = Now & Repeat widget_jobTriggerEditor_value_on = on -widget_jobTriggerEditor_value_until = \u76F4\u5230 -widget_recordEditor_error_invalidViewPath = \u67E5\u770B\u8DEF\u5F84\u65E0\u6548: [{0}] -widget_recordEditor_error_multipleRecords = \u591A\u6761\u8BB0\u5F55\u8FD4\u56DE- \u9884\u671F\u53EA\u6709\u4E00\u4E2A. -widget_recordEditor_error_noRecords = \u65E0\u8BB0\u5F55\u8FD4\u56DE - \u9884\u671F\u6709\u4E00\u6761. -widget_recordEditor_error_operation = \u64CD\u4F5C\u5931\u8D25.\u6709\u9519\u8BEF\u53D1\u751F -widget_recordEditor_error_operationInvalidValues = \u64CD\u4F5C\u5931\u8D25-\u4E00\u4E2A\u6216\u591A\u4E2A\u5B57\u6BB5\u7684\u503C\u65E0\u6548 -widget_recordEditor_error_permissionCreate = \u4F60\u6CA1\u6709\u521B\u5EFA\u65B0[{0}]\u7684\u6743\u9650 -widget_recordEditor_error_unsupportedOperationType = \u4E0D\u652F\u6301\u7684\u64CD\u4F5C\u7C7B\u578B: [{0}] +widget_jobTriggerEditor_value_until = \u76f4\u5230 +widget_recordEditor_error_invalidViewPath = \u67e5\u770b\u8def\u5f84\u65e0\u6548: [{0}] +widget_recordEditor_error_multipleRecords = \u591a\u6761\u8bb0\u5f55\u8fd4\u56de- \u9884\u671f\u53ea\u6709\u4e00\u4e2a. +widget_recordEditor_error_noRecords = \u65e0\u8bb0\u5f55\u8fd4\u56de - \u9884\u671f\u6709\u4e00\u6761. +widget_recordEditor_error_operation = \u64cd\u4f5c\u5931\u8d25.\u6709\u9519\u8bef\u53d1\u751f +widget_recordEditor_error_operationInvalidValues = \u64cd\u4f5c\u5931\u8d25-\u4e00\u4e2a\u6216\u591a\u4e2a\u5b57\u6bb5\u7684\u503c\u65e0\u6548 +widget_recordEditor_error_permissionCreate = \u4f60\u6ca1\u6709\u521b\u5efa\u65b0[{0}]\u7684\u6743\u9650 +widget_recordEditor_error_unsupportedOperationType = \u4e0d\u652f\u6301\u7684\u64cd\u4f5c\u7c7b\u578b: [{0}] widget_recordEditor_info_recordCreatedConcise = {0} created. widget_recordEditor_info_recordCreatedDetailed = {0} [{1}] created. widget_recordEditor_info_recordUpdatedConcise = {0} updated. widget_recordEditor_info_recordUpdatedDetailed = {0} [{1}] updated. widget_recordEditor_info_recordsDeletedConcise = {0} {1} deleted. widget_recordEditor_info_recordsDeletedDetailed = {0} {1} deleted: {2}. -widget_recordEditor_label_loading = \u52A0\u8F7D\u4E2D... -widget_recordEditor_title_edit = \u7F16\u8F91{0} [{1}] -widget_recordEditor_title_new = \u65B0\u5EFA{0} -widget_recordEditor_title_view = \u67E5\u770B{0} [{1}] -widget_recordEditor_warn_validation = \u4E00\u4E2A\u6216\u591A\u4E2A\u5B57\u6BB5\u7684\u503C\u65E0\u6548. \u53EA\u6709\u5B57\u6BB5\u6709\u6548\u65F6\uFF0C[{0}]\u624D\u80FD\u4FDD\u5B58 -widget_resourceFactoryWizard_archPrompt = \u5305\u67B6\u6784 -widget_resourceFactoryWizard_configTemplatePrompt = \u8D44\u6E90\u914D\u7F6E\u6A21\u677F -widget_resourceFactoryWizard_contentTemplatePrompt = \u53D1\u5E03\u65F6\u95F4\u914D\u7F6E\u6A21\u677F -widget_resourceFactoryWizard_createSubmit = \u521B\u5EFA\u8D44\u6E90[{0}]\u6210\u529F. -widget_resourceFactoryWizard_createSubmitType = \u521B\u5EFA\u7C7B\u578B[{0}]\u7684\u8D44\u6E90\u8BF7\u6C42\u63D0\u4EA4\u6210\u529F. -widget_resourceFactoryWizard_createWizardTitle = \u521B\u5EFA\u7C7B\u578B[{0}]\u7684\u65B0\u8D44\u6E90 -widget_resourceFactoryWizard_createWizardWindowTitle = \u8D44\u6E90\u521B\u5EFA\u5411\u5BFC +widget_recordEditor_label_loading = \u52a0\u8f7d\u4e2d... +widget_recordEditor_title_edit = \u7f16\u8f91{0} [{1}] +widget_recordEditor_title_new = \u65b0\u5efa{0} +widget_recordEditor_title_view = \u67e5\u770b{0} [{1}] +widget_recordEditor_warn_validation = \u4e00\u4e2a\u6216\u591a\u4e2a\u5b57\u6bb5\u7684\u503c\u65e0\u6548. \u53ea\u6709\u5b57\u6bb5\u6709\u6548\u65f6\uff0c[{0}]\u624d\u80fd\u4fdd\u5b58 +widget_resourceFactoryWizard_archPrompt = \u5305\u67b6\u6784 +widget_resourceFactoryWizard_configTemplatePrompt = \u8d44\u6e90\u914d\u7f6e\u6a21\u677f +widget_resourceFactoryWizard_contentTemplatePrompt = \u53d1\u5e03\u65f6\u95f4\u914d\u7f6e\u6a21\u677f +widget_resourceFactoryWizard_createSubmit = \u521b\u5efa\u8d44\u6e90[{0}]\u6210\u529f. +widget_resourceFactoryWizard_createSubmitType = \u521b\u5efa\u7c7b\u578b[{0}]\u7684\u8d44\u6e90\u8bf7\u6c42\u63d0\u4ea4\u6210\u529f. +widget_resourceFactoryWizard_createWizardTitle = \u521b\u5efa\u7c7b\u578b[{0}]\u7684\u65b0\u8d44\u6e90 +widget_resourceFactoryWizard_createWizardWindowTitle = \u8d44\u6e90\u521b\u5efa\u5411\u5bfc ##widget_resourceFactoryWizard_editConfigStepName = Deployment Options -widget_resourceFactoryWizard_execute1 = \u521B\u5EFA\u8D44\u6E90\u5931\u8D25 - \u6CA1\u6709\u5305\u7248\u672C -widget_resourceFactoryWizard_execute2 = \u521B\u5EFA\u8D44\u6E90\u5931\u8D25 -widget_resourceFactoryWizard_failedToDeleteVersion = \u53D6\u6D88\u521B\u5EFA\u8D44\u6E90\u65F6\u65E0\u6CD5\u5220\u9664\u5305\u7684\u7248\u672C +widget_resourceFactoryWizard_execute1 = \u521b\u5efa\u8d44\u6e90\u5931\u8d25 - \u6ca1\u6709\u5305\u7248\u672c +widget_resourceFactoryWizard_execute2 = \u521b\u5efa\u8d44\u6e90\u5931\u8d25 +widget_resourceFactoryWizard_failedToDeleteVersion = \u53d6\u6d88\u521b\u5efa\u8d44\u6e90\u65f6\u65e0\u6cd5\u5220\u9664\u5305\u7684\u7248\u672c widget_resourceFactoryWizard_failedToGetType = Failed to get backing package type for new resource -widget_resourceFactoryWizard_importFailure = \u624B\u5DE5\u5BFC\u5165\u8D44\u6E90\u5931\u8D25 -widget_resourceFactoryWizard_importSubmitted = \u5BFC\u5165\u7C7B\u578B[{0}]\u7684\u65B0\u8D44\u6E90\u8BF7\u6C42\u5DF2\u88AB\u63D0\u4EA4 -widget_resourceFactoryWizard_importWizardTitle = \u5BFC\u5165\u7C7B\u578B[{0}]\u7684\u8D44\u6E90 -widget_resourceFactoryWizard_importWizardWindowTitle = \u5BFC\u5165\u8D44\u6E90\u5411\u5BFC -widget_resourceFactoryWizard_infoStepName = \u8D44\u6E90\u6D88\u606F -widget_resourceFactoryWizard_infoStep_loadFail = \u65E0\u6CD5\u53D6\u5F97\u67B6\u6784 -widget_resourceFactoryWizard_namePrompt = \u65B0\u8D44\u6E90\u540D -widget_resourceFactoryWizard_templatePrompt = \u8FDE\u63A5\u8BBE\u7F6E\u6A21\u677F +widget_resourceFactoryWizard_importFailure = \u624b\u5de5\u5bfc\u5165\u8d44\u6e90\u5931\u8d25 +widget_resourceFactoryWizard_importSubmitted = \u5bfc\u5165\u7c7b\u578b[{0}]\u7684\u65b0\u8d44\u6e90\u8bf7\u6c42\u5df2\u88ab\u63d0\u4ea4 +widget_resourceFactoryWizard_importWizardTitle = \u5bfc\u5165\u7c7b\u578b[{0}]\u7684\u8d44\u6e90 +widget_resourceFactoryWizard_importWizardWindowTitle = \u5bfc\u5165\u8d44\u6e90\u5411\u5bfc +widget_resourceFactoryWizard_infoStepName = \u8d44\u6e90\u6d88\u606f +widget_resourceFactoryWizard_infoStep_loadFail = \u65e0\u6cd5\u53d6\u5f97\u67b6\u6784 +widget_resourceFactoryWizard_namePrompt = \u65b0\u8d44\u6e90\u540d +widget_resourceFactoryWizard_templatePrompt = \u8fde\u63a5\u8bbe\u7f6e\u6a21\u677f ##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the RHQ Agent). Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. -widget_resourceFactoryWizard_uploadFailure = \u4E0A\u4F20\u6587\u4EF6\u5931\u8D25 -widget_resourceFactoryWizard_uploadFileStepName = \u4E0A\u4F20\u8D44\u6E90Content\u6587\u4EF6 -widget_resourceFactoryWizard_uploadInProgress = \u6B63\u5728\u4E0A\u4F20\u4E2D... \u5927\u7684\u53D1\u5E03\u6587\u4EF6\u9700\u8981\u6D88\u8017\u6570\u5206\u949F\u5B8C\u6210. -widget_resourceFactoryWizard_versionPrompt = \u5305\u7248\u672C -widget_resourceSelector_groupCategory = \u7EC4\u7C7B\u522B -widget_resourceSelector_pleaseSelectMultipleResource = \u8BF7\u9009\u62E9\u4E00\u4E2A\u6216\u591A\u4E2A\u8D44\u6E90 -widget_resourceSelector_pleaseSelectResource = \u8BF7\u9009\u62E9\u8D44\u6E90 -widget_resourceSelector_selectMultipleResources = \u9009\u62E9\u8D44\u6E90 -widget_resourceSelector_selectResource = \u9009\u62E9\u8D44\u6E90 -widget_typeCache_loadFail = \u65E0\u6CD5\u52A0\u8F7D\u8D44\u6E90\u7C7B\u578B\u7684\u5143\u6570\u636E -widget_typeTree_badTemplateType = \u65E0\u6548\u7684URL. \u672A\u77E5\u6A21\u677F\u7C7B\u578B[{0}] -widget_typeTree_badTypeId = \u65E0\u6548URL. \u9519\u8BEF\u8D44\u6E90\u7C7B\u578BID [{0}] -widget_typeTree_loadFail = \u52A0\u8F7D\u8D44\u6E90\u7C7B\u578B\u5931\u8D25 +widget_resourceFactoryWizard_uploadFailure = \u4e0a\u4f20\u6587\u4ef6\u5931\u8d25 +widget_resourceFactoryWizard_uploadFileStepName = \u4e0a\u4f20\u8d44\u6e90Content\u6587\u4ef6 +widget_resourceFactoryWizard_uploadInProgress = \u6b63\u5728\u4e0a\u4f20\u4e2d... \u5927\u7684\u53d1\u5e03\u6587\u4ef6\u9700\u8981\u6d88\u8017\u6570\u5206\u949f\u5b8c\u6210. +widget_resourceFactoryWizard_versionPrompt = \u5305\u7248\u672c +widget_resourceSelector_groupCategory = \u7ec4\u7c7b\u522b +widget_resourceSelector_pleaseSelectMultipleResource = \u8bf7\u9009\u62e9\u4e00\u4e2a\u6216\u591a\u4e2a\u8d44\u6e90 +widget_resourceSelector_pleaseSelectResource = \u8bf7\u9009\u62e9\u8d44\u6e90 +widget_resourceSelector_selectMultipleResources = \u9009\u62e9\u8d44\u6e90 +widget_resourceSelector_selectResource = \u9009\u62e9\u8d44\u6e90 +widget_typeCache_loadFail = \u65e0\u6cd5\u52a0\u8f7d\u8d44\u6e90\u7c7b\u578b\u7684\u5143\u6570\u636e +widget_typeTree_badTemplateType = \u65e0\u6548\u7684URL. \u672a\u77e5\u6a21\u677f\u7c7b\u578b[{0}] +widget_typeTree_badTypeId = \u65e0\u6548URL. \u9519\u8bef\u8d44\u6e90\u7c7b\u578bID [{0}] +widget_typeTree_loadFail = \u52a0\u8f7d\u8d44\u6e90\u7c7b\u578b\u5931\u8d25

1 0

[rhq] modules/enterprise
by John Sanda 11 Jul '11

11 Jul '11

modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml | 28 +++---- modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml | 40 +++++----- 2 files changed, 34 insertions(+), 34 deletions(-) New commits: commit 8aede51d7d3b1251d580c9546dfc99baa5cab9bb Author: John Sanda <jsanda(a)redhat.com> Date: Mon Jul 11 10:36:48 2011 -0400 Fixing oracle test failures diff --git a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml index 51e689e..3baa4a9 100644 --- a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml +++ b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml @@ -5,7 +5,7 @@ port="16163" remote_endpoint="http://here" agenttoken="tok" - backfilled="false" + backfilled="0" ctime="123456" mtime="123456"/> @@ -20,37 +20,37 @@ category="PLATFORM" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="test" - deleted="false"/> + deleted="0"/> <rhq_resource_type id="2" name="test server" category="SERVER" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="test" - deleted="false"/> + deleted="0"/> <rhq_resource_type id="3" name="test service 1" category="SERVICE" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="test" - deleted="false"/> + deleted="0"/> <rhq_resource_type id="4" name="test service 2" category="SERVICE" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="test" - deleted="false"/> + deleted="0"/> <rhq_resource_type_parents resource_type_id="2" parent_resource_type_id="1"/> @@ -90,7 +90,7 @@ deployment="AGENT" name="test" display_name="test" - enabled="true" + enabled="1" status="INSTALLED" path="/plugins/test.jar" md5="1234567" diff --git a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml index 0cfe2f1..5ff4442 100644 --- a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml +++ b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/inventory/InventoryManagerBeanTest.xml @@ -10,55 +10,55 @@ category="SERVER" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="TestPlugin1" - deleted="false"/> + deleted="0"/> <rhq_resource_type id="2" name="TestService1" category="SERVICE" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="TestPlugin1" - deleted="false"/> + deleted="0"/> <rhq_resource_type id="3" name="TestService2" category="SERVICE" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="TestPlugin1" - deleted="false"/> + deleted="0"/> <rhq_resource_type id="4" name="TestServer2" category="SERVER" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="TestPlugin1" - deleted="false"/> + deleted="0"/> <rhq_resource_type id="5" name="TestService3" category="SERVICE" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="TestPlugin1" - deleted="false"/> + deleted="0"/> <rhq_resource_type id="6" name="TestServer3" category="SERVER" creation_data_type="CONFIGURATION" create_delete_policy="BOTH" - supports_manual_add="true" - singleton="false" + supports_manual_add="1" + singleton="0" plugin="TestPlugin1" - deleted="false"/> + deleted="0"/> <rhq_resource_type_parents resource_type_id="2" @@ -84,13 +84,13 @@ name="TestServer1" uuid="test-server-1" resource_key="test-server-1" - connected="true"/> + connected="1"/> <rhq_resource id="2" resource_type_id="2" name="TestService1" uuid="test-service-1" resource_key="test-service-1" - connected="true" + connected="1" parent_resource_id="1"/> <rhq_resource_subcat/>

1 0

[rhq] modules/plugins
by Heiko W. Rupp 11 Jul '11

11 Jul '11

modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/UploadAndDeployTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3834260c090c1b3a939e94191194bb62b39ae178 Author: Heiko W. Rupp <hwr(a)redhat.com> Date: Mon Jul 11 16:03:03 2011 +0200 Disable tests that require AS7 for now diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/UploadAndDeployTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/UploadAndDeployTest.java index 31d8acf..a8b5faf 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/UploadAndDeployTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/UploadAndDeployTest.java @@ -48,7 +48,7 @@ public class UploadAndDeployTest extends AbstractIntegrationTest { private String TEST_WAR = "test-simple.war"; - protected static final boolean isEnabled = true; + protected static final boolean isEnabled = false; @Test(timeOut = 60*1000L, enabled=isEnabled) public void testUploadOnly() throws Exception {

1 0

← Newer
1
...
17
18
19
20
21
22
23
24
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits July 2011