[rhq] Branch 'jsanda/metrics-rhq' - modules/core modules/enterprise

Jay Shaughnessy jshaughn at fedoraproject.org
Mon Aug 13 18:51:36 UTC 2012


 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/Availability.java                                     |    4 ++-
 modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java                                 |    3 +-
 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/GroupWithUncommittedTest.java |   13 ++--------
 3 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 6b2d429956aff9bb55254b6305bfd549cfd1518b
Author: Jay Shaughnessy <jshaughn at redhat.com>
Date:   Mon Aug 13 14:18:10 2012 -0400

    - Fix issues with Filtering UNCOMMITTED resources in a few NamedQueries.
    - Remove unnecessary decl of ResourceGroupManager in test class, use the base class var.

diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/Availability.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/Availability.java
index 6158a74..d8a1083 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/Availability.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/Availability.java
@@ -104,7 +104,8 @@ import org.rhq.core.domain.resource.Resource;
         + " WHERE av.resource.id IN ( SELECT ires.id " //
         + "                             FROM ResourceGroup rg " //
         + "                             JOIN rg.implicitResources ires " //
-        + "                            WHERE rg.id = :groupId AND ires.inventoryStatus = 'COMMITTED' ) " //
+        + "                            WHERE rg.id = :groupId ) " //
+        + "   AND av.resource.inventoryStatus = 'COMMITTED' " //
         + "   AND ((av.startTime <= :start AND (av.endTime >= :start OR av.endTime IS NULL) ) " /* availability straddles :start */
         + "        OR (av.startTime BETWEEN :start AND :end)) " /* interval straddles availability.startTime */
         + "ORDER BY av.startTime ASC"), //
@@ -113,6 +114,7 @@ import org.rhq.core.domain.resource.Resource;
         + "    JOIN av.resource res JOIN res.parentResource parent JOIN res.resourceType type " //
         + "   WHERE parent.id = :parentId " //
         + "     AND type.id = :typeId " //
+        + "     AND av.resource.inventoryStatus = 'COMMITTED' " //
         + "     AND ((av.startTime <= :start AND (av.endTime >= :start OR av.endTime IS NULL)) " /* availability straddles :start */
         + "          OR (av.startTime BETWEEN :start AND :end)) " /* interval straddles availability.startTime */
         + "ORDER BY av.startTime ASC"), //
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java
index 7b30aaf..937a891 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java
@@ -197,7 +197,8 @@ import org.rhq.core.domain.tagging.Tag;
         + "    AND res.id NOT IN ( SELECT explicitRes.id " //
         + "                          FROM ResourceGroup rg " //
         + "                          JOIN rg.explicitResources explicitRes " //
-        + "                         WHERE rg.id = :groupId AND explicitRes.inventoryStatus = 'COMMITTED') ") })
+        + "                         WHERE rg.id = :groupId ) " //
+        + "    AND res.inventoryStatus = 'COMMITTED' ") })
 @SequenceGenerator(name = "id", sequenceName = "RHQ_RESOURCE_GROUP_ID_SEQ")
 @Table(name = "RHQ_RESOURCE_GROUP")
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/GroupWithUncommittedTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/GroupWithUncommittedTest.java
index 8ef992d..3c57e5c 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/GroupWithUncommittedTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/group/test/GroupWithUncommittedTest.java
@@ -24,7 +24,6 @@ import java.util.List;
 import javax.persistence.Query;
 
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import org.rhq.core.domain.authz.Permission;
@@ -39,7 +38,6 @@ import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
 import org.rhq.core.domain.server.PersistenceUtility;
 import org.rhq.core.domain.util.PageControl;
 import org.rhq.core.domain.util.PageList;
-import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal;
 import org.rhq.enterprise.server.test.LargeGroupTestBase;
 import org.rhq.enterprise.server.test.TestServerCommunicationsService;
 import org.rhq.enterprise.server.util.LookupUtil;
@@ -49,7 +47,6 @@ import org.rhq.enterprise.server.util.SessionTestHelper;
 public class GroupWithUncommittedTest extends LargeGroupTestBase {
 
     private static final boolean TESTS_ENABLED = true;
-    private ResourceGroupManagerLocal rgMgr;
     private LargeGroupEnvironment env;
 
     private class GroupAvailCounts {
@@ -77,11 +74,6 @@ public class GroupWithUncommittedTest extends LargeGroupTestBase {
     protected void setupMockAgentServices(TestServerCommunicationsService agentServiceContainer) {
     }
 
-    @BeforeMethod
-    public void getManagers() {
-        this.rgMgr = LookupUtil.getResourceGroupManager();
-    }
-
     /**
      * Remove the group and all its members.
      */
@@ -104,7 +96,8 @@ public class GroupWithUncommittedTest extends LargeGroupTestBase {
         SessionTestHelper.simulateLogin(env.normalSubject);
 
         // these queries were tweeked to filter uncommitted - see BZ 820981
-        PageList<ResourceGroupComposite> results = rgMgr.findResourceGroupComposites(env.normalSubject, null, null,
+        PageList<ResourceGroupComposite> results = resourceGroupManager.findResourceGroupComposites(env.normalSubject,
+            null, null,
             null, null, null, null, env.compatibleGroup.getId(), new PageControl(0, 50));
         int count = results.size();
         assert count == 1 : "results=" + results;
@@ -263,7 +256,7 @@ public class GroupWithUncommittedTest extends LargeGroupTestBase {
         assert resConfigCount == gac.visibleTotal;
         assert pluginConfigCount == gac.visibleTotal;
 
-        int groupSize = rgMgr.getExplicitGroupMemberCount(env.compatibleGroup.getId());
+        int groupSize = resourceGroupManager.getExplicitGroupMemberCount(env.compatibleGroup.getId());
         assert resConfigCount == groupSize;
         assert pluginConfigCount == groupSize;
 




More information about the rhq-commits mailing list