Fix creation of firewall & Egress firewall rules when created in a project

Author: Pearl1594

cloudstack/resource_cloudstack_egress_firewall.go

@@ -45,6 +45,13 @@ func resourceCloudStackEgressFirewall() *schema.Resource {
 				ForceNew: true,
 			},
 
+			"project": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+			},
+
 			"managed": {
 				Type:     schema.TypeBool,
 				Optional: true,
@@ -265,6 +272,11 @@ func resourceCloudStackEgressFirewallRead(d *schema.ResourceData, meta interface
 	p.SetNetworkid(d.Id())
 	p.SetListall(true)
 
+	// If there is a project supplied, we retrieve and set the project id
+	if err := setProjectid(p, cs, d); err != nil {
+		return err
+	}
+
 	l, err := cs.Firewall.ListEgressFirewallRules(p)
 	if err != nil {
 		return err

cloudstack/resource_cloudstack_firewall.go

@@ -45,6 +45,13 @@ func resourceCloudStackFirewall() *schema.Resource {
 				ForceNew: true,
 			},
 
+			"project": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+			},
+
 			"managed": {
 				Type:     schema.TypeBool,
 				Optional: true,
@@ -256,6 +263,11 @@ func resourceCloudStackFirewallRead(d *schema.ResourceData, meta interface{}) er
 	p.SetIpaddressid(d.Id())
 	p.SetListall(true)
 
+	// If there is a project supplied, we retrieve and set the project id
+	if err := setProjectid(p, cs, d); err != nil {
+		return err
+	}
+
 	l, err := cs.Firewall.ListFirewallRules(p)
 	if err != nil {
 		return err