Skip to content

Commit ff611a2

Browse files
authored
Merge pull request #836 from rchirakk/netctl1
verify that the tenant name exists before listing config
2 parents 11d17a0 + 3da6624 commit ff611a2

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

Diff for: netctl/netctl.go

+19-2
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ func listPolicies(ctx *cli.Context) {
8484
}
8585

8686
tenant := ctx.String("tenant")
87+
_, err := getClient(ctx).TenantGet(tenant)
88+
errCheck(ctx, err)
8789

8890
policies, err := getClient(ctx).PolicyList()
8991
errCheck(ctx, err)
@@ -192,6 +194,8 @@ func listRules(ctx *cli.Context) {
192194
}
193195

194196
tenant := ctx.String("tenant")
197+
_, err := getClient(ctx).TenantGet(tenant)
198+
errCheck(ctx, err)
195199
policy := ctx.Args()[0]
196200

197201
rules, err := getClient(ctx).RuleList()
@@ -321,6 +325,8 @@ func listNetProfiles(ctx *cli.Context) {
321325
}
322326

323327
tenant := ctx.String("tenant")
328+
_, err := getClient(ctx).TenantGet(tenant)
329+
errCheck(ctx, err)
324330

325331
profileList, err := getClient(ctx).NetprofileList()
326332
errCheck(ctx, err)
@@ -490,6 +496,8 @@ func listNetworks(ctx *cli.Context) {
490496
}
491497

492498
tenant := ctx.String("tenant")
499+
_, err := getClient(ctx).TenantGet(tenant)
500+
errCheck(ctx, err)
493501

494502
netList, err := getClient(ctx).NetworkList()
495503
errCheck(ctx, err)
@@ -692,6 +700,8 @@ func listEndpointGroups(ctx *cli.Context) {
692700
}
693701

694702
tenant := ctx.String("tenant")
703+
_, err := getClient(ctx).TenantGet(tenant)
704+
errCheck(ctx, err)
695705

696706
epgList, err := getClient(ctx).EndpointGroupList()
697707
errCheck(ctx, err)
@@ -1076,6 +1086,8 @@ func listAppProfiles(ctx *cli.Context) {
10761086
}
10771087

10781088
tenant := ctx.String("tenant")
1089+
_, err := getClient(ctx).TenantGet(tenant)
1090+
errCheck(ctx, err)
10791091

10801092
profList, err := getClient(ctx).AppProfileList()
10811093
errCheck(ctx, err)
@@ -1200,6 +1212,9 @@ func listServiceLB(ctx *cli.Context) {
12001212
if len(tenantName) == 0 {
12011213
tenantName = "default"
12021214
}
1215+
_, err := getClient(ctx).TenantGet(tenantName)
1216+
errCheck(ctx, err)
1217+
12031218
svcList, err := getClient(ctx).ServiceLBList()
12041219
errCheck(ctx, err)
12051220

@@ -1246,10 +1261,12 @@ func listExternalContracts(ctx *cli.Context) {
12461261
errExit(ctx, exitHelp, "More arguments than required", true)
12471262
}
12481263

1249-
extContractsGroupsList, err := getClient(ctx).ExtContractsGroupList()
1264+
tenant := ctx.String("tenant")
1265+
_, err := getClient(ctx).TenantGet(tenant)
12501266
errCheck(ctx, err)
12511267

1252-
tenant := ctx.String("tenant")
1268+
extContractsGroupsList, err := getClient(ctx).ExtContractsGroupList()
1269+
errCheck(ctx, err)
12531270

12541271
var filtered []*contivClient.ExtContractsGroup
12551272

0 commit comments

Comments
 (0)