Change payload handling for create and update network commands (#462)

* fix network create payload

* fix network update payload

* extend create unit test

Author: GokceGK

internal/cmd/beta/network/create/create.go

@@ -153,23 +153,26 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	req := apiClient.CreateNetwork(ctx, model.ProjectId)
 	addressFamily := &iaas.CreateNetworkAddressFamily{}
 
-	if model.IPv6DnsNameServers != nil {
+	if model.IPv6DnsNameServers != nil || model.IPv6PrefixLength != nil {
 		addressFamily.Ipv6 = &iaas.CreateNetworkIPv6Body{
 			Nameservers:  model.IPv6DnsNameServers,
 			PrefixLength: model.IPv6PrefixLength,
 		}
 	}
 
-	if model.IPv4DnsNameServers != nil {
+	if model.IPv4DnsNameServers != nil || model.IPv4PrefixLength != nil {
 		addressFamily.Ipv4 = &iaas.CreateNetworkIPv4Body{
 			Nameservers:  model.IPv4DnsNameServers,
 			PrefixLength: model.IPv4PrefixLength,
 		}
 	}
 
 	payload := iaas.CreateNetworkPayload{
-		Name:          model.Name,
-		AddressFamily: addressFamily,
+		Name: model.Name,
+	}
+
+	if addressFamily.Ipv4 != nil || addressFamily.Ipv6 != nil {
+		payload.AddressFamily = addressFamily
 	}
 
 	return req.CreateNetworkPayload(payload)

internal/cmd/beta/network/create/create_test.go

@@ -65,6 +65,17 @@ func fixtureRequest(mods ...func(request *iaas.ApiCreateNetworkRequest)) iaas.Ap
 	return request
 }
 
+func fixtureRequiredRequest(mods ...func(request *iaas.ApiCreateNetworkRequest)) iaas.ApiCreateNetworkRequest {
+	request := testClient.CreateNetwork(testCtx, testProjectId)
+	request = request.CreateNetworkPayload(iaas.CreateNetworkPayload{
+		Name: utils.Ptr("example-network-name"),
+	})
+	for _, mod := range mods {
+		mod(&request)
+	}
+	return request
+}
+
 func fixturePayload(mods ...func(payload *iaas.CreateNetworkPayload)) iaas.CreateNetworkPayload {
 	payload := iaas.CreateNetworkPayload{
 		Name: utils.Ptr("example-network-name"),
@@ -226,6 +237,17 @@ func TestBuildRequest(t *testing.T) {
 			model:           fixtureInputModel(),
 			expectedRequest: fixtureRequest(),
 		},
+		{
+			description: "only name in payload",
+			model: &inputModel{
+				GlobalFlagModel: &globalflags.GlobalFlagModel{
+					ProjectId: testProjectId,
+					Verbosity: globalflags.VerbosityDefault,
+				},
+				Name: utils.Ptr("example-network-name"),
+			},
+			expectedRequest: fixtureRequiredRequest(),
+		},
 	}
 
 	for _, tt := range tests {

internal/cmd/beta/network/update/update.go

@@ -34,7 +34,6 @@ type inputModel struct {
 	Name               *string
 	IPv4DnsNameServers *[]string
 	IPv6DnsNameServers *[]string
-	IPv6PrefixLength   *int64
 }
 
 func NewCmd(p *print.Printer) *cobra.Command {
@@ -166,8 +165,11 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
 	}
 
 	payload := iaas.PartialUpdateNetworkPayload{
-		Name:          model.Name,
-		AddressFamily: addressFamily,
+		Name: model.Name,
+	}
+
+	if addressFamily.Ipv4 != nil || addressFamily.Ipv6 != nil {
+		payload.AddressFamily = addressFamily
 	}
 
 	return req.PartialUpdateNetworkPayload(payload)