From ca9d4f3ebf132ccf781a2023851a96efb273577b Mon Sep 17 00:00:00 2001
From: Scaleway Bot <github@scaleway.com>
Date: Wed, 7 Jul 2021 13:51:39 +0200
Subject: [PATCH] feat(baremetal): add fr-par-1 and nl-ams-1 (#1949)

---
 ...t-all-usage-baremetal-bmc-get-usage.golden |  2 +-
 ...all-usage-baremetal-bmc-start-usage.golden |  2 +-
 ...-all-usage-baremetal-bmc-stop-usage.golden |  2 +-
 ...st-all-usage-baremetal-os-get-usage.golden |  2 +-
 ...t-all-usage-baremetal-os-list-usage.golden |  2 +-
 ...usage-baremetal-server-create-usage.golden |  2 +-
 ...usage-baremetal-server-delete-usage.golden |  2 +-
 ...ll-usage-baremetal-server-get-usage.golden |  2 +-
 ...sage-baremetal-server-install-usage.golden |  2 +-
 ...l-usage-baremetal-server-list-usage.golden |  2 +-
 ...usage-baremetal-server-reboot-usage.golden |  2 +-
 ...-usage-baremetal-server-start-usage.golden |  2 +-
 ...l-usage-baremetal-server-stop-usage.golden |  2 +-
 ...usage-baremetal-server-update-usage.golden |  2 +-
 docs/commands/baremetal.md                    | 28 +++++++++----------
 .../namespaces/baremetal/v1/baremetal_cli.go  | 28 +++++++++----------
 16 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/cmd/scw/testdata/test-all-usage-baremetal-bmc-get-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-bmc-get-usage.golden
index 48b77d4bf2..5de14e8cc1 100644
--- a/cmd/scw/testdata/test-all-usage-baremetal-bmc-get-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-baremetal-bmc-get-usage.golden
@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   server-id         ID of the server
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1)
 
 FLAGS:
   -h, --help   help for get
diff --git a/cmd/scw/testdata/test-all-usage-baremetal-bmc-start-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-bmc-start-usage.golden
index 210a979f5f..1c4c6fc621 100644
--- a/cmd/scw/testdata/test-all-usage-baremetal-bmc-start-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-baremetal-bmc-start-usage.golden
@@ -9,7 +9,7 @@ USAGE:
 ARGS:
   server-id         ID of the server
   ip                The IP authorized to connect to the given server
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1)
 
 FLAGS:
   -h, --help   help for start
diff --git a/cmd/scw/testdata/test-all-usage-baremetal-bmc-stop-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-bmc-stop-usage.golden
index ee06d48c7d..5b80504107 100644
--- a/cmd/scw/testdata/test-all-usage-baremetal-bmc-stop-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-baremetal-bmc-stop-usage.golden
@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   server-id         ID of the server
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1)
 
 FLAGS:
   -h, --help   help for stop
diff --git a/cmd/scw/testdata/test-all-usage-baremetal-os-get-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-os-get-usage.golden
index 2382b91c52..18e165d64d 100644
--- a/cmd/scw/testdata/test-all-usage-baremetal-os-get-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-baremetal-os-get-usage.golden
@@ -11,7 +11,7 @@ EXAMPLES:
 
 ARGS:
   os-id             ID of the OS
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1)
 
 FLAGS:
   -h, --help   help for get
diff --git a/cmd/scw/testdata/test-all-usage-baremetal-os-list-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-os-list-usage.golden
index d9438311d8..d22657dc0d 100644
--- a/cmd/scw/testdata/test-all-usage-baremetal-os-list-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-baremetal-os-list-usage.golden
@@ -7,7 +7,7 @@ USAGE:
 
 ARGS:
   [offer-id]        Filter OS by offer ID
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1)
 
 FLAGS:
   -h, --help   help for list
diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-create-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-server-create-usage.golden
index 253104ca4e..0549dbda0c 100644
--- a/cmd/scw/testdata/test-all-usage-baremetal-server-create-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-baremetal-server-create-usage.golden
@@ -22,7 +22,7 @@ ARGS:
   [install.hostname]              
   [install.ssh-key-ids.{index}]   
   [organization-id]               Organization ID to use. If none is passed the default organization ID will be used
-  [zone=fr-par-1]                 Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [zone=fr-par-1]                 Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1)
 
 FLAGS:
   -h, --help   help for create
diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-delete-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-server-delete-usage.golden
index 68541d5e12..7976875f94 100644
--- a/cmd/scw/testdata/test-all-usage-baremetal-server-delete-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-baremetal-server-delete-usage.golden
@@ -11,7 +11,7 @@ EXAMPLES:
 
 ARGS:
   server-id         ID of the server to delete
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1)
 
 FLAGS:
   -h, --help   help for delete
diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-get-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-server-get-usage.golden
index 720644eb14..e13f2e8b57 100644
--- a/cmd/scw/testdata/test-all-usage-baremetal-server-get-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-baremetal-server-get-usage.golden
@@ -11,7 +11,7 @@ EXAMPLES:
 
 ARGS:
   server-id         ID of the server
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1)
 
 FLAGS:
   -h, --help   help for get
diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-install-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-server-install-usage.golden
index 3c73666328..2dd75459d5 100644
--- a/cmd/scw/testdata/test-all-usage-baremetal-server-install-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-baremetal-server-install-usage.golden
@@ -15,7 +15,7 @@ ARGS:
   hostname              Hostname of the server
   [all-ssh-keys]        Add all SSH keys on your baremetal instance (cannot be used with ssh-key-ids)
   ssh-key-ids.{index}   SSH key IDs authorized on the server (cannot be used with all-ssh-keys)
-  [zone=fr-par-1]       Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [zone=fr-par-1]       Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1)
 
 FLAGS:
   -h, --help   help for install
diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-list-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-server-list-usage.golden
index 9e1d1b07c6..be3d68c113 100644
--- a/cmd/scw/testdata/test-all-usage-baremetal-server-list-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-baremetal-server-list-usage.golden
@@ -16,7 +16,7 @@ ARGS:
   [name]              Filter servers by name
   [project-id]        Filter servers by project ID
   [organization-id]   Filter servers by organization ID
-  [zone=fr-par-1]     Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [zone=fr-par-1]     Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1)
 
 FLAGS:
   -h, --help   help for list
diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-reboot-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-server-reboot-usage.golden
index 5e91b6964d..b1db450bf9 100644
--- a/cmd/scw/testdata/test-all-usage-baremetal-server-reboot-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-baremetal-server-reboot-usage.golden
@@ -15,7 +15,7 @@ EXAMPLES:
 ARGS:
   server-id            ID of the server to reboot
   [boot-type=normal]   The type of boot (unknown_boot_type | normal | rescue)
-  [zone=fr-par-1]      Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [zone=fr-par-1]      Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1)
 
 FLAGS:
   -h, --help   help for reboot
diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-start-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-server-start-usage.golden
index 339829b47a..97d8ffff3b 100644
--- a/cmd/scw/testdata/test-all-usage-baremetal-server-start-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-baremetal-server-start-usage.golden
@@ -15,7 +15,7 @@ EXAMPLES:
 ARGS:
   server-id         ID of the server to start
   [boot-type]       The type of boot (unknown_boot_type | normal | rescue)
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1)
 
 FLAGS:
   -h, --help   help for start
diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-stop-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-server-stop-usage.golden
index e7509d5926..14d105d1e3 100644
--- a/cmd/scw/testdata/test-all-usage-baremetal-server-stop-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-baremetal-server-stop-usage.golden
@@ -11,7 +11,7 @@ EXAMPLES:
 
 ARGS:
   server-id         ID of the server to stop
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1)
 
 FLAGS:
   -h, --help   help for stop
diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-update-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-server-update-usage.golden
index 44fe965ab3..67575dd5ff 100644
--- a/cmd/scw/testdata/test-all-usage-baremetal-server-update-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-baremetal-server-update-usage.golden
@@ -10,7 +10,7 @@ ARGS:
   [name]            Name of the server (≠hostname), not updated if null
   [description]     Description associated to the server, max 255 characters, not updated if null
   [tags.{index}]    Tags associated to the server, not updated if null
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-2)
+  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1)
 
 FLAGS:
   -h, --help   help for update
diff --git a/docs/commands/baremetal.md b/docs/commands/baremetal.md
index c77abde3af..d6611347d0 100644
--- a/docs/commands/baremetal.md
+++ b/docs/commands/baremetal.md
@@ -45,7 +45,7 @@ scw baremetal bmc get [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | server-id | Required | ID of the server |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -68,7 +68,7 @@ scw baremetal bmc start [arg=value ...]
 |------|---|-------------|
 | server-id | Required | ID of the server |
 | ip | Required | The IP authorized to connect to the given server |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -88,7 +88,7 @@ scw baremetal bmc stop [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | server-id | Required | ID of the server |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -113,7 +113,7 @@ scw baremetal os get <os-id ...> [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | os-id | Required | ID of the OS |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1` | Zone to target. If none is passed will use default zone from the config |
 
 
 **Examples:**
@@ -143,7 +143,7 @@ scw baremetal os list [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | offer-id |  | Filter OS by offer ID |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1` | Zone to target. If none is passed will use default zone from the config |
 
 
 
@@ -176,7 +176,7 @@ scw baremetal server create [arg=value ...]
 | install.hostname |  |  |
 | install.ssh-key-ids.{index} |  |  |
 | organization-id |  | Organization ID to use. If none is passed the default organization ID will be used |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1` | Zone to target. If none is passed will use default zone from the config |
 
 
 **Examples:**
@@ -211,7 +211,7 @@ scw baremetal server delete <server-id ...> [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | server-id | Required | ID of the server to delete |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1` | Zone to target. If none is passed will use default zone from the config |
 
 
 **Examples:**
@@ -241,7 +241,7 @@ scw baremetal server get <server-id ...> [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | server-id | Required | ID of the server |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1` | Zone to target. If none is passed will use default zone from the config |
 
 
 **Examples:**
@@ -275,7 +275,7 @@ scw baremetal server install <server-id ...> [arg=value ...]
 | hostname | Required | Hostname of the server |
 | all-ssh-keys |  | Add all SSH keys on your baremetal instance (cannot be used with ssh-key-ids) |
 | ssh-key-ids.{index} | Required | SSH key IDs authorized on the server (cannot be used with all-ssh-keys) |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1` | Zone to target. If none is passed will use default zone from the config |
 
 
 **Examples:**
@@ -310,7 +310,7 @@ scw baremetal server list [arg=value ...]
 | name |  | Filter servers by name |
 | project-id |  | Filter servers by project ID |
 | organization-id |  | Filter servers by organization ID |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1` | Zone to target. If none is passed will use default zone from the config |
 
 
 **Examples:**
@@ -341,7 +341,7 @@ scw baremetal server reboot <server-id ...> [arg=value ...]
 |------|---|-------------|
 | server-id | Required | ID of the server to reboot |
 | boot-type | Default: `normal`<br />One of: `unknown_boot_type`, `normal`, `rescue` | The type of boot |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1` | Zone to target. If none is passed will use default zone from the config |
 
 
 **Examples:**
@@ -377,7 +377,7 @@ scw baremetal server start <server-id ...> [arg=value ...]
 |------|---|-------------|
 | server-id | Required | ID of the server to start |
 | boot-type | One of: `unknown_boot_type`, `normal`, `rescue` | The type of boot |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1` | Zone to target. If none is passed will use default zone from the config |
 
 
 **Examples:**
@@ -412,7 +412,7 @@ scw baremetal server stop <server-id ...> [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | server-id | Required | ID of the server to stop |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1` | Zone to target. If none is passed will use default zone from the config |
 
 
 **Examples:**
@@ -445,7 +445,7 @@ scw baremetal server update <server-id ...> [arg=value ...]
 | name |  | Name of the server (≠hostname), not updated if null |
 | description |  | Description associated to the server, max 255 characters, not updated if null |
 | tags.{index} |  | Tags associated to the server, not updated if null |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2` | Zone to target. If none is passed will use default zone from the config |
+| zone | Default: `fr-par-1`<br />One of: `fr-par-1`, `fr-par-2`, `nl-ams-1` | Zone to target. If none is passed will use default zone from the config |
 
 
 
diff --git a/internal/namespaces/baremetal/v1/baremetal_cli.go b/internal/namespaces/baremetal/v1/baremetal_cli.go
index bb9451b4b5..76678878b4 100644
--- a/internal/namespaces/baremetal/v1/baremetal_cli.go
+++ b/internal/namespaces/baremetal/v1/baremetal_cli.go
@@ -129,7 +129,7 @@ func baremetalServerList() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*baremetal.ListServersRequest)
@@ -169,7 +169,7 @@ func baremetalServerGet() *core.Command {
 				Deprecated: false,
 				Positional: true,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*baremetal.GetServerRequest)
@@ -246,7 +246,7 @@ func baremetalServerCreate() *core.Command {
 				Positional: false,
 			},
 			core.OrganizationIDArgSpec(),
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*baremetal.CreateServerRequest)
@@ -303,7 +303,7 @@ func baremetalServerUpdate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*baremetal.UpdateServerRequest)
@@ -354,7 +354,7 @@ func baremetalServerInstall() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*baremetal.InstallServerRequest)
@@ -404,7 +404,7 @@ func baremetalServerDelete() *core.Command {
 				Deprecated: false,
 				Positional: true,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*baremetal.DeleteServerRequest)
@@ -448,7 +448,7 @@ func baremetalServerReboot() *core.Command {
 				Positional: false,
 				EnumValues: []string{"unknown_boot_type", "normal", "rescue"},
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*baremetal.RebootServerRequest)
@@ -496,7 +496,7 @@ func baremetalServerStart() *core.Command {
 				Positional: false,
 				EnumValues: []string{"unknown_boot_type", "normal", "rescue"},
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*baremetal.StartServerRequest)
@@ -536,7 +536,7 @@ func baremetalServerStop() *core.Command {
 				Deprecated: false,
 				Positional: true,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*baremetal.StopServerRequest)
@@ -581,7 +581,7 @@ The BMC (Baseboard Management Controller) access is available one hour after the
 				Deprecated: false,
 				Positional: false,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*baremetal.StartBMCAccessRequest)
@@ -611,7 +611,7 @@ func baremetalBmcGet() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*baremetal.GetBMCAccessRequest)
@@ -641,7 +641,7 @@ func baremetalBmcStop() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*baremetal.StopBMCAccessRequest)
@@ -677,7 +677,7 @@ func baremetalOsList() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*baremetal.ListOSRequest)
@@ -711,7 +711,7 @@ func baremetalOsGet() *core.Command {
 				Deprecated: false,
 				Positional: true,
 			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
+			core.ZoneArgSpec(scw.ZoneFrPar1, scw.ZoneFrPar2, scw.ZoneNlAms1),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
 			request := args.(*baremetal.GetOSRequest)