Add privateendport and publicendport parameters to createPortForwardingRule API

Author: sureshanaparti

cloudstack/FirewallService.go

@@ -87,7 +87,7 @@ type FirewallServiceIface interface {
 	CreateFirewallRule(p *CreateFirewallRuleParams) (*CreateFirewallRuleResponse, error)
 	NewCreateFirewallRuleParams(ipaddressid string, protocol string) *CreateFirewallRuleParams
 	CreatePortForwardingRule(p *CreatePortForwardingRuleParams) (*CreatePortForwardingRuleResponse, error)
-	NewCreatePortForwardingRuleParams(ipaddressid string, privateport int, protocol string, publicport int, virtualmachineid string) *CreatePortForwardingRuleParams
+	NewCreatePortForwardingRuleParams(ipaddressid string, privateendport int, privateport int, protocol string, publicendport int, publicport int, virtualmachineid string) *CreatePortForwardingRuleParams
 	CreateRoutingFirewallRule(p *CreateRoutingFirewallRuleParams) (*CreateRoutingFirewallRuleResponse, error)
 	NewCreateRoutingFirewallRuleParams(networkid string, protocol string) *CreateRoutingFirewallRuleParams
 	DeleteEgressFirewallRule(p *DeleteEgressFirewallRuleParams) (*DeleteEgressFirewallRuleResponse, error)
@@ -1412,12 +1412,14 @@ func (p *CreatePortForwardingRuleParams) GetVmguestip() (string, bool) {
 
 // You should always use this function to get a new CreatePortForwardingRuleParams instance,
 // as then you are sure you have configured all required params
-func (s *FirewallService) NewCreatePortForwardingRuleParams(ipaddressid string, privateport int, protocol string, publicport int, virtualmachineid string) *CreatePortForwardingRuleParams {
+func (s *FirewallService) NewCreatePortForwardingRuleParams(ipaddressid string, privateendport int, privateport int, protocol string, publicendport int, publicport int, virtualmachineid string) *CreatePortForwardingRuleParams {
 	p := &CreatePortForwardingRuleParams{}
 	p.p = make(map[string]interface{})
 	p.p["ipaddressid"] = ipaddressid
+	p.p["privateendport"] = privateendport
 	p.p["privateport"] = privateport
 	p.p["protocol"] = protocol
+	p.p["publicendport"] = publicendport
 	p.p["publicport"] = publicport
 	p.p["virtualmachineid"] = virtualmachineid
 	return p

cloudstack/FirewallService_mock.go

@@ -70,4 +70,8 @@ var requiredParams = map[string][]string{
 	"updateGuestOs": {
 		"osdisplayname",
 	},
+        "createPortForwardingRule": {
+		"privateendport",
+		"publicendport",
+	},
 }

generate/requiredParams.go

@@ -93,7 +93,7 @@ func TestFirewallService(t *testing.T) {
 		if _, ok := response["createPortForwardingRule"]; !ok {
 			t.Skipf("Skipping as no json response is provided in testdata")
 		}
-		p := client.Firewall.NewCreatePortForwardingRuleParams("ipaddressid", 0, "protocol", 0, "virtualmachineid")
+		p := client.Firewall.NewCreatePortForwardingRuleParams("ipaddressid", 0, 0, "protocol", 0, 0, "virtualmachineid")
 		r, err := client.Firewall.CreatePortForwardingRule(p)
 		if err != nil {
 			t.Errorf(err.Error())