Merge pull request #122 from dell/nvme_tcp

dell · Jan 23, 2024 · ec40aaf · ec40aaf
2 parents 5ddb356 + 6f0f86c
commit ec40aaf
Show file tree

Hide file tree

Showing 11 changed files with 67 additions and 8 deletions.
diff --git a/client.go b/client.go
@@ -74,6 +74,7 @@ type Client interface {
 	DetachVolumeFromHost(ctx context.Context, hostID string, detachParams *HostVolumeDetach) (EmptyResponse, error)
 	DetachVolumeFromHostGroup(ctx context.Context, hostGroupID string, detachParams *HostVolumeDetach) (EmptyResponse, error)
 	GetStorageISCSITargetAddresses(ctx context.Context) ([]IPPoolAddress, error)
+	GetStorageNVMETCPTargetAddresses(ctx context.Context) ([]IPPoolAddress, error)
 	GetCapacity(ctx context.Context) (int64, error)
 	GetFCPorts(ctx context.Context) (resp []FcPort, err error)
 	GetFCPort(ctx context.Context, id string) (resp FcPort, err error)

diff --git a/ip_pool_address.go b/ip_pool_address.go
@@ -51,3 +51,29 @@ func (c *ClientIMPL) GetStorageISCSITargetAddresses(
 	}
 	return resp, nil
 }
+
+// GetStorageNVMETCPTargetAddresses returns a list of PowerStore NVME/TCP targets ip addresses
+func (c *ClientIMPL) GetStorageNVMETCPTargetAddresses(
+	ctx context.Context,
+) (resp []IPPoolAddress, err error) {
+	var ipPoolAddress IPPoolAddress
+	qp := c.APIClient().QueryParamsWithFields(&ipPoolAddress)
+	qp.RawArg("purposes", fmt.Sprintf("cs.{%s}", IPPurposeTypeEnumStorageNVMETCPPort))
+	qp.Order("id")
+	_, err = c.APIClient().Query(
+		ctx,
+		RequestConfig{
+			Method:      "GET",
+			Endpoint:    apiPoolAddressURL,
+			QueryParams: qp,
+		},
+		&resp)
+	err = WrapErr(err)
+	if err != nil {
+		return resp, err
+	}
+	if len(resp) == 0 {
+		return resp, errors.New("can't get NVMeTCP target address")
+	}
+	return resp, nil
+}
diff --git a/ip_pool_address_types.go b/ip_pool_address_types.go
@@ -42,6 +42,8 @@ const (
 	IPPurposeTypeEnumStorageIscsiInitiator IPPurposeTypeEnum = "Storage_Iscsi_Initiator"
 	// IPPurposeTypeEnumStorageIscsiTarget captures enum value "Storage_Iscsi_Target"
 	IPPurposeTypeEnumStorageIscsiTarget IPPurposeTypeEnum = "Storage_Iscsi_Target"
+	// IPPurposeTypeEnumStorageNVMETCPPort captures enum value "Storage_NVMe_TCP_Port"
+	IPPurposeTypeEnumStorageNVMETCPPort IPPurposeTypeEnum = "Storage_NVMe_TCP_Port"
 	// IPPurposeTypeEnumStorageClusterFloating captures enum value "Storage_Cluster_Floating"
 	IPPurposeTypeEnumStorageClusterFloating IPPurposeTypeEnum = "Storage_Cluster_Floating"
 	// IPPurposeTypeEnumICDNode captures enum value "ICD_Node"

diff --git a/mocks/Client.go b/mocks/Client.go
diff --git a/mocks/FieldProvider.go b/mocks/FieldProvider.go
diff --git a/mocks/Logger.go b/mocks/Logger.go
diff --git a/mocks/QueryParamsEncoder.go b/mocks/QueryParamsEncoder.go
diff --git a/mocks/RequestConfigRenderer.go b/mocks/RequestConfigRenderer.go
diff --git a/mocks/TimeoutSemaphoreInterface.go b/mocks/TimeoutSemaphoreInterface.go
diff --git a/mocks/Traceable.go b/mocks/Traceable.go
diff --git a/replication_types.go b/replication_types.go
@@ -40,7 +40,7 @@ const (
 	RsStatePausedForNdu               RSStateEnum = "Paused_For_NDU"
 	RsStateResuming                   RSStateEnum = "Resuming"
 	RsStateFailingOver                RSStateEnum = "Failing_Over"
-	RsStateFailingOverForDr           RSStateEnum = "Failing_Over_For_DR"
+	RsStateFailingOverForDR           RSStateEnum = "Failing_Over_For_DR"
 	RsStateFailedOver                 RSStateEnum = "Failed_Over"
 	RsStateReprotecting               RSStateEnum = "Reprotecting"
 	RsStatePartialCutoverForMigration RSStateEnum = "Partial_Cutover_For_Migration"