Merge branch 'master' into v1.6565.0

Author: Laure-di

cmd/scw/testdata/test-all-usage-baremetal-usage.golden

@@ -11,7 +11,6 @@ AVAILABLE COMMANDS:
   options              Server options management commands
   os                   Operating System (OS) management commands
   partitioning-schemas Partitioning-schemas management commands
-  private-network      Private Network management command
   server               Server management commands
   settings             Settings management commands
 

docs/commands/baremetal.md

@@ -18,11 +18,6 @@ Elastic Metal API.
   - [Get OS with an ID](#get-os-with-an-id)
   - [List available OSes](#list-available-oses)
 - [Partitioning-schemas management commands](#partitioning-schemas-management-commands)
-- [Private Network management command](#private-network-management-command)
-  - [Add a server to a Private Network](#add-a-server-to-a-private-network)
-  - [Delete a Private Network](#delete-a-private-network)
-  - [List the Private Networks of a server](#list-the-private-networks-of-a-server)
-  - [Set multiple Private Networks on a server](#set-multiple-private-networks-on-a-server)
 - [Server management commands](#server-management-commands)
   - [Attach a new flexible IP to a server](#attach-a-new-flexible-ip-to-a-server)
   - [Create an Elastic Metal server](#create-an-elastic-metal-server)
@@ -391,105 +386,6 @@ scw baremetal partitioning-schemas
 
 
 
-## Private Network management command
-
-A Private Network allows you to interconnect your resources
-(servers, instances, ...) in an isolated and private
-network. The network reachability is limited to the
-resources that are on the same Private Network .  A VLAN
-interface is available on the server and can be freely
-managed (adding IP addresses, shutdown interface...).
-
-Note that a resource can be a part of multiple Private Networks.
-
-
-### Add a server to a Private Network
-
-Add a server to a Private Network.
-
-**Usage:**
-
-```
-scw baremetal private-network add [arg=value ...]
-```
-
-
-**Args:**
-
-| Name |   | Description |
-|------|---|-------------|
-| server-id | Required | The ID of the server |
-| private-network-id | Required | The ID of the Private Network |
-| 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 |
-
-
-
-### Delete a Private Network
-
-Delete a Private Network.
-
-**Usage:**
-
-```
-scw baremetal private-network delete [arg=value ...]
-```
-
-
-**Args:**
-
-| Name |   | Description |
-|------|---|-------------|
-| server-id | Required | The ID of the server |
-| private-network-id | Required | The ID of the Private Network |
-| 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 |
-
-
-
-### List the Private Networks of a server
-
-List the Private Networks of a server.
-
-**Usage:**
-
-```
-scw baremetal private-network list [arg=value ...]
-```
-
-
-**Args:**
-
-| Name |   | Description |
-|------|---|-------------|
-| order-by | One of: `created_at_asc`, `created_at_desc`, `updated_at_asc`, `updated_at_desc` | The sort order for the returned Private Networks |
-| server-id |  | Filter Private Networks by server ID |
-| private-network-id |  | Filter Private Networks by Private Network ID |
-| project-id |  | Filter Private Networks by Project ID |
-| organization-id |  | Filter Private Networks by Organization ID |
-| zone | Default: `fr-par-1`<br />One of: `fr-par-2`, `all` | Zone to target. If none is passed will use default zone from the config |
-
-
-
-### Set multiple Private Networks on a server
-
-Set multiple Private Networks on a server.
-
-**Usage:**
-
-```
-scw baremetal private-network set [arg=value ...]
-```
-
-
-**Args:**
-
-| Name |   | Description |
-|------|---|-------------|
-| server-id | Required | The ID of the server |
-| private-network-ids.{index} | Required | The IDs of the Private Networks |
-| 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 |
-
-
-
 ## Server management commands
 
 A server is a denomination of a type of instances provided by Scaleway.

internal/namespaces/baremetal/v1/baremetal_cli.go

@@ -27,7 +27,6 @@ func GetGeneratedCommands() *core.Commands {
 		baremetalOptions(),
 		baremetalSettings(),
 		baremetalPartitioningSchemas(),
-		baremetalPrivateNetwork(),
 		baremetalServerList(),
 		baremetalServerGet(),
 		baremetalServerCreate(),
@@ -53,10 +52,6 @@ func GetGeneratedCommands() *core.Commands {
 		baremetalSettingsUpdate(),
 		baremetalOsList(),
 		baremetalOsGet(),
-		baremetalPrivateNetworkAdd(),
-		baremetalPrivateNetworkSet(),
-		baremetalPrivateNetworkList(),
-		baremetalPrivateNetworkDelete(),
 	)
 }
 
@@ -136,22 +131,6 @@ func baremetalPartitioningSchemas() *core.Command {
 	}
 }
 
-func baremetalPrivateNetwork() *core.Command {
-	return &core.Command{
-		Short: `Private Network management command`,
-		Long: `A Private Network allows you to interconnect your resources
-(servers, instances, ...) in an isolated and private
-network. The network reachability is limited to the
-resources that are on the same Private Network .  A VLAN
-interface is available on the server and can be freely
-managed (adding IP addresses, shutdown interface...).
-
-Note that a resource can be a part of multiple Private Networks.`,
-		Namespace: "baremetal",
-		Resource:  "private-network",
-	}
-}
-
 func baremetalServerList() *core.Command {
 	return &core.Command{
 		Short:     `List Elastic Metal servers for an Organization`,
@@ -1837,197 +1816,3 @@ func baremetalOsGet() *core.Command {
 		},
 	}
 }
-
-func baremetalPrivateNetworkAdd() *core.Command {
-	return &core.Command{
-		Short:     `Add a server to a Private Network`,
-		Long:      `Add a server to a Private Network.`,
-		Namespace: "baremetal",
-		Resource:  "private-network",
-		Verb:      "add",
-		// Deprecated:    false,
-		ArgsType: reflect.TypeOf(baremetal.PrivateNetworkAPIAddServerPrivateNetworkRequest{}),
-		ArgSpecs: core.ArgSpecs{
-			{
-				Name:       "server-id",
-				Short:      `The ID of the server`,
-				Required:   true,
-				Deprecated: false,
-				Positional: false,
-			},
-			{
-				Name:       "private-network-id",
-				Short:      `The ID of the Private Network`,
-				Required:   true,
-				Deprecated: false,
-				Positional: false,
-			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
-		},
-		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
-			request := args.(*baremetal.PrivateNetworkAPIAddServerPrivateNetworkRequest)
-
-			client := core.ExtractClient(ctx)
-			api := baremetal.NewPrivateNetworkAPI(client)
-
-			return api.AddServerPrivateNetwork(request)
-		},
-	}
-}
-
-func baremetalPrivateNetworkSet() *core.Command {
-	return &core.Command{
-		Short:     `Set multiple Private Networks on a server`,
-		Long:      `Set multiple Private Networks on a server.`,
-		Namespace: "baremetal",
-		Resource:  "private-network",
-		Verb:      "set",
-		// Deprecated:    false,
-		ArgsType: reflect.TypeOf(baremetal.PrivateNetworkAPISetServerPrivateNetworksRequest{}),
-		ArgSpecs: core.ArgSpecs{
-			{
-				Name:       "server-id",
-				Short:      `The ID of the server`,
-				Required:   true,
-				Deprecated: false,
-				Positional: false,
-			},
-			{
-				Name:       "private-network-ids.{index}",
-				Short:      `The IDs of the Private Networks`,
-				Required:   true,
-				Deprecated: false,
-				Positional: false,
-			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
-		},
-		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
-			request := args.(*baremetal.PrivateNetworkAPISetServerPrivateNetworksRequest)
-
-			client := core.ExtractClient(ctx)
-			api := baremetal.NewPrivateNetworkAPI(client)
-
-			return api.SetServerPrivateNetworks(request)
-		},
-	}
-}
-
-func baremetalPrivateNetworkList() *core.Command {
-	return &core.Command{
-		Short:     `List the Private Networks of a server`,
-		Long:      `List the Private Networks of a server.`,
-		Namespace: "baremetal",
-		Resource:  "private-network",
-		Verb:      "list",
-		// Deprecated:    false,
-		ArgsType: reflect.TypeOf(baremetal.PrivateNetworkAPIListServerPrivateNetworksRequest{}),
-		ArgSpecs: core.ArgSpecs{
-			{
-				Name:       "order-by",
-				Short:      `The sort order for the returned Private Networks`,
-				Required:   false,
-				Deprecated: false,
-				Positional: false,
-				EnumValues: []string{
-					"created_at_asc",
-					"created_at_desc",
-					"updated_at_asc",
-					"updated_at_desc",
-				},
-			},
-			{
-				Name:       "server-id",
-				Short:      `Filter Private Networks by server ID`,
-				Required:   false,
-				Deprecated: false,
-				Positional: false,
-			},
-			{
-				Name:       "private-network-id",
-				Short:      `Filter Private Networks by Private Network ID`,
-				Required:   false,
-				Deprecated: false,
-				Positional: false,
-			},
-			{
-				Name:       "project-id",
-				Short:      `Filter Private Networks by Project ID`,
-				Required:   false,
-				Deprecated: false,
-				Positional: false,
-			},
-			{
-				Name:       "organization-id",
-				Short:      `Filter Private Networks by Organization ID`,
-				Required:   false,
-				Deprecated: false,
-				Positional: false,
-			},
-			core.ZoneArgSpec(
-				scw.ZoneFrPar2,
-				scw.Zone(core.AllLocalities),
-			),
-		},
-		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
-			request := args.(*baremetal.PrivateNetworkAPIListServerPrivateNetworksRequest)
-
-			client := core.ExtractClient(ctx)
-			api := baremetal.NewPrivateNetworkAPI(client)
-			opts := []scw.RequestOption{scw.WithAllPages()}
-			if request.Zone == scw.Zone(core.AllLocalities) {
-				opts = append(opts, scw.WithZones(api.Zones()...))
-				request.Zone = ""
-			}
-			resp, err := api.ListServerPrivateNetworks(request, opts...)
-			if err != nil {
-				return nil, err
-			}
-
-			return resp.ServerPrivateNetworks, nil
-		},
-	}
-}
-
-func baremetalPrivateNetworkDelete() *core.Command {
-	return &core.Command{
-		Short:     `Delete a Private Network`,
-		Long:      `Delete a Private Network.`,
-		Namespace: "baremetal",
-		Resource:  "private-network",
-		Verb:      "delete",
-		// Deprecated:    false,
-		ArgsType: reflect.TypeOf(baremetal.PrivateNetworkAPIDeleteServerPrivateNetworkRequest{}),
-		ArgSpecs: core.ArgSpecs{
-			{
-				Name:       "server-id",
-				Short:      `The ID of the server`,
-				Required:   true,
-				Deprecated: false,
-				Positional: false,
-			},
-			{
-				Name:       "private-network-id",
-				Short:      `The ID of the Private Network`,
-				Required:   true,
-				Deprecated: false,
-				Positional: false,
-			},
-			core.ZoneArgSpec(scw.ZoneFrPar2),
-		},
-		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
-			request := args.(*baremetal.PrivateNetworkAPIDeleteServerPrivateNetworkRequest)
-
-			client := core.ExtractClient(ctx)
-			api := baremetal.NewPrivateNetworkAPI(client)
-			e = api.DeleteServerPrivateNetwork(request)
-			if e != nil {
-				return nil, e
-			}
-
-			return &core.SuccessResult{
-				Resource: "private-network",
-				Verb:     "delete",
-			}, nil
-		},
-	}
-}