CLOUDSTACK-4259 Dedicated Resources: createAffinityGroup API should not allow admin to create the group of this type through API

Prachi Damle · Prachi Damle · commit 96ca70e2daae · 2013-09-03T20:02:53.000-07:00
Changes:
- Block API from creating this type of group
diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupService.java b/api/src/org/apache/cloudstack/affinity/AffinityGroupService.java
@@ -79,4 +79,7 @@ Pair<List<? extends AffinityGroup>, Integer> listAffinityGroups(Long affinityGro
 
     boolean isAffinityGroupAvailableInDomain(long affinityGroupId, long domainId);
 
+    AffinityGroup createAffinityGroupInternal(String account, Long domainId, String affinityGroupName,
+            String affinityGroupType, String description);
+
 }
diff --git a/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java b/plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java
@@ -609,7 +609,7 @@ private AffinityGroup findOrCreateDedicatedAffinityGroup(Long domainId, Long acc
         }
 
 
-        group = _affinityGroupService.createAffinityGroup(accountName, domainId, affinityGroupName,
+        group = _affinityGroupService.createAffinityGroupInternal(accountName, domainId, affinityGroupName,
                     "ExplicitDedication", "dedicated resources group");
         
         return group;
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -1852,7 +1852,7 @@ private AffinityGroup createDedicatedAffinityGroup(String affinityGroupName, Lon
             }
         }
 
-        group = _affinityGroupService.createAffinityGroup(accountName, domainId, affinityGroupName,
+        group = _affinityGroupService.createAffinityGroupInternal(accountName, domainId, affinityGroupName,
                 "ExplicitDedication", "dedicated resources group");
 
         return group;
diff --git a/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java b/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
@@ -134,6 +134,34 @@ public AffinityGroup createAffinityGroup(String account, Long domainId, String a
 
         AffinityGroupProcessor processor = typeProcessorMap.get(affinityGroupType);
 
+        if (processor.isAdminControlledGroup()) {
+            throw new PermissionDeniedException("Cannot create the affinity group");
+        }
+
+        return createAffinityGroupInternal(account, domainId, affinityGroupName, affinityGroupType, description);
+    }
+
+    @DB
+    @Override
+    public AffinityGroup createAffinityGroupInternal(String account, Long domainId, String affinityGroupName,
+            String affinityGroupType, String description) {
+
+        Account caller = UserContext.current().getCaller();
+
+        // validate the affinityGroupType
+        Map<String, AffinityGroupProcessor> typeProcessorMap = getAffinityTypeToProcessorMap();
+        if (typeProcessorMap != null && !typeProcessorMap.isEmpty()) {
+            if (!typeProcessorMap.containsKey(affinityGroupType)) {
+                throw new InvalidParameterValueException("Unable to create affinity group, invalid affinity group type"
+                        + affinityGroupType);
+            }
+        } else {
+            throw new InvalidParameterValueException(
+                    "Unable to create affinity group, no Affinity Group Types configured");
+        }
+
+        AffinityGroupProcessor processor = typeProcessorMap.get(affinityGroupType);
+
         if (processor.isAdminControlledGroup() && !_accountMgr.isRootAdmin(caller.getType())) {
             throw new PermissionDeniedException("Cannot create the affinity group");
         }

Original file line number	Diff line number	Diff line change
`@@ -79,4 +79,7 @@ Pair<List<? extends AffinityGroup>, Integer> listAffinityGroups(Long affinityGro`
`79`	`79`
`80`	`80`	`boolean isAffinityGroupAvailableInDomain(long affinityGroupId, long domainId);`
`81`	`81`
	`82`	`+ AffinityGroup createAffinityGroupInternal(String account, Long domainId, String affinityGroupName,`
	`83`	`+ String affinityGroupType, String description);`
	`84`	`+`
`82`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -609,7 +609,7 @@ private AffinityGroup findOrCreateDedicatedAffinityGroup(Long domainId, Long acc`
`609`	`609`	`}`
`610`	`610`
`611`	`611`
`612`		`- group = _affinityGroupService.createAffinityGroup(accountName, domainId, affinityGroupName,`
	`612`	`+ group = _affinityGroupService.createAffinityGroupInternal(accountName, domainId, affinityGroupName,`
`613`	`613`	`"ExplicitDedication", "dedicated resources group");`
`614`	`614`
`615`	`615`	`return group;`
Original file line number	Diff line number	Diff line change
`@@ -1852,7 +1852,7 @@ private AffinityGroup createDedicatedAffinityGroup(String affinityGroupName, Lon`
`1852`	`1852`	`}`
`1853`	`1853`	`}`
`1854`	`1854`
`1855`		`- group = _affinityGroupService.createAffinityGroup(accountName, domainId, affinityGroupName,`
	`1855`	`+ group = _affinityGroupService.createAffinityGroupInternal(accountName, domainId, affinityGroupName,`
`1856`	`1856`	`"ExplicitDedication", "dedicated resources group");`
`1857`	`1857`
`1858`	`1858`	`return group;`