reverted some changes that required egress fw rules to be re-created; ensure the new feature is optional and fully backward-compatible

Author: Curverneur

cloudstack/resource_cloudstack_egress_firewall.go

@@ -201,15 +201,6 @@ func createEgressFirewallRule(d *schema.ResourceData, meta interface{}, rule map
 		p.SetCidrlist(cidrList)
 	}
 
-	// Set the destination CIDR list
-	var destcidrList []string
-	if rs := rule["cidr_list"].(*schema.Set); rs.Len() > 0 {
-		for _, cidr := range rule["dest_cidr_list"].(*schema.Set).List() {
-			destcidrList = append(destcidrList, cidr.(string))
-		}
-		p.SetDestcidrlist(destcidrList)
-	}
-
 	// If the protocol is ICMP set the needed ICMP parameters
 	if rule["protocol"].(string) == "icmp" {
 		p.SetIcmptype(rule["icmp_type"].(int))
@@ -329,24 +320,10 @@ func resourceCloudStackEgressFirewallRead(d *schema.ResourceData, meta interface
 				// Delete the known rule so only unknown rules remain in the ruleMap
 				delete(ruleMap, id.(string))
 
-				// Create a set with all CIDR's
-				cidrs := &schema.Set{F: schema.HashString}
-				for _, cidr := range strings.Split(r.Cidrlist, ",") {
-					cidrs.Add(cidr)
-				}
-
-				// Create a set with all destination CIDR's
-				destcidrs := &schema.Set{F: schema.HashString}
-				for _, cidr := range strings.Split(r.Destcidrlist, ",") {
-					destcidrs.Add(cidr)
-				}
-
 				// Update the values
 				rule["protocol"] = r.Protocol
 				rule["icmp_type"] = r.Icmptype
 				rule["icmp_code"] = r.Icmpcode
-				rule["cidr_list"] = cidrs
-				rule["dest_cidr_list"] = destcidrs
 				rules.Add(rule)
 			}
 
@@ -380,16 +357,9 @@ func resourceCloudStackEgressFirewallRead(d *schema.ResourceData, meta interface
 							cidrs.Add(cidr)
 						}
 
-						// Create a set with all destination CIDR's
-						destcidrs := &schema.Set{F: schema.HashString}
-						for _, cidr := range strings.Split(r.Destcidrlist, ",") {
-							destcidrs.Add(cidr)
-						}
-
 						// Update the values
 						rule["protocol"] = r.Protocol
 						rule["cidr_list"] = cidrs
-						rule["dest_cidr_list"] = destcidrs
 						ports.Add(port)
 					}