Skip to content

Commit cafcaae

Browse files
Marcel JacekMarcel Jacek
Marcel Jacek
authored and
Marcel Jacek
committed
adjust network-area network-range commands
1 parent 8f8b3b5 commit cafcaae

8 files changed

Lines changed: 41 additions & 12 deletions

File tree

‎internal/cmd/network-area/network-range/create/create.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
118118
}
119119

120120
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiCreateNetworkAreaRangeRequest {
121-
req := apiClient.CreateNetworkAreaRange(ctx, *model.OrganizationId, *model.NetworkAreaId)
121+
req := apiClient.CreateNetworkAreaRange(ctx, *model.OrganizationId, *model.NetworkAreaId, model.Region)
122122
payload := iaas.CreateNetworkAreaRangePayload{
123123
Ipv4: &[]iaas.NetworkRange{
124124
{
@@ -131,7 +131,7 @@ func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APICli
131131

132132
func outputResult(p *print.Printer, outputFormat, networkAreaLabel string, networkRange iaas.NetworkRange) error {
133133
return p.OutputResult(outputFormat, networkRange, func() error {
134-
p.Outputf("Created network range for SNA %q.\nNetwork range ID: %s\n", networkAreaLabel, utils.PtrString(networkRange.NetworkRangeId))
134+
p.Outputf("Created network range for SNA %q.\nNetwork range ID: %s\n", networkAreaLabel, utils.PtrString(networkRange.Id))
135135
return nil
136136
})
137137
}

‎internal/cmd/network-area/network-range/create/create_test.go‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ import (
1616
"github.com/stackitcloud/stackit-sdk-go/services/iaas"
1717
)
1818

19+
const (
20+
testRegion = "eu01"
21+
)
22+
1923
type testCtxKey struct{}
2024

2125
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
@@ -26,6 +30,8 @@ var testNetworkAreaId = uuid.NewString()
2630

2731
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
2832
flagValues := map[string]string{
33+
globalflags.RegionFlag: testRegion,
34+
2935
organizationIdFlag: testOrgId,
3036
networkAreaIdFlag: testNetworkAreaId,
3137
networkRangeFlag: "1.1.1.0/24",
@@ -40,6 +46,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4046
model := &inputModel{
4147
GlobalFlagModel: &globalflags.GlobalFlagModel{
4248
Verbosity: globalflags.VerbosityDefault,
49+
Region: testRegion,
4350
},
4451
OrganizationId: utils.Ptr(testOrgId),
4552
NetworkAreaId: utils.Ptr(testNetworkAreaId),
@@ -52,7 +59,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5259
}
5360

5461
func fixtureRequest(mods ...func(request *iaas.ApiCreateNetworkAreaRangeRequest)) iaas.ApiCreateNetworkAreaRangeRequest {
55-
request := testClient.CreateNetworkAreaRange(testCtx, testOrgId, testNetworkAreaId)
62+
request := testClient.CreateNetworkAreaRange(testCtx, testOrgId, testNetworkAreaId, testRegion)
5663
request = request.CreateNetworkAreaRangePayload(fixturePayload())
5764
for _, mod := range mods {
5865
mod(&request)

‎internal/cmd/network-area/network-range/delete/delete.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
6262
params.Printer.Debug(print.ErrorLevel, "get network area name: %v", err)
6363
networkAreaLabel = *model.NetworkAreaId
6464
}
65-
networkRangeLabel, err := iaasUtils.GetNetworkRangePrefix(ctx, apiClient, *model.OrganizationId, *model.NetworkAreaId, model.NetworkRangeId)
65+
networkRangeLabel, err := iaasUtils.GetNetworkRangePrefix(ctx, apiClient, *model.OrganizationId, *model.NetworkAreaId, model.Region, model.NetworkRangeId)
6666
if err != nil {
6767
params.Printer.Debug(print.ErrorLevel, "get network range prefix: %v", err)
6868
networkRangeLabel = model.NetworkRangeId
@@ -118,6 +118,6 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
118118
}
119119

120120
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiDeleteNetworkAreaRangeRequest {
121-
req := apiClient.DeleteNetworkAreaRange(ctx, *model.OrganizationId, *model.NetworkAreaId, model.NetworkRangeId)
121+
req := apiClient.DeleteNetworkAreaRange(ctx, *model.OrganizationId, *model.NetworkAreaId, model.Region, model.NetworkRangeId)
122122
return req
123123
}

‎internal/cmd/network-area/network-range/delete/delete_test.go‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ import (
1515
"github.com/stackitcloud/stackit-sdk-go/services/iaas"
1616
)
1717

18+
const (
19+
testRegion = "eu01"
20+
)
21+
1822
type testCtxKey struct{}
1923

2024
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
@@ -36,6 +40,8 @@ func fixtureArgValues(mods ...func(argValues []string)) []string {
3640

3741
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
3842
flagValues := map[string]string{
43+
globalflags.RegionFlag: testRegion,
44+
3945
organizationIdFlag: testOrgId,
4046
networkAreaIdFlag: testNetworkAreaId,
4147
}
@@ -49,6 +55,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4955
model := &inputModel{
5056
GlobalFlagModel: &globalflags.GlobalFlagModel{
5157
Verbosity: globalflags.VerbosityDefault,
58+
Region: testRegion,
5259
},
5360
OrganizationId: utils.Ptr(testOrgId),
5461
NetworkAreaId: utils.Ptr(testNetworkAreaId),
@@ -61,7 +68,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6168
}
6269

6370
func fixtureRequest(mods ...func(request *iaas.ApiDeleteNetworkAreaRangeRequest)) iaas.ApiDeleteNetworkAreaRangeRequest {
64-
request := testClient.DeleteNetworkAreaRange(testCtx, testOrgId, testNetworkAreaId, testNetworkRangeId)
71+
request := testClient.DeleteNetworkAreaRange(testCtx, testOrgId, testNetworkAreaId, testRegion, testNetworkRangeId)
6572
for _, mod := range mods {
6673
mod(&request)
6774
}

‎internal/cmd/network-area/network-range/describe/describe.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, inputArgs []string) (*inpu
9595
}
9696

9797
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiGetNetworkAreaRangeRequest {
98-
req := apiClient.GetNetworkAreaRange(ctx, *model.OrganizationId, *model.NetworkAreaId, model.NetworkRangeId)
98+
req := apiClient.GetNetworkAreaRange(ctx, *model.OrganizationId, *model.NetworkAreaId, model.Region, model.NetworkRangeId)
9999
return req
100100
}
101101

@@ -106,7 +106,7 @@ func outputResult(p *print.Printer, outputFormat string, networkRange *iaas.Netw
106106

107107
return p.OutputResult(outputFormat, networkRange, func() error {
108108
table := tables.NewTable()
109-
table.AddRow("ID", utils.PtrString(networkRange.NetworkRangeId))
109+
table.AddRow("ID", utils.PtrString(networkRange.Id))
110110
table.AddSeparator()
111111
table.AddRow("Network range", utils.PtrString(networkRange.Prefix))
112112

‎internal/cmd/network-area/network-range/describe/describe_test.go‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ import (
1515
"github.com/stackitcloud/stackit-sdk-go/services/iaas"
1616
)
1717

18+
const (
19+
projectIdFlag = globalflags.ProjectIdFlag
20+
testRegion = "eu01"
21+
)
22+
1823
type testCtxKey struct{}
1924

2025
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
@@ -36,6 +41,8 @@ func fixtureArgValues(mods ...func(argValues []string)) []string {
3641

3742
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
3843
flagValues := map[string]string{
44+
globalflags.RegionFlag: testRegion,
45+
3946
organizationIdFlag: testOrgId,
4047
networkAreaIdFlag: testNetworkAreaId,
4148
}
@@ -48,6 +55,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st
4855
func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4956
model := &inputModel{
5057
GlobalFlagModel: &globalflags.GlobalFlagModel{
58+
Region: testRegion,
5159
Verbosity: globalflags.VerbosityDefault,
5260
},
5361
OrganizationId: utils.Ptr(testOrgId),
@@ -61,7 +69,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6169
}
6270

6371
func fixtureRequest(mods ...func(request *iaas.ApiGetNetworkAreaRangeRequest)) iaas.ApiGetNetworkAreaRangeRequest {
64-
request := testClient.GetNetworkAreaRange(testCtx, testOrgId, testNetworkAreaId, testNetworkRangeId)
72+
request := testClient.GetNetworkAreaRange(testCtx, testOrgId, testNetworkAreaId, testRegion, testNetworkRangeId)
6573
for _, mod := range mods {
6674
mod(&request)
6775
}

‎internal/cmd/network-area/network-range/list/list.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func parseInput(p *print.Printer, cmd *cobra.Command, _ []string) (*inputModel,
128128
}
129129

130130
func buildRequest(ctx context.Context, model *inputModel, apiClient *iaas.APIClient) iaas.ApiListNetworkAreaRangesRequest {
131-
return apiClient.ListNetworkAreaRanges(ctx, *model.OrganizationId, *model.NetworkAreaId)
131+
return apiClient.ListNetworkAreaRanges(ctx, *model.OrganizationId, *model.NetworkAreaId, model.Region)
132132
}
133133

134134
func outputResult(p *print.Printer, outputFormat string, networkRanges []iaas.NetworkRange) error {
@@ -137,7 +137,7 @@ func outputResult(p *print.Printer, outputFormat string, networkRanges []iaas.Ne
137137
table.SetHeader("ID", "Network Range")
138138

139139
for _, networkRange := range networkRanges {
140-
table.AddRow(utils.PtrString(networkRange.NetworkRangeId), utils.PtrString(networkRange.Prefix))
140+
table.AddRow(utils.PtrString(networkRange.Id), utils.PtrString(networkRange.Prefix))
141141
}
142142

143143
p.Outputln(table.Render())

‎internal/cmd/network-area/network-range/list/list_test.go‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ import (
1616
"github.com/stackitcloud/stackit-sdk-go/services/iaas"
1717
)
1818

19+
const (
20+
testRegion = "eu01"
21+
)
22+
1923
type testCtxKey struct{}
2024

2125
var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
@@ -25,6 +29,8 @@ var testNetworkAreaId = uuid.NewString()
2529

2630
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
2731
flagValues := map[string]string{
32+
globalflags.RegionFlag: testRegion,
33+
2834
organizationIdFlag: testOrganizationId,
2935
networkAreaIdFlag: testNetworkAreaId,
3036
limitFlag: "10",
@@ -38,6 +44,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st
3844
func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
3945
model := &inputModel{
4046
GlobalFlagModel: &globalflags.GlobalFlagModel{
47+
Region: testRegion,
4148
Verbosity: globalflags.VerbosityDefault,
4249
},
4350
OrganizationId: &testOrganizationId,
@@ -51,7 +58,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5158
}
5259

5360
func fixtureRequest(mods ...func(request *iaas.ApiListNetworkAreaRangesRequest)) iaas.ApiListNetworkAreaRangesRequest {
54-
request := testClient.ListNetworkAreaRanges(testCtx, testOrganizationId, testNetworkAreaId)
61+
request := testClient.ListNetworkAreaRanges(testCtx, testOrganizationId, testNetworkAreaId, testRegion)
5562
for _, mod := range mods {
5663
mod(&request)
5764
}

0 commit comments

Comments
 (0)