diff --git a/perfkitbenchmarker/providers/gcp/gce_nfs_service.py b/perfkitbenchmarker/providers/gcp/gce_nfs_service.py index 6b1ae000e..53ff71aa6 100644 --- a/perfkitbenchmarker/providers/gcp/gce_nfs_service.py +++ b/perfkitbenchmarker/providers/gcp/gce_nfs_service.py @@ -14,6 +14,13 @@ FLAGS = flags.FLAGS +STANDARD = 'STANDARD' +PREMIUM = 'PREMIUM' +ZONAL = 'ZONAL' +REGIONAL = 'REGIONAL' +HIGH_SCALE_SSD = 'high-scale-ssd' +ENTERPRISE = 'enterprise' + class GceNFSDiskSpec(disk.BaseNFSDiskSpec): CLOUD = provider_info.GCP @@ -23,10 +30,7 @@ class GceNfsService(nfs_service.BaseNfsService): """Resource for GCE NFS service.""" CLOUD = provider_info.GCP - NFS_TIERS = ( - 'STANDARD', - 'PREMIUM' - ) + NFS_TIERS = (STANDARD, PREMIUM, ZONAL, REGIONAL, HIGH_SCALE_SSD, ENTERPRISE) DEFAULT_NFS_VERSION = '3.0' DEFAULT_TIER = 'STANDARD' user_managed = False @@ -99,6 +103,8 @@ def _Describe(self): return self._NfsCommand('describe') def _GetLocation(self): + if self.nfs_tier in [ENTERPRISE, REGIONAL]: + return util.GetRegionFromZone(self.zone) return self.zone def _NfsCommand(self, verb, *args):