Merge branch 'support-projects' of https://github.com/shapeblue/cloudstack-csi-driver into add-volume-snapshot-support

Author: Pearl1594

pkg/cloud/cloud.go

@@ -75,11 +75,12 @@ var (
 // client is the implementation of Interface.
 type client struct {
 	*cloudstack.CloudStackClient
+	projectID string
 }
 
 // New creates a new cloud connector, given its configuration.
 func New(config *Config) Interface {
 	csClient := cloudstack.NewAsyncClient(config.APIURL, config.APIKey, config.SecretKey, config.VerifySSL)
 
-	return &client{csClient}
+	return &client{csClient, config.ProjectID}
 }

pkg/cloud/config.go

@@ -12,6 +12,7 @@ type Config struct {
 	APIKey    string
 	SecretKey string
 	VerifySSL bool
+	ProjectID string
 }
 
 // csConfig wraps the config for the CloudStack cloud provider.
@@ -40,6 +41,7 @@ func ReadConfig(configFilePath string) (*Config, error) {
 	return &Config{
 		APIURL:    cfg.Global.APIURL,
 		APIKey:    cfg.Global.APIKey,
+		ProjectID: cfg.Global.ProjectID,
 		SecretKey: cfg.Global.SecretKey,
 		VerifySSL: !cfg.Global.SSLNoVerify,
 	}, nil

pkg/cloud/vms.go

@@ -10,8 +10,12 @@ func (c *client) GetVMByID(ctx context.Context, vmID string) (*VM, error) {
 	logger := klog.FromContext(ctx)
 	p := c.VirtualMachine.NewListVirtualMachinesParams()
 	p.SetId(vmID)
+	if c.projectID != "" {
+		p.SetProjectid(c.projectID)
+	}
 	logger.V(2).Info("CloudStack API call", "command", "ListVirtualMachines", "params", map[string]string{
-		"id": vmID,
+		"id":        vmID,
+		"projectID": c.projectID,
 	})
 	l, err := c.VirtualMachine.ListVirtualMachines(p)
 	if err != nil {
@@ -24,7 +28,7 @@ func (c *client) GetVMByID(ctx context.Context, vmID string) (*VM, error) {
 		return nil, ErrTooManyResults
 	}
 	vm := l.VirtualMachines[0]
-
+	logger.V(2).Info("Returning VM", "vmID", vm.Id, "zoneID", vm.Zoneid)
 	return &VM{
 		ID:     vm.Id,
 		ZoneID: vm.Zoneid,

pkg/cloud/volumes.go

@@ -43,8 +43,12 @@ func (c *client) GetVolumeByID(ctx context.Context, volumeID string) (*Volume, e
 	logger := klog.FromContext(ctx)
 	p := c.Volume.NewListVolumesParams()
 	p.SetId(volumeID)
+	if c.projectID != "" {
+		p.SetProjectid(c.projectID)
+	}
 	logger.V(2).Info("CloudStack API call", "command", "ListVolumes", "params", map[string]string{
-		"id": volumeID,
+		"id":        volumeID,
+		"projectid": c.projectID,
 	})
 
 	return c.listVolumes(p)
@@ -68,11 +72,15 @@ func (c *client) CreateVolume(ctx context.Context, diskOfferingID, zoneID, name
 	p.SetZoneid(zoneID)
 	p.SetName(name)
 	p.SetSize(sizeInGB)
+	if c.projectID != "" {
+		p.SetProjectid(c.projectID)
+	}
 	logger.V(2).Info("CloudStack API call", "command", "CreateVolume", "params", map[string]string{
 		"diskofferingid": diskOfferingID,
 		"zoneid":         zoneID,
 		"name":           name,
 		"size":           strconv.FormatInt(sizeInGB, 10),
+		"projectid":      c.projectID,
 	})
 	vol, err := c.Volume.CreateVolume(p)
 	if err != nil {