[Isolated]FSXOntap is supported in us-iso-e

Author: Himani Anil Deshpande

cli/src/pcluster/constants.py

@@ -276,7 +276,7 @@ class Feature(Enum):
     Feature.BATCH: ["ap-northeast-3", "ap-southeast-5", "ap-southeast-7", "us-iso"],
     Feature.FSX_LUSTRE: [],
     Feature.FILE_CACHE: ["us-iso"],
-    Feature.FSX_ONTAP: ["us-iso-"],
+    Feature.FSX_ONTAP: ["us-iso-w"],
     Feature.FSX_OPENZFS: ["us-iso"],
     Feature.SLURM_DATABASE: [],
     Feature.CLUSTER_HEALTH_METRICS: ["us-iso"],

cli/tests/pcluster/test_utils.py

@@ -581,7 +581,7 @@ async def async_method(self, param):
         (Feature.BATCH, "us-isoWHATEVER", False),
         (Feature.FSX_LUSTRE, "us-isob-east-1", True),
         (Feature.FSX_LUSTRE, "us-isobWHATEVER", True),
-        (Feature.FSX_ONTAP, "us-iso-east-1", False),
+        (Feature.FSX_ONTAP, "us-iso-east-1", True),
         (Feature.FSX_ONTAP, "us-iso-west-1", False),
         (Feature.FSX_ONTAP, "us-isob-east-1", True),
         (Feature.FSX_ONTAP, "us-isoWHATEVER", True),

tests/integration-tests/tests/storage/test_fsx_lustre.py

@@ -325,7 +325,7 @@ def test_multiple_fsx(
     partition = utils.get_arn_partition(region)
     num_new_fsx_lustre = 1
     num_existing_fsx_ontap_volumes = (
-        2 if partition in ["aws", "aws-us-gov"] else 0
+        2 if partition in ["aws", "aws-us-gov", "us-iso"] and utils.is_fsx_ontap_supported(region) else 0
     )  # China and Isolated do not have Ontap
     num_existing_fsx_open_zfs_volumes = (
         2 if partition in ["aws"] else 0

tests/integration-tests/utils.py

@@ -843,7 +843,7 @@ def is_fsx_lustre_supported(region: str):
 
 
 def is_fsx_ontap_supported(region: str):
-    return "us-iso-" not in region
+    return "us-iso-w" not in region
 
 
 def is_fsx_openzfs_supported(region: str):