Automatic merge from release/2.4.0 -> release/2.5.0

* commit 'e80ce6369eeeea100b3c48810a837828580f9d3d':
  避免同步过来的安全组规则ip地址为nil

pkg/compute/models/secgrouprules.go

@@ -401,12 +401,17 @@ func (manager *SSecurityGroupRuleManager) newFromCloudSecurityGroup(rule secrule
 		protocol = secrules.PROTO_ANY
 	}
 
+	cidr := "0.0.0.0/0"
+	if rule.IPNet != nil && rule.IPNet.String() != "<nil>" {
+		cidr = rule.IPNet.String()
+	}
+
 	secrule := &SSecurityGroupRule{
 		Priority:    int64(rule.Priority),
 		Protocol:    protocol,
 		Ports:       "",
 		Direction:   string(rule.Direction),
-		CIDR:        rule.IPNet.String(),
+		CIDR:        cidr,
 		Action:      string(rule.Action),
 		Description: rule.Description,
 		SecgroupID:  secgroup.Id,