restructuring

Author: Adam Stafford

operatorapi/error.go

@@ -40,6 +40,7 @@ var (
 	errAccessDenied                       = errors.New("access denied")
 	errTooFewNodes                        = errors.New("at least 4 nodes are required in cluster")
 	errTooFewSchedulableNodes             = errors.New("at least 4 schedulable nodes are required in cluster")
+	errFewerThanFourNodes                 = errors.New("at least 4 nodes are required in request")
 )
 
 // prepareError receives an error object and parse it against k8sErrors, returns the right error code paired with a generic error message
@@ -166,6 +167,10 @@ func prepareError(err ...error) *models.Error {
 			errorCode = 507
 			errorMessage = errTooFewSchedulableNodes.Error()
 		}
+		if errors.Is(err[0], errFewerThanFourNodes) {
+			errorCode = 507
+			errorMessage = errFewerThanFourNodes.Error()
+		}
 	}
 	return &models.Error{Code: errorCode, Message: swag.String(errorMessage), DetailedMessage: swag.String(err[0].Error())}
 }

operatorapi/operator_nodes.go

@@ -56,8 +56,8 @@ func registerNodesHandlers(api *operations.OperatorAPI) {
 
 // getMaxAllocatableMemory get max allocatable memory given a desired number of nodes
 func getMaxAllocatableMemory(ctx context.Context, clientset v1.CoreV1Interface, numNodes int32) (*models.MaxAllocatableMemResponse, error) {
-	if numNodes == 0 {
-		return nil, errors.New("error NumNodes must be greater than 0")
+	if numNodes < 4 {
+		return nil, errors.New("error NumNodes must be at least 4")
 	}
 
 	// get all nodes from cluster

portal-ui/src/screens/Console/Tenants/AddTenant/Steps/TenantSize.tsx

@@ -97,6 +97,7 @@ const TenantSize = ({
 }: ITenantSizeProps) => {
   const [validationErrors, setValidationErrors] = useState<any>({});
   const [errorFlag, setErrorFlag] = useState<boolean>(false);
+  const [error, setError] = useState<string>("");
   const usableInformation = ecParityCalc.storageFactors.find(
     (element) => element.erasureCode === ecParity
   );
@@ -143,10 +144,8 @@ const TenantSize = ({
           updateField("maxAllocableMemo", maxMemory);
         })
         .catch((err: any) => {
-          if (err.errorMessage === "at least 4 nodes are required in cluster" || err.errorMessage === "at least 4 schedulable nodes are required in cluster") {
-            setErrorFlag(true);
-            console.log("here")
-          }
+          setErrorFlag(true);
+          setError(err.errorMessage);
           console.error(err);
         });
     }
@@ -226,7 +225,6 @@ const TenantSize = ({
 
   useEffect(() => {
     const parsedSize = getBytes(volumeSize, sizeFactor, true);
-
     const commonValidation = commonFormValidation([
       {
         fieldKey: "nodes",
@@ -240,7 +238,7 @@ const TenantSize = ({
         required: true,
         value: nodes,
         customValidation: errorFlag,
-        customValidationMessage: "Too few schedulable nodes",
+        customValidationMessage: error,
       },
       {
         fieldKey: "volume_size",
@@ -294,6 +292,8 @@ const TenantSize = ({
     limitSize,
     selectedStorageClass,
     isPageValid,
+    errorFlag,
+    error
   ]);
 
   /* End Validation of pages */