modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/drift/DriftAgentService.java
| 2 +-
modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
| 4 ++--
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
| 5 ++++-
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
| 5 ++---
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java
| 2 +-
5 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 1e24f2a07539809341563cd41400f6ccc4462c2d
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Jun 27 16:10:30 2011 -0400
Changing DriftAgentService.requestDriftFiles to pass resource id and drift config
name
DriftManagerBean now includes the resource id and drift configuration
name in the call to DriftAgentService.requestDriftFiles. The drift
config name is read from the headers in the changeset meta data file.
diff --git
a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/drift/DriftAgentService.java
b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/drift/DriftAgentService.java
index 83baf92..3442b67 100644
---
a/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/drift/DriftAgentService.java
+++
b/modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/drift/DriftAgentService.java
@@ -39,7 +39,7 @@ public interface DriftAgentService {
* @param driftFiles
* @return the results of the immediate scheduling
*/
- boolean requestDriftFiles(List<DriftFile> driftFiles);
+ boolean requestDriftFiles(int resourceId, String driftConfigurationName,
List<DriftFile> driftFiles);
/**
* Execute drift detection immediately. If any drift is found, the agent will send
the
diff --git
a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
index 114408b..cfe9137 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftManager.java
@@ -142,11 +142,11 @@ public class DriftManager extends AgentService implements
DriftAgentService, Con
}
@Override
- public boolean requestDriftFiles(List<DriftFile> driftFiles) {
- // TODO Auto-generated method stub
+ public boolean requestDriftFiles(int resourceId, String driftConfigurationName,
List<DriftFile> driftFiles) {
return false;
}
+
@Override
public void unscheduleDriftDetection(int resourceId, DriftConfiguration
driftConfiguration) {
// TODO Auto-generated method stub
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
index 3e8b33d..e88425d 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
@@ -43,6 +43,8 @@ import javax.jms.Session;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+import com.sun.net.httpserver.Headers;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.Hibernate;
@@ -179,7 +181,8 @@ public class DriftManagerBean implements DriftManagerLocal,
DriftManagerRemote {
resourceId);
DriftAgentService service =
agentClient.getDriftAgentService();
try {
- if (service.requestDriftFiles(emptyDriftFiles)) {
+ if (service.requestDriftFiles(resourceId,
+ reader.getHeaders().getDriftConfigurationName(),
emptyDriftFiles)) {
for (DriftFile driftFile : emptyDriftFiles) {
driftFile.setStatus(DriftFileStatus.REQUESTED);
}
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
index d75e1dc..58f4ba2 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java
@@ -342,9 +342,8 @@ public class DriftManagerBeanTest extends AbstractEJB3Test {
private class TestConfigService implements DriftAgentService {
@Override
- public boolean requestDriftFiles(List<DriftFile> driftFiles) {
- // pretend we actually processed the request
- return true;
+ public boolean requestDriftFiles(int resourceId, String driftConfigurationName,
List<DriftFile> driftFiles) {
+ return false;
}
@Override
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java
index 842ab10..68b940c 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java
@@ -330,7 +330,7 @@ public class TestAgentClient implements AgentClient,
BundleAgentService, DriftAg
}
@Override
- public boolean requestDriftFiles(List<DriftFile> driftFiles) {
+ public boolean requestDriftFiles(int resourceId, String driftConfigurationName,
List<DriftFile> driftFiles) {
return false;
}
Show replies by date