Skip to content

Commit 5ab0f19

Browse files
marceljkmarceljk
committed
adjust network-area network-range commands
1 parent e8f9500 commit 5ab0f19

File tree

8 files changed

+49
-12
lines changed

8 files changed

+49
-12
lines changed

‎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: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ import (
1616
"github.com/stackitcloud/stackit-sdk-go/services/iaas"
1717
)
1818

19+
const (
20+
regionFlag = globalflags.RegionFlag
21+
22+
testRegion = "eu01"
23+
)
24+
1925
type testCtxKey struct{}
2026

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

2733
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
2834
flagValues := map[string]string{
35+
regionFlag: testRegion,
36+
2937
organizationIdFlag: testOrgId,
3038
networkAreaIdFlag: testNetworkAreaId,
3139
networkRangeFlag: "1.1.1.0/24",
@@ -40,6 +48,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4048
model := &inputModel{
4149
GlobalFlagModel: &globalflags.GlobalFlagModel{
4250
Verbosity: globalflags.VerbosityDefault,
51+
Region: testRegion,
4352
},
4453
OrganizationId: utils.Ptr(testOrgId),
4554
NetworkAreaId: utils.Ptr(testNetworkAreaId),
@@ -52,7 +61,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5261
}
5362

5463
func fixtureRequest(mods ...func(request *iaas.ApiCreateNetworkAreaRangeRequest)) iaas.ApiCreateNetworkAreaRangeRequest {
55-
request := testClient.CreateNetworkAreaRange(testCtx, testOrgId, testNetworkAreaId)
64+
request := testClient.CreateNetworkAreaRange(testCtx, testOrgId, testNetworkAreaId, testRegion)
5665
request = request.CreateNetworkAreaRangePayload(fixturePayload())
5766
for _, mod := range mods {
5867
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: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ import (
1515
"github.com/stackitcloud/stackit-sdk-go/services/iaas"
1616
)
1717

18+
const (
19+
regionFlag = globalflags.RegionFlag
20+
21+
testRegion = "eu01"
22+
)
23+
1824
type testCtxKey struct{}
1925

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

3743
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
3844
flagValues := map[string]string{
45+
regionFlag: testRegion,
46+
3947
organizationIdFlag: testOrgId,
4048
networkAreaIdFlag: testNetworkAreaId,
4149
}
@@ -49,6 +57,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4957
model := &inputModel{
5058
GlobalFlagModel: &globalflags.GlobalFlagModel{
5159
Verbosity: globalflags.VerbosityDefault,
60+
Region: testRegion,
5261
},
5362
OrganizationId: utils.Ptr(testOrgId),
5463
NetworkAreaId: utils.Ptr(testNetworkAreaId),
@@ -61,7 +70,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6170
}
6271

6372
func fixtureRequest(mods ...func(request *iaas.ApiDeleteNetworkAreaRangeRequest)) iaas.ApiDeleteNetworkAreaRangeRequest {
64-
request := testClient.DeleteNetworkAreaRange(testCtx, testOrgId, testNetworkAreaId, testNetworkRangeId)
73+
request := testClient.DeleteNetworkAreaRange(testCtx, testOrgId, testNetworkAreaId, testRegion, testNetworkRangeId)
6574
for _, mod := range mods {
6675
mod(&request)
6776
}

‎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: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ import (
1515
"github.com/stackitcloud/stackit-sdk-go/services/iaas"
1616
)
1717

18+
const (
19+
projectIdFlag = globalflags.ProjectIdFlag
20+
regionFlag = globalflags.RegionFlag
21+
22+
testRegion = "eu01"
23+
)
24+
1825
type testCtxKey struct{}
1926

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

3744
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
3845
flagValues := map[string]string{
46+
regionFlag: testRegion,
47+
3948
organizationIdFlag: testOrgId,
4049
networkAreaIdFlag: testNetworkAreaId,
4150
}
@@ -48,6 +57,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st
4857
func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
4958
model := &inputModel{
5059
GlobalFlagModel: &globalflags.GlobalFlagModel{
60+
Region: testRegion,
5161
Verbosity: globalflags.VerbosityDefault,
5262
},
5363
OrganizationId: utils.Ptr(testOrgId),
@@ -61,7 +71,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
6171
}
6272

6373
func fixtureRequest(mods ...func(request *iaas.ApiGetNetworkAreaRangeRequest)) iaas.ApiGetNetworkAreaRangeRequest {
64-
request := testClient.GetNetworkAreaRange(testCtx, testOrgId, testNetworkAreaId, testNetworkRangeId)
74+
request := testClient.GetNetworkAreaRange(testCtx, testOrgId, testNetworkAreaId, testRegion, testNetworkRangeId)
6575
for _, mod := range mods {
6676
mod(&request)
6777
}

‎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: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ import (
1616
"github.com/stackitcloud/stackit-sdk-go/services/iaas"
1717
)
1818

19+
const (
20+
regionFlag = globalflags.RegionFlag
21+
22+
testRegion = "eu01"
23+
)
24+
1925
type testCtxKey struct{}
2026

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

2632
func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]string {
2733
flagValues := map[string]string{
34+
regionFlag: testRegion,
35+
2836
organizationIdFlag: testOrganizationId,
2937
networkAreaIdFlag: testNetworkAreaId,
3038
limitFlag: "10",
@@ -38,6 +46,7 @@ func fixtureFlagValues(mods ...func(flagValues map[string]string)) map[string]st
3846
func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
3947
model := &inputModel{
4048
GlobalFlagModel: &globalflags.GlobalFlagModel{
49+
Region: testRegion,
4150
Verbosity: globalflags.VerbosityDefault,
4251
},
4352
OrganizationId: &testOrganizationId,
@@ -51,7 +60,7 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
5160
}
5261

5362
func fixtureRequest(mods ...func(request *iaas.ApiListNetworkAreaRangesRequest)) iaas.ApiListNetworkAreaRangesRequest {
54-
request := testClient.ListNetworkAreaRanges(testCtx, testOrganizationId, testNetworkAreaId)
63+
request := testClient.ListNetworkAreaRanges(testCtx, testOrganizationId, testNetworkAreaId, testRegion)
5564
for _, mod := range mods {
5665
mod(&request)
5766
}

0 commit comments

Comments
 (0)