Starting E2E tests

cmd/api/v2/image.go

@@ -33,11 +33,6 @@ func newImageCmd(c *config.Config) *cobra.Command {
 		DescribePrinter: func() printers.Printer { return c.DescribePrinter },
 		ListPrinter:     func() printers.Printer { return c.ListPrinter },
 		OnlyCmds:        genericcli.OnlyCmds(genericcli.DescribeCmd, genericcli.ListCmd),
-		DescribeCmdMutateFn: func(cmd *cobra.Command) {
-			cmd.RunE = func(cmd *cobra.Command, args []string) error {
-				return gcli.DescribeAndPrint("", w.c.DescribePrinter)
-			}
-		},
 		ListCmdMutateFn: func(cmd *cobra.Command) {
 			cmd.Flags().StringP("id", "", "", "image id to filter for")
 			cmd.Flags().StringP("os", "", "", "image os to filter for")

cmd/api/v2/ip.go

@@ -9,6 +9,7 @@ import (
 	"github.com/metal-stack/cli/pkg/helpers"
 	"github.com/metal-stack/metal-lib/pkg/genericcli"
 	"github.com/metal-stack/metal-lib/pkg/genericcli/printers"
+	"github.com/metal-stack/metal-lib/pkg/pointer"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -69,9 +70,9 @@ func newIPCmd(c *config.Config) *cobra.Command {
 		CreateRequestFromCLI: func() (*apiv2.IPServiceCreateRequest, error) {
 			return &apiv2.IPServiceCreateRequest{
 				Project:     c.GetProject(),
-				Name:        new(viper.GetString("name")),
-				Description: new(viper.GetString("description")),
 				Network:     viper.GetString("network"),
+				Name:        pointer.PointerOrNil(viper.GetString("name")),
+				Description: pointer.PointerOrNil(viper.GetString("description")),
 				// Labels:        viper.GetStringSlice("tags"), // FIXME implement
 				Type:          new(ipStaticToType(viper.GetBool("static"))),
 				AddressFamily: addressFamilyToType(viper.GetString("addressfamily")),
@@ -125,6 +126,10 @@ func (c *ip) Create(rq *apiv2.IPServiceCreateRequest) (*apiv2.IP, error) {
 
 	resp, err := c.c.Client.Apiv2().IP().Create(ctx, rq)
 	if err != nil {
+		if helpers.IsAlreadyExists(err) {
+			return nil, genericcli.AlreadyExistsError()
+		}
+
 		return nil, err
 	}
 
@@ -199,12 +204,14 @@ func (c *ip) Update(rq *apiv2.IPServiceUpdateRequest) (*apiv2.IP, error) {
 
 func (c *ip) Convert(r *apiv2.IP) (string, *apiv2.IPServiceCreateRequest, *apiv2.IPServiceUpdateRequest, error) {
 	responseToUpdate, err := c.IpResponseToUpdate(r)
-	return helpers.EncodeProject(r.Uuid, r.Project), IpResponseToCreate(r), responseToUpdate, err
+	return helpers.EncodeProject(r.Ip, r.Project), IpResponseToCreate(r), responseToUpdate, err
 }
 
 func IpResponseToCreate(r *apiv2.IP) *apiv2.IPServiceCreateRequest {
 	return &apiv2.IPServiceCreateRequest{
+		Ip:          &r.Ip,
 		Project:     r.Project,
+		Network:     r.Network,
 		Name:        &r.Name,
 		Description: &r.Description,
 		Labels:      r.Meta.Labels,
@@ -213,7 +220,6 @@ func IpResponseToCreate(r *apiv2.IP) *apiv2.IPServiceCreateRequest {
 }
 
 func (c *ip) IpResponseToUpdate(desired *apiv2.IP) (*apiv2.IPServiceUpdateRequest, error) {
-
 	ctx, cancel := c.c.NewRequestContext()
 	defer cancel()