api: switch to VC1S

Author: Quentin Perez

pkg/api/api.go

@@ -511,7 +511,7 @@ type ScalewayServer struct {
 	// Organization is the owner of the server
 	Organization string `json:"organization,omitempty"`
 
-	// CommercialType is the commercial type of the server (i.e: C1, C2[SML], VC1)
+	// CommercialType is the commercial type of the server (i.e: C1, C2[SML], VC1S)
 	CommercialType string `json:"commercial_type,omitempty"`
 
 	// Location of the server
@@ -568,7 +568,7 @@ type ScalewayServerDefinition struct {
 	// Organization is the owner of the server
 	Organization string `json:"organization"`
 
-	// CommercialType is the commercial type of the server (i.e: C1, C2[SML], VC1)
+	// CommercialType is the commercial type of the server (i.e: C1, C2[SML], VC1S)
 	CommercialType string `json:"commercial_type"`
 
 	PublicIP string `json:"public_ip,omitempty"`

pkg/cli/cmd_create.go

@@ -31,7 +31,7 @@ func init() {
 	cmdCreate.Flag.StringVar(&createEnv, []string{"e", "-env"}, "", "Provide metadata tags passed to initrd (i.e., boot=resue INITRD_DEBUG=1)")
 	cmdCreate.Flag.StringVar(&createVolume, []string{"v", "-volume"}, "", "Attach additional volume (i.e., 50G)")
 	cmdCreate.Flag.StringVar(&createIPAddress, []string{"-ip-address"}, "dynamic", "Assign a reserved public IP, a 'dynamic' one or 'none'")
-	cmdCreate.Flag.StringVar(&createCommercialType, []string{"-commercial-type"}, "VC1", "Create a server with specific commercial-type C1, VC1, C2[S|M|L]")
+	cmdCreate.Flag.StringVar(&createCommercialType, []string{"-commercial-type"}, "VC1S", "Create a server with specific commercial-type C1, VC1S, C2[S|M|L]")
 	cmdCreate.Flag.BoolVar(&createHelp, []string{"h", "-help"}, false, "Print usage")
 	cmdCreate.Flag.BoolVar(&createTmpSSHKey, []string{"-tmp-ssh-key"}, false, "Access your server without uploading your SSH key to your account")
 }

pkg/cli/cmd_run.go

@@ -45,7 +45,7 @@ func init() {
 	cmdRun.Flag.BoolVar(&runDetachFlag, []string{"d", "-detach"}, false, "Run server in background and print server ID")
 	cmdRun.Flag.StringVar(&runGateway, []string{"g", "-gateway"}, "", "Use a SSH gateway")
 	cmdRun.Flag.StringVar(&runUserdatas, []string{"u", "-userdata"}, "", "Start a server with userdata predefined")
-	cmdRun.Flag.StringVar(&runCommercialType, []string{"-commercial-type"}, "VC1", "Start a server with specific commercial-type C1, VC1, C2[SML]")
+	cmdRun.Flag.StringVar(&runCommercialType, []string{"-commercial-type"}, "VC1S", "Start a server with specific commercial-type C1, VC1S, C2[SML]")
 	cmdRun.Flag.BoolVar(&runAutoRemove, []string{"-rm"}, false, "Automatically remove the server when it exits")
 	cmdRun.Flag.BoolVar(&runTmpSSHKey, []string{"-tmp-ssh-key"}, false, "Access your server without uploading your SSH key to your account")
 	cmdRun.Flag.BoolVar(&runShowBoot, []string{"-show-boot"}, false, "Allows to show the boot")

pkg/commands/create_test.go

@@ -63,7 +63,7 @@ func TestRunCreate_realAPI(t *testing.T) {
 			args := CreateArgs{
 				Name:           "unittest-create-standard",
 				Image:          "ubuntu-wily",
-				CommercialType: "VC1",
+				CommercialType: "VC1S",
 			}
 
 			scopedCtx, scopedStdout, scopedStderr := getScopedCtx(ctx)

pkg/commands/run_test.go

@@ -8,7 +8,7 @@ func ExampleRun() {
 	ctx := testCommandContext()
 	args := RunArgs{
 		Image:          "ubuntu-trusty",
-		CommercialType: "VC1",
+		CommercialType: "VC1S",
 	}
 	Run(ctx, args)
 }
@@ -23,7 +23,7 @@ func ExampleRun_complex() {
 		Gateway:        "my-gateway",
 		Image:          "ubuntu-trusty",
 		Name:           "my-test-server",
-		CommercialType: "VC1",
+		CommercialType: "VC1S",
 		Tags:           []string{"testing", "fake"},
 		Volumes:        []string{"50G", "1G"},
 	}