Fix attaching volume container (#761)

* fixes attaching volume to container, closes #759

* fix test

* add test

Author: DylanVerstraete

pkg/provision/primitives/converter.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net"
+	"strings"
 	"time"
 
 	"github.com/threefoldtech/tfexplorer/models/generated/workloads"
@@ -16,7 +17,7 @@ import (
 )
 
 // ContainerToProvisionType converts TfgridReservationContainer1 to Container
-func ContainerToProvisionType(c workloads.Container) (Container, string, error) {
+func ContainerToProvisionType(c workloads.Container, reservationID string) (Container, string, error) {
 	container := Container{
 		FList:           c.Flist,
 		FlistStorage:    c.HubUrl,
@@ -42,6 +43,9 @@ func ContainerToProvisionType(c workloads.Container) (Container, string, error)
 	}
 
 	for i, mount := range c.Volumes {
+		if strings.HasPrefix(mount.VolumeId, "-") {
+			mount.VolumeId = reservationID + mount.VolumeId
+		}
 		container.Mounts[i] = Mount{
 			VolumeID:   mount.VolumeId,
 			Mountpoint: mount.Mountpoint,
@@ -218,6 +222,8 @@ func WorkloadToProvisionType(w workloads.ReservationWorkload) (*provision.Reserv
 		ToDelete: w.ToDelete,
 	}
 
+	reservationID := strings.Split(w.WorkloadId, "-")[0]
+
 	var (
 		data interface{}
 		err  error
@@ -240,7 +246,8 @@ func WorkloadToProvisionType(w workloads.ReservationWorkload) (*provision.Reserv
 			return nil, err
 		}
 	case workloads.Container:
-		data, reservation.NodeID, err = ContainerToProvisionType(tmp)
+
+		data, reservation.NodeID, err = ContainerToProvisionType(tmp, reservationID)
 		if err != nil {
 			return nil, err
 		}

pkg/provision/primitives/converter_test.go

@@ -91,7 +91,7 @@ func TestTfgridReservationContainer1_ToProvisionType(t *testing.T) {
 				Interactive: false,
 				Volumes: []workloads.ContainerMount{
 					{
-						VolumeId:   "volume1",
+						VolumeId:   "-volume1",
 						Mountpoint: "/mnt",
 					},
 					{
@@ -115,7 +115,7 @@ func TestTfgridReservationContainer1_ToProvisionType(t *testing.T) {
 				Interactive:  false,
 				Mounts: []Mount{
 					{
-						VolumeID:   "volume1",
+						VolumeID:   "reservation-volume1",
 						Mountpoint: "/mnt",
 					},
 					{
@@ -148,7 +148,7 @@ func TestTfgridReservationContainer1_ToProvisionType(t *testing.T) {
 				NetworkConnection: tt.fields.NetworkConnection,
 				StatsAggregator:   tt.fields.StatsAggregator,
 			}
-			got, _, err := ContainerToProvisionType(c)
+			got, _, err := ContainerToProvisionType(c, "reservation")
 			if !tt.wantErr {
 				require.NoError(t, err)
 				assert.DeepEqual(t, tt.want, got)