CLOUDSTACK-2319: fix "unable to add egress rules" in SecurityGroup

ustcweizhou · chipchilders · commit af5bf94b431c · 2013-05-06T20:58:32.000+01:00
Signed-off-by: Chip Childers &lt;chip.childers@gmail.com&gt;
diff --git a/api/src/com/cloud/network/security/SecurityGroupRules.java b/api/src/com/cloud/network/security/SecurityGroupRules.java
@@ -31,6 +31,8 @@ public interface SecurityGroupRules extends InternalIdentity {
 
     Long getRuleId();
 
+    String getRuleUuid();
+
     int getStartPort();
 
     int getEndPort();
diff --git a/core/src/com/cloud/network/security/SecurityGroupRulesVO.java b/core/src/com/cloud/network/security/SecurityGroupRulesVO.java
@@ -54,6 +54,9 @@ public class SecurityGroupRulesVO implements SecurityGroupRules {
     @Column(name = "id", table = "security_group_rule", insertable = false, updatable = false)
     private Long ruleId;
 
+    @Column(name = "uuid", table = "security_group_rule", insertable = false, updatable = false)
+    private String ruleUuid;
+
     @Column(name = "start_port", table = "security_group_rule", insertable = false, updatable = false)
     private int startPort;
 
@@ -75,14 +78,19 @@ public class SecurityGroupRulesVO implements SecurityGroupRules {
     public SecurityGroupRulesVO() {
     }
 
-    public SecurityGroupRulesVO(long id, String name, String description, Long domainId, Long accountId, Long ruleId, int startPort, int endPort, String protocol, Long allowedNetworkId,
+    public SecurityGroupRulesVO(long id) {
+        this.id = id;
+    }
+
+    public SecurityGroupRulesVO(long id, String name, String description, Long domainId, Long accountId, Long ruleId, String ruleUuid, int startPort, int endPort, String protocol, Long allowedNetworkId,
             String allowedSourceIpCidr) {
         this.id = id;
         this.name = name;
         this.description = description;
         this.domainId = domainId;
         this.accountId = accountId;
         this.ruleId = ruleId;
+        this.ruleUuid = ruleUuid;
         this.startPort = startPort;
         this.endPort = endPort;
         this.protocol = protocol;
@@ -120,6 +128,11 @@ public Long getRuleId() {
         return ruleId;
     }
 
+    @Override
+    public String getRuleUuid() {
+        return ruleUuid;
+    }
+
     @Override
     public int getStartPort() {
         return startPort;
diff --git a/server/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java b/server/src/com/cloud/network/security/dao/SecurityGroupRulesDaoImpl.java
@@ -84,4 +84,13 @@ public List<SecurityGroupRulesVO> listSecurityRulesByGroupId(long groupId) {
         sc.setParameters("groupId", groupId);
         return listBy(sc, searchFilter);
     }
+
+    @Override
+    public SecurityGroupRulesVO findByUuidIncludingRemoved(final String uuid) {
+        SearchCriteria<SecurityGroupRulesVO> sc = createSearchCriteria();
+        sc.addAnd("ruleUuid", SearchCriteria.Op.EQ, uuid);
+        SecurityGroupRulesVO rule = findOneIncludingRemovedBy(sc);
+        SecurityGroupRulesVO newRule = new SecurityGroupRulesVO(rule.getRuleId());
+        return newRule;
+    }
 }
diff --git a/ui/scripts/network.js b/ui/scripts/network.js

Original file line number	Diff line number	Diff line change
`@@ -84,4 +84,13 @@ public List<SecurityGroupRulesVO> listSecurityRulesByGroupId(long groupId) {`
`84`	`84`	`sc.setParameters("groupId", groupId);`
`85`	`85`	`return listBy(sc, searchFilter);`
`86`	`86`	`}`
	`87`	`+`
	`88`	`+ @Override`
	`89`	`+ public SecurityGroupRulesVO findByUuidIncludingRemoved(final String uuid) {`
	`90`	`+ SearchCriteria<SecurityGroupRulesVO> sc = createSearchCriteria();`
	`91`	`+ sc.addAnd("ruleUuid", SearchCriteria.Op.EQ, uuid);`
	`92`	`+ SecurityGroupRulesVO rule = findOneIncludingRemovedBy(sc);`
	`93`	`+ SecurityGroupRulesVO newRule = new SecurityGroupRulesVO(rule.getRuleId());`
	`94`	`+ return newRule;`
	`95`	`+ }`
`87`	`96`	`}`