Skip to content

Commit fce9c06

Browse files
authored
Change network payload handling (#444)
* change network payload handling * apply pr suggestions
1 parent a3054cf commit fce9c06

File tree

4 files changed

+36
-24
lines changed

4 files changed

+36
-24
lines changed

docs/stackit_beta_network_create.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ stackit beta network create [flags]
2020
$ stackit beta network create --name network-1 --ipv4-dns-name-servers "1.1.1.1,8.8.8.8,9.9.9.9" --ipv4-prefix-length 25
2121
2222
Create an IPv6 network with name "network-1" with DNS name servers and a prefix length
23-
$ stackit beta network create --name network-1 --ipv6-dns-name-servers "1.1.1.1,8.8.8.8,9.9.9.9" --ipv6-prefix-length 25
23+
$ stackit beta network create --name network-1 --ipv6-dns-name-servers "2001:4860:4860::8888,2001:4860:4860::8844" --ipv6-prefix-length 56
2424
```
2525

2626
### Options

docs/stackit_beta_network_update.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ stackit beta network update [flags]
2020
$ stackit beta network update xxx --name network-1-new --ipv4-dns-name-servers "2.2.2.2"
2121
2222
Update IPv6 network with ID "xxx" with new name "network-1-new" and new DNS name servers
23-
$ stackit beta network update xxx --name network-1-new --ipv6-dns-name-servers "2.2.2.2"
23+
$ stackit beta network update xxx --name network-1-new --ipv6-dns-name-servers "2001:4860:4860::8888"
2424
```
2525

2626
### Options

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

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
5555
),
5656
examples.NewExample(
5757
`Create an IPv6 network with name "network-1" with DNS name servers and a prefix length`,
58-
`$ stackit beta network create --name network-1 --ipv6-dns-name-servers "1.1.1.1,8.8.8.8,9.9.9.9" --ipv6-prefix-length 25`,
58+
`$ stackit beta network create --name network-1 --ipv6-dns-name-servers "2001:4860:4860::8888,2001:4860:4860::8844" --ipv6-prefix-length 56`,
5959
),
6060
),
6161
RunE: func(cmd *cobra.Command, args []string) error {
@@ -151,19 +151,25 @@ func parseInput(p *print.Printer, cmd *cobra.Command) (*inputModel, error) {
151151

152152
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiCreateNetworkRequest {
153153
req := apiClient.CreateNetwork(ctx, model.ProjectId)
154+
addressFamily := &iaas.CreateNetworkAddressFamily{}
155+
156+
if model.IPv6DnsNameServers != nil {
157+
addressFamily.Ipv6 = &iaas.V1CreateNetworkIPv6{
158+
Nameservers: model.IPv6DnsNameServers,
159+
PrefixLength: model.IPv6PrefixLength,
160+
}
161+
}
162+
163+
if model.IPv4DnsNameServers != nil {
164+
addressFamily.Ipv4 = &iaas.CreateNetworkIPv4{
165+
Nameservers: model.IPv4DnsNameServers,
166+
PrefixLength: model.IPv4PrefixLength,
167+
}
168+
}
154169

155170
payload := iaas.CreateNetworkPayload{
156-
Name: model.Name,
157-
AddressFamily: &iaas.CreateNetworkAddressFamily{
158-
Ipv4: &iaas.CreateNetworkIPv4{
159-
Nameservers: model.IPv4DnsNameServers,
160-
PrefixLength: model.IPv4PrefixLength,
161-
},
162-
Ipv6: &iaas.V1CreateNetworkIPv6{
163-
Nameservers: model.IPv6DnsNameServers,
164-
PrefixLength: model.IPv6PrefixLength,
165-
},
166-
},
171+
Name: model.Name,
172+
AddressFamily: addressFamily,
167173
}
168174

169175
return req.CreateNetworkPayload(payload)

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

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func NewCmd(p *print.Printer) *cobra.Command {
5454
),
5555
examples.NewExample(
5656
`Update IPv6 network with ID "xxx" with new name "network-1-new" and new DNS name servers`,
57-
`$ stackit beta network update xxx --name network-1-new --ipv6-dns-name-servers "2.2.2.2"`,
57+
`$ stackit beta network update xxx --name network-1-new --ipv6-dns-name-servers "2001:4860:4860::8888"`,
5858
),
5959
),
6060
RunE: func(cmd *cobra.Command, args []string) error {
@@ -151,17 +151,23 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
151151

152152
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiPartialUpdateNetworkRequest {
153153
req := apiClient.PartialUpdateNetwork(ctx, model.ProjectId, model.NetworkId)
154+
addressFamily := &iaas.UpdateNetworkAddressFamily{}
155+
156+
if model.IPv6DnsNameServers != nil {
157+
addressFamily.Ipv6 = &iaas.V1UpdateNetworkIPv6{
158+
Nameservers: model.IPv6DnsNameServers,
159+
}
160+
}
161+
162+
if model.IPv4DnsNameServers != nil {
163+
addressFamily.Ipv4 = &iaas.UpdateNetworkIPv4{
164+
Nameservers: model.IPv4DnsNameServers,
165+
}
166+
}
154167

155168
payload := iaas.PartialUpdateNetworkPayload{
156-
Name: model.Name,
157-
AddressFamily: &iaas.UpdateNetworkAddressFamily{
158-
Ipv4: &iaas.UpdateNetworkIPv4{
159-
Nameservers: model.IPv4DnsNameServers,
160-
},
161-
Ipv6: &iaas.V1UpdateNetworkIPv6{
162-
Nameservers: model.IPv6DnsNameServers,
163-
},
164-
},
169+
Name: model.Name,
170+
AddressFamily: addressFamily,
165171
}
166172

167173
return req.PartialUpdateNetworkPayload(payload)

0 commit comments

Comments
 (0)