CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated
resource with the 'ExplicitDedication' affinity group
Changes:
- Adding mocks in unit tests for new injected components
Conflicts:
server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5628153c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5628153c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5628153c
Branch: refs/heads/master
Commit: 5628153c59477914d82f8f64bae98e4d43ea5252
Parents: c1c3c96
Author: Prachi Damle <[email protected]>
Authored: Tue Sep 3 13:30:56 2013 -0700
Committer: Prachi Damle <[email protected]>
Committed: Tue Sep 3 20:02:44 2013 -0700
----------------------------------------------------------------------
.../affinity/ExplicitDedicationProcessor.java | 2 ++
.../vm/DeploymentPlanningManagerImplTest.java | 6 ++++++
.../networkoffering/ChildTestConfiguration.java | 19 +++++++++++++++++++
3 files changed, 27 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5628153c/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java
----------------------------------------------------------------------
diff --git
a/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java
b/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java
index 5b201c6..db8e189 100644
---
a/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java
+++
b/plugins/affinity-group-processors/explicit-dedication/src/org/apache/cloudstack/affinity/ExplicitDedicationProcessor.java
@@ -44,6 +44,7 @@ import com.cloud.domain.dao.DomainDao;
import com.cloud.exception.AffinityConflictException;
import com.cloud.host.HostVO;
import com.cloud.host.dao.HostDao;
+import com.cloud.utils.db.DB;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
@@ -406,6 +407,7 @@ public class ExplicitDedicationProcessor extends
AffinityProcessorBase implement
return true;
}
+ @DB
@Override
public void handleDeleteGroup(AffinityGroup group) {
// When a group of the 'ExplicitDedication' type gets deleted, make
sure
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5628153c/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java
b/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java
index 3544e0a..0f343a5 100644
--- a/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java
+++ b/server/test/com/cloud/vm/DeploymentPlanningManagerImplTest.java
@@ -54,6 +54,7 @@ import com.cloud.deploy.PlannerHostReservationVO;
import com.cloud.deploy.dao.PlannerHostReservationDao;
import org.apache.cloudstack.affinity.AffinityGroupProcessor;
+import org.apache.cloudstack.affinity.AffinityGroupService;
import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao;
import org.apache.cloudstack.engine.cloud.entity.api.db.dao.VMReservationDao;
@@ -366,6 +367,11 @@ public class DeploymentPlanningManagerImplTest {
return Mockito.mock(VMReservationDao.class);
}
+ @Bean
+ public AffinityGroupService affinityGroupService() {
+ return Mockito.mock(AffinityGroupService.class);
+ }
+
public static class Library implements TypeFilter {
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5628153c/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
----------------------------------------------------------------------
diff --git
a/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
b/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
index 145fc1d..b693d4c 100644
---
a/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
+++
b/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
@@ -19,6 +19,15 @@ package org.apache.cloudstack.networkoffering;
import java.io.IOException;
+import javax.inject.Inject;
+
+import org.apache.cloudstack.acl.SecurityChecker;
+import org.apache.cloudstack.affinity.AffinityGroupService;
+import org.apache.cloudstack.affinity.dao.AffinityGroupDao;
+import org.apache.cloudstack.region.PortableIpDaoImpl;
+import org.apache.cloudstack.region.dao.RegionDaoImpl;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl;
+import org.apache.cloudstack.test.utils.SpringUtils;
import org.mockito.Mockito;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
@@ -359,6 +368,16 @@ public class ChildTestConfiguration {
return Mockito.mock(DataStoreManager.class);
}
+ @Bean
+ public AffinityGroupDao affinityGroupDao() {
+ return Mockito.mock(AffinityGroupDao.class);
+ }
+
+ @Bean
+ public AffinityGroupService affinityGroupService() {
+ return Mockito.mock(AffinityGroupService.class);
+ }
+
public static class Library implements TypeFilter {
@Override
