From 868646d28e4c64edf8ec327d63c16ac2cbab6d4c Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Thu, 18 Feb 2021 07:56:01 -0600 Subject: [PATCH] Fix CI_WIKI_NAME entries A lot of drivers had CI_WIKI_NAME entries pointing to invalid third party driver pages [0]. This updates them so we can automate pulling CI account information when generating the CI status report. [0] https://wiki.openstack.org/wiki/ThirdPartySystems Signed-off-by: Sean McGinnis Change-Id: I85855921894dddee3d3a4381129417a960796749 --- cinder/volume/drivers/dell_emc/powermax/fc.py | 2 +- cinder/volume/drivers/dell_emc/powermax/iscsi.py | 2 +- cinder/volume/drivers/dell_emc/powervault/fc.py | 2 +- cinder/volume/drivers/dell_emc/powervault/iscsi.py | 2 +- cinder/volume/drivers/dell_emc/sc/storagecenter_fc.py | 2 +- cinder/volume/drivers/dell_emc/sc/storagecenter_iscsi.py | 2 +- cinder/volume/drivers/dell_emc/unity/driver.py | 2 +- cinder/volume/drivers/dell_emc/vnx/driver.py | 2 +- cinder/volume/drivers/dell_emc/xtremio.py | 2 +- cinder/volume/drivers/ibm/gpfs.py | 4 ++-- cinder/volume/drivers/inspur/as13000/as13000_driver.py | 2 +- cinder/volume/drivers/inspur/instorage/instorage_fc.py | 2 +- cinder/volume/drivers/inspur/instorage/instorage_iscsi.py | 2 +- cinder/volume/drivers/macrosan/driver.py | 2 +- cinder/volume/drivers/storpool.py | 2 +- cinder/volume/drivers/windows/smbfs.py | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cinder/volume/drivers/dell_emc/powermax/fc.py b/cinder/volume/drivers/dell_emc/powermax/fc.py index 176a6769a37..c9d30307fad 100644 --- a/cinder/volume/drivers/dell_emc/powermax/fc.py +++ b/cinder/volume/drivers/dell_emc/powermax/fc.py @@ -134,7 +134,7 @@ class PowerMaxFCDriver(san.SanDriver, driver.FibreChannelDriver): VERSION = "4.3.0" # ThirdPartySystems wiki - CI_WIKI_NAME = "EMC_VMAX_CI" + CI_WIKI_NAME = "DellEMC_PowerMAX_CI" def __init__(self, *args, **kwargs): diff --git a/cinder/volume/drivers/dell_emc/powermax/iscsi.py b/cinder/volume/drivers/dell_emc/powermax/iscsi.py index 79c4e42b4d0..929aa952af3 100644 --- a/cinder/volume/drivers/dell_emc/powermax/iscsi.py +++ b/cinder/volume/drivers/dell_emc/powermax/iscsi.py @@ -140,7 +140,7 @@ class PowerMaxISCSIDriver(san.SanISCSIDriver): VERSION = "4.3.0" # ThirdPartySystems wiki - CI_WIKI_NAME = "EMC_VMAX_CI" + CI_WIKI_NAME = "DellEMC_PowerMAX_CI" def __init__(self, *args, **kwargs): diff --git a/cinder/volume/drivers/dell_emc/powervault/fc.py b/cinder/volume/drivers/dell_emc/powervault/fc.py index f4d08452c3c..3de927202bf 100644 --- a/cinder/volume/drivers/dell_emc/powervault/fc.py +++ b/cinder/volume/drivers/dell_emc/powervault/fc.py @@ -32,7 +32,7 @@ class PVMEFCDriver(fc.STXFCDriver): VERSION = "2.0" - CI_WIKI_NAME = "PVME_CI" + CI_WIKI_NAME = "DellEMC_PowerVault_ME_CI" SUPPORTED = True diff --git a/cinder/volume/drivers/dell_emc/powervault/iscsi.py b/cinder/volume/drivers/dell_emc/powervault/iscsi.py index d4a9a03ca38..6fad65e2963 100644 --- a/cinder/volume/drivers/dell_emc/powervault/iscsi.py +++ b/cinder/volume/drivers/dell_emc/powervault/iscsi.py @@ -32,7 +32,7 @@ class PVMEISCSIDriver(iscsi.STXISCSIDriver): VERSION = "2.0" - CI_WIKI_NAME = "PVME_CI" + CI_WIKI_NAME = "DellEMC_PowerVault_ME_CI" SUPPORTED = True diff --git a/cinder/volume/drivers/dell_emc/sc/storagecenter_fc.py b/cinder/volume/drivers/dell_emc/sc/storagecenter_fc.py index 9331e2fa5d1..377edfc8233 100644 --- a/cinder/volume/drivers/dell_emc/sc/storagecenter_fc.py +++ b/cinder/volume/drivers/dell_emc/sc/storagecenter_fc.py @@ -71,7 +71,7 @@ class SCFCDriver(storagecenter_common.SCCommonDriver, VERSION = '4.1.2' - CI_WIKI_NAME = "Dell_EMC_SC_Series_CI" + CI_WIKI_NAME = "DellEMC_SC_CI" def __init__(self, *args, **kwargs): super(SCFCDriver, self).__init__(*args, **kwargs) diff --git a/cinder/volume/drivers/dell_emc/sc/storagecenter_iscsi.py b/cinder/volume/drivers/dell_emc/sc/storagecenter_iscsi.py index eba27dfecea..5e2eb747ba7 100644 --- a/cinder/volume/drivers/dell_emc/sc/storagecenter_iscsi.py +++ b/cinder/volume/drivers/dell_emc/sc/storagecenter_iscsi.py @@ -70,7 +70,7 @@ class SCISCSIDriver(storagecenter_common.SCCommonDriver, """ VERSION = '4.1.2' - CI_WIKI_NAME = "Dell_EMC_SC_Series_CI" + CI_WIKI_NAME = "DellEMC_SC_CI" def __init__(self, *args, **kwargs): super(SCISCSIDriver, self).__init__(*args, **kwargs) diff --git a/cinder/volume/drivers/dell_emc/unity/driver.py b/cinder/volume/drivers/dell_emc/unity/driver.py index 5a075083f4c..04072ce5bd3 100644 --- a/cinder/volume/drivers/dell_emc/unity/driver.py +++ b/cinder/volume/drivers/dell_emc/unity/driver.py @@ -89,7 +89,7 @@ class UnityDriver(driver.ManageableVD, VERSION = '07.02.00' VENDOR = 'Dell EMC' # ThirdPartySystems wiki page - CI_WIKI_NAME = "EMC_UNITY_CI" + CI_WIKI_NAME = "DellEMC_Unity_CI" def __init__(self, *args, **kwargs): super(UnityDriver, self).__init__(*args, **kwargs) diff --git a/cinder/volume/drivers/dell_emc/vnx/driver.py b/cinder/volume/drivers/dell_emc/vnx/driver.py index 3de0807b4dc..50d707895e3 100644 --- a/cinder/volume/drivers/dell_emc/vnx/driver.py +++ b/cinder/volume/drivers/dell_emc/vnx/driver.py @@ -93,7 +93,7 @@ class VNXDriver(driver.ManageableVD, VERSION = '14.00.01' VENDOR = 'Dell EMC' # ThirdPartySystems wiki page - CI_WIKI_NAME = "EMC_VNX_CI" + CI_WIKI_NAME = "DellEMC_VNX_CI" def __init__(self, *args, **kwargs): super(VNXDriver, self).__init__(*args, **kwargs) diff --git a/cinder/volume/drivers/dell_emc/xtremio.py b/cinder/volume/drivers/dell_emc/xtremio.py index 18723c53a2b..df360d4d460 100644 --- a/cinder/volume/drivers/dell_emc/xtremio.py +++ b/cinder/volume/drivers/dell_emc/xtremio.py @@ -423,7 +423,7 @@ class XtremIOVolumeDriver(san.SanDriver): VERSION = '1.0.11' # ThirdPartySystems wiki - CI_WIKI_NAME = "EMC_XIO_CI" + CI_WIKI_NAME = "DellEMC_XtremIO_CI" driver_name = 'XtremIO' MIN_XMS_VERSION = [3, 0, 0] diff --git a/cinder/volume/drivers/ibm/gpfs.py b/cinder/volume/drivers/ibm/gpfs.py index dfcc50dfbf6..55c4eb22227 100644 --- a/cinder/volume/drivers/ibm/gpfs.py +++ b/cinder/volume/drivers/ibm/gpfs.py @@ -1393,7 +1393,7 @@ class GPFSRemoteDriver(GPFSDriver, san.SanDriver): VERSION = "1.0" # ThirdPartySystems wiki page - CI_WIKI_NAME = "IBM_GPFS_REMOTE_CI" + CI_WIKI_NAME = "IBM_GPFS_CI" def __init__(self, *args, **kwargs): super(GPFSRemoteDriver, self).__init__(*args, **kwargs) @@ -1516,7 +1516,7 @@ class GPFSNFSDriver(GPFSDriver, nfs.NfsDriver, san.SanDriver): VERSION = "1.0" # ThirdPartySystems wiki page - CI_WIKI_NAME = "IBM_GPFS_NFS_CI" + CI_WIKI_NAME = "IBM_GPFS_CI" def __init__(self, *args, **kwargs): self._context = None diff --git a/cinder/volume/drivers/inspur/as13000/as13000_driver.py b/cinder/volume/drivers/inspur/as13000/as13000_driver.py index 26ca0e68186..aabb7006d9f 100644 --- a/cinder/volume/drivers/inspur/as13000/as13000_driver.py +++ b/cinder/volume/drivers/inspur/as13000/as13000_driver.py @@ -179,7 +179,7 @@ class AS13000Driver(san.SanISCSIDriver): PROTOCOL = 'iSCSI' # ThirdPartySystems wiki page - CI_WIKI_NAME = 'INSPUR_CI' + CI_WIKI_NAME = 'Inspur_CI' def __init__(self, *args, **kwargs): super(AS13000Driver, self).__init__(*args, **kwargs) diff --git a/cinder/volume/drivers/inspur/instorage/instorage_fc.py b/cinder/volume/drivers/inspur/instorage/instorage_fc.py index f4b6de6e8e1..b6e6bf8ee34 100644 --- a/cinder/volume/drivers/inspur/instorage/instorage_fc.py +++ b/cinder/volume/drivers/inspur/instorage/instorage_fc.py @@ -50,7 +50,7 @@ class InStorageMCSFCDriver(instorage_common.InStorageMCSCommonDriver, VERSION = "1.0.0" # ThirdPartySystems wiki page - CI_WIKI_NAME = "INSPUR_CI" + CI_WIKI_NAME = "Inspur_CI" def __init__(self, *args, **kwargs): super(InStorageMCSFCDriver, self).__init__(*args, **kwargs) diff --git a/cinder/volume/drivers/inspur/instorage/instorage_iscsi.py b/cinder/volume/drivers/inspur/instorage/instorage_iscsi.py index 68bf7b55686..b69448eac55 100644 --- a/cinder/volume/drivers/inspur/instorage/instorage_iscsi.py +++ b/cinder/volume/drivers/inspur/instorage/instorage_iscsi.py @@ -82,7 +82,7 @@ class InStorageMCSISCSIDriver(instorage_common.InStorageMCSCommonDriver, VERSION = "1.0.0" # ThirdPartySystems wiki page - CI_WIKI_NAME = "INSPUR_CI" + CI_WIKI_NAME = "Inspur_CI" def __init__(self, *args, **kwargs): super(InStorageMCSISCSIDriver, self).__init__(*args, **kwargs) diff --git a/cinder/volume/drivers/macrosan/driver.py b/cinder/volume/drivers/macrosan/driver.py index 3f4dcc2003c..4146be9d408 100644 --- a/cinder/volume/drivers/macrosan/driver.py +++ b/cinder/volume/drivers/macrosan/driver.py @@ -76,7 +76,7 @@ def replication_synced(params): class MacroSANBaseDriver(driver.VolumeDriver): """Base driver for MacroSAN SAN.""" - CI_WIKI_NAME = 'MacroSAN Volume CI' + CI_WIKI_NAME = 'MacroSAN_Volume_CI' def __init__(self, *args, **kwargs): """Initialize the driver.""" diff --git a/cinder/volume/drivers/storpool.py b/cinder/volume/drivers/storpool.py index 9ec48ac905d..cf5707cbc7e 100644 --- a/cinder/volume/drivers/storpool.py +++ b/cinder/volume/drivers/storpool.py @@ -93,7 +93,7 @@ class StorPoolDriver(driver.VolumeDriver): """ VERSION = '1.2.3' - CI_WIKI_NAME = 'StorPool_CI' + CI_WIKI_NAME = 'StorPool_distributed_storage_CI' def __init__(self, *args, **kwargs): super(StorPoolDriver, self).__init__(*args, **kwargs) diff --git a/cinder/volume/drivers/windows/smbfs.py b/cinder/volume/drivers/windows/smbfs.py index b9362f4822e..aa6eefc8ad0 100644 --- a/cinder/volume/drivers/windows/smbfs.py +++ b/cinder/volume/drivers/windows/smbfs.py @@ -95,7 +95,7 @@ class WindowsSmbfsDriver(remotefs_drv.RevertToSnapshotMixin, _DISK_FORMAT_VHDX = 'vhdx' # ThirdPartySystems wiki page - CI_WIKI_NAME = "Microsoft_iSCSI_CI" + CI_WIKI_NAME = "Cloudbase_Cinder_SMB3_CI" _MINIMUM_QEMU_IMG_VERSION = '1.6'