Merge pull request #24 from tasleson/add_slots_api

Add slots API

Author: tasleson

.circleci/config.yml

@@ -8,27 +8,9 @@ jobs:
       - run:
          command: ./test/docker_travis_test.sh
          no_output_timeout: 20m
-  el7:
-    docker:
-      - image: centos:7
-    steps:
-      - checkout
-      - run:
-         command: ./test/docker_travis_test.sh
-         no_output_timeout: 20m
-  el8:
-    docker:
-      - image: oraclelinux:8
-    steps:
-      - checkout
-      - run:
-         command: ./test/docker_travis_test.sh
-         no_output_timeout: 20m
 
 workflows:
   version: 2
   workflow:
     jobs:
     - fedora
-    - el7
-    - el8

client.go

@@ -285,7 +285,7 @@ func (c *ClientConnection) JobStatus(jobID string, returnedResult interface{}) (
 	}
 
 	switch status {
-	case JobStatusInprogress:
+	case JobStatusInProgress:
 		var percent uint8
 		if percentError := json.Unmarshal(result[1], &percent); percentError != nil {
 			return JobStatusError, 0, percentError
@@ -356,13 +356,13 @@ func (c *ClientConnection) getJobOrNone(err error, returned json.RawMessage, syn
 // JobWait waits for the job to finish and retrieves the end result in "returnedResult".
 func (c *ClientConnection) JobWait(jobID string, returnedResult interface{}) error {
 
-	for true {
+	for {
 		var status, _, err = c.JobStatus(jobID, returnedResult)
 		if err != nil {
 			return err
 		}
 
-		if status == JobStatusInprogress {
+		if status == JobStatusInProgress {
 			time.Sleep(time.Millisecond * 250)
 			continue
 		} else if status == JobStatusComplete {

data.go

@@ -12,7 +12,7 @@ type PluginInfo struct {
 // System represents a storage system.
 // * A hardware RAID card
 // * A storage area network (SAN)
-// * A software solutions running on commidity hardware
+// * A software solutions running on commodity hardware
 // * A Linux system running NFS Service
 type System struct {
 	Class        string           `json:"class"`
@@ -94,8 +94,8 @@ type JobStatusType uint32
 
 const (
 
-	// JobStatusInprogress indicated job is in progress
-	JobStatusInprogress JobStatusType = 1 + iota
+	// JobStatusInProgress indicated job is in progress
+	JobStatusInProgress JobStatusType = 1 + iota
 
 	// JobStatusComplete indicates job is complete
 	JobStatusComplete
@@ -211,8 +211,8 @@ const (
 	// PoolUnsupportedVolumeGrow this pool does not allow growing volumes
 	PoolUnsupportedVolumeGrow PoolUnsupportedType = 1 << iota
 
-	// PoolUnsupportedVolumeShink this pool does not allow shrinking volumes
-	PoolUnsupportedVolumeShink
+	// PoolUnsupportedVolumeShrink this pool does not allow shrinking volumes
+	PoolUnsupportedVolumeShrink
 )
 
 // PoolStatusType type used to describe the status of pool
@@ -405,7 +405,7 @@ const (
 	//DiskStatusRemoved Disk was removed by administrator
 	DiskStatusRemoved
 
-	// DiskStatusStarting Disk is in the process of becomming ready.
+	// DiskStatusStarting Disk is in the process of becoming ready.
 	DiskStatusStarting
 
 	// DiskStatusStopping Disk is shutting down.
@@ -414,7 +414,7 @@ const (
 	// DiskStatusStopped Disk is stopped by administrator.
 	DiskStatusStopped
 
-	// DiskStatusInitializing Disk is not yet functional, could be initializing eg. RAID, zeroed or scrubed etc.
+	// DiskStatusInitializing Disk is not yet functional, could be initializing eg. RAID, zeroed or scrubbed etc.
 	DiskStatusInitializing
 
 	// DiskStatusMaintenanceMode In maintenance for bad sector scan, integrity check and etc
@@ -699,10 +699,10 @@ const (
 	// CapAgsGrantedToVol list access groups with access to volume
 	CapAgsGrantedToVol CapabilityType = 44
 
-	// CapHasChildDep indicates support for determing if volume has child dep.
+	// CapHasChildDep indicates support for determining if volume has child dep.
 	CapHasChildDep CapabilityType = 45
 
-	// CapChildDepRm indiates support for removing child dep.
+	// CapChildDepRm indicates support for removing child dep.
 	CapChildDepRm CapabilityType = 46
 
 	// CapAccessGroupCreateIscsiIqn supports ag creating with iSCSI initiator
@@ -985,7 +985,7 @@ const (
 	WriteCachePolicyWriteThrough
 )
 
-// WriteCacheStatus represente write cache status type
+// WriteCacheStatus represents write cache status type
 type WriteCacheStatus uint32
 
 const (
@@ -1028,7 +1028,7 @@ const (
 	ReadCacheStatusDisabled
 )
 
-// PhysicalDiskCache represents pyhsical disk caching type
+// PhysicalDiskCache represents physical disk caching type
 type PhysicalDiskCache uint32
 
 const (
@@ -1045,7 +1045,7 @@ const (
 	PhysicalDiskCacheUseDiskSetting
 )
 
-// VolumeCacheInfo contains informationa about volume caching values
+// VolumeCacheInfo contains information about volume caching values
 type VolumeCacheInfo struct {
 	WriteSetting       WriteCachePolicy
 	WriteStatus        WriteCacheStatus
@@ -1097,3 +1097,45 @@ const (
 	// DiskLedStatusFaultUnknown fault LED is unknown
 	DiskLedStatusFaultUnknown
 )
+
+func append_s(dest string, append string, sep string) string {
+	if len(dest) > 0 {
+		return sep + append
+	}
+	return append
+}
+
+func (s DiskLedStatusBitField) String() string {
+	var rc string
+	var sep = ", "
+
+	if s&DiskLedStatusUnknown == DiskLedStatusUnknown {
+		rc += append_s(rc, "Unknown", sep)
+	}
+
+	if s&DiskLedStatusIdentOn == DiskLedStatusIdentOn {
+		rc += append_s(rc, "Ident On", sep)
+	}
+
+	if s&DiskLedStatusIdentOff == DiskLedStatusIdentOff {
+		rc += append_s(rc, "Ident Off", sep)
+	}
+
+	if s&DiskLedStatusIdentUnknown == DiskLedStatusIdentUnknown {
+		rc += append_s(rc, "Ident Unknown", sep)
+	}
+
+	if s&DiskLedStatusFaultOn == DiskLedStatusFaultOn {
+		rc += append_s(rc, "Fault On", sep)
+	}
+
+	if s&DiskLedStatusFaultOff == DiskLedStatusFaultOff {
+		rc += append_s(rc, "Fault Off", sep)
+	}
+
+	if s&DiskLedStatusFaultUnknown == DiskLedStatusFaultUnknown {
+		rc += append_s(rc, "Fault Unknown", sep)
+	}
+
+	return rc
+}

errors/errors.go

@@ -86,7 +86,7 @@ const (
 	// NotFoundPool ... The specified pool was not found
 	NotFoundPool int32 = 203
 
-	// NotFoundFsSs ... The specfified file system/snap shot was not found
+	// NotFoundFsSs ... The specified file system/snap shot was not found
 	NotFoundFsSS int32 = 204
 
 	// NotFoundVolume ... The specified volume was not found
@@ -95,6 +95,9 @@ const (
 	// NotFoundNfsExport ... The specified NFS export was not found
 	NotFoundNfsExport int32 = 206
 
+	// NotFoundGeneric ...A non-specific resource was not found
+	NotFoundGeneric int32 = 207
+
 	// NotFoundSystem ... The specified system was not found
 	NotFoundSystem int32 = 208
 
@@ -122,8 +125,8 @@ const (
 	// NotEnoughSpace ... Insufficient space to complete the request
 	NotEnoughSpace int32 = 350
 
-	//TransPortComunication ... Issue reading/writing to plugin
-	TransPortComunication int32 = 400
+	//TransPortCommunication ... Issue reading/writing to plugin
+	TransPortCommunication int32 = 400
 
 	// TransPortSerialization ... Issue with serializing the payload of a request
 	TransPortSerialization int32 = 401

ipc.go

@@ -86,14 +86,14 @@ func (t *transPort) invoke(cmd string, args map[string]interface{}, result inter
 
 	if sendError := t.send(string(msgSerialized)); sendError != nil {
 		return &errors.LsmError{
-			Code:    errors.TransPortComunication,
+			Code:    errors.TransPortCommunication,
 			Message: fmt.Sprintf("Error writing to unix domain socket %s\n", sendError)}
 	}
 
 	var reply, replyError = t.recv()
 	if replyError != nil {
 		return &errors.LsmError{
-			Code:    errors.TransPortComunication,
+			Code:    errors.TransPortCommunication,
 			Message: fmt.Sprintf("Error reading from unix domain socket %s\n", replyError)}
 	}
 
@@ -131,7 +131,7 @@ func (t *transPort) readRequest() (*requestMsg, error) {
 	request, requestError := t.recv()
 	if requestError != nil {
 		return nil, &errors.LsmError{
-			Code:    errors.TransPortComunication,
+			Code:    errors.TransPortCommunication,
 			Message: fmt.Sprintf("Error reading from unix domain socket %s\n", requestError)}
 	}
 
@@ -147,7 +147,7 @@ func (t *transPort) readRequest() (*requestMsg, error) {
 func (t *transPort) sendIt(msg string) error {
 	if sendError := t.send(msg); sendError != nil {
 		return &errors.LsmError{
-			Code:    errors.TransPortComunication,
+			Code:    errors.TransPortCommunication,
 			Message: fmt.Sprintf("Error writing to unix domain socket %s\n", sendError)}
 	}
 	return nil