aws: Remove the use of shared storage profile type

coralburg12 · Jul 26, 2020 · 42e9497 · 42e9497
1 parent 0edd742
commit 42e9497
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 41 deletions.
diff --git a/admin_console/configs/lang/en.php b/admin_console/configs/lang/en.php
@@ -142,9 +142,6 @@
 	'Kaltura_Client_Enum_PartnerStatus::ACTIVE' => 'Active',
 	'Kaltura_Client_Enum_PartnerStatus::BLOCKED' => 'Blocked',
 	'Kaltura_Client_Enum_PartnerStatus::FULL_BLOCK' => 'Removed',
-
-	'Kaltura_Client_Enum_SharedFileSystemType::NFS' => 'NFS',
-	'Kaltura_Client_Enum_SharedFileSystemType::S3' => 'S3',
 
 	'Kaltura_Client_Enum_UserStatus::BLOCKED' => 'Blocked',
 	'Kaltura_Client_Enum_UserStatus::ACTIVE' => 'Active',

diff --git a/admin_console/forms/PartnerConfiguration.php b/admin_console/forms/PartnerConfiguration.php
@@ -105,11 +105,6 @@ public function init()
 		));
 
 		//--------------------------- Storage Information ---------------------------
-		$partnerSharedStorageType = new Kaltura_Form_Element_EnumSelect('shared_storage_type', array('enum' => 'Kaltura_Client_Enum_SharedFileSystemType'), array( null => "default kaltura storage"));
-		$partnerSharedStorageType->setLabel('Shared Storage Type:');
-		$partnerSharedStorageType->setValue('default kaltura storage');
-		$this->addElements(array($partnerSharedStorageType));
-
 		$this->addElement('text', 'shared_storage_profile_id', array(
 			'label'			=> 'Shared storage profile ID:',
 			'filters'		=> array('StringTrim'),
@@ -953,7 +948,7 @@ public function addAllDisplayGroups($permissionNames)
 		//adding display groups
 
 		$this->addDisplayGroup(array('partner_name', 'description','admin_name', 'admin_email', 'id', 'kmc_version', 'language', 'crossLine'), 'generalInformation', array('legend' => 'General Information'));
-		$this->addDisplayGroup(array('shared_storage_type', 'shared_storage_profile_id', 'crossLine'), 'storagelInformation', array('legend' => 'Storage Information'));
+		$this->addDisplayGroup(array('shared_storage_profile_id', 'crossLine'), 'storagelInformation', array('legend' => 'Storage Information'));
 		$this->addDisplayGroup(array('partner_group_type', 'partner_parent_id','reference_id','crossLine'), 'groupAssociation', array('legend' => 'Multi-Account Group Related information'));
 
 		$this->addDisplayGroup(array_merge(array('delivery_profile_ids', 'live_delivery_profile_ids', 'deliveryFormat', 'delivery_profile_type', 'editDeliveryProfiles', 'enforce_delivery', 'checkbox_host', 'host', 'checkbox_cdn_host', 'cdn_host', 'checkbox_thumbnail_host', 'thumbnail_host', 'checkbox_cache_flavor_version', 'cache_flavor_version', 'support_animated_thumbnails'), $permissionNames[self::GROUP_PUBLISHER_DELIVERY_SETTINGS], array ('crossLine')), 'publisherSpecificDeliverySettings', array('legend' => 'Publisher Specific Delivery Settings'));

diff --git a/alpha/lib/model/Partner.php b/alpha/lib/model/Partner.php
@@ -85,7 +85,6 @@ class Partner extends BasePartner
 	const ANALYTICS_HOST = "analytics_host";
 
 	const CUSTOM_DATA_ALLOWED_FROM_EMAIL_WHITELIST = 'allowedFromEmailWhiteList';
-	const CUSTOM_DATE_SHARED_STORAGE_STORAGE_TYPE = 'shared_storage_type';
 	const CUSTOM_DATE_SHARED_STORAGE_STORAGE_PROFILE_ID = 'shared_storage_profile_id';
 
 	private $cdnWhiteListCache = array();
@@ -2167,16 +2166,6 @@ public function setAvoidIndexingSearchHistory($v)
 		$this->putInCustomData('avoidIndexingSearchHistory', $v);
 	}
 
-	public function getSharedStorageType()
-	{
-		return $this->getFromCustomData(self::CUSTOM_DATE_SHARED_STORAGE_STORAGE_TYPE, null, null);
-	}
-
-	public function setSharedStorageType($v)
-	{
-		$this->putInCustomData(self::CUSTOM_DATE_SHARED_STORAGE_STORAGE_TYPE, $v);
-	}
-
 	public function getSharedStorageProfileId()
 	{
 		return $this->getFromCustomData(self::CUSTOM_DATE_SHARED_STORAGE_STORAGE_PROFILE_ID, null, null);

diff --git a/api_v3/lib/types/KalturaSharedFileSystemType.php b/api_v3/lib/types/KalturaSharedFileSystemType.php
diff --git a/plugins/admin_console/system_partner/lib/api/KalturaSystemPartnerConfiguration.php b/plugins/admin_console/system_partner/lib/api/KalturaSystemPartnerConfiguration.php
@@ -440,11 +440,6 @@ class KalturaSystemPartnerConfiguration extends KalturaObject
 	 */
 	public $extendedFreeTrailEndsWarning;
 
-	/**
-	 * @var KalturaSharedFileSystemType
-	 */
-	public $sharedStorageType;
-
 	/**
 	 * @var int
 	 */
@@ -536,7 +531,6 @@ class KalturaSystemPartnerConfiguration extends KalturaObject
 		"usageLimitWarning",
 		"lastFreeTrialNotificationDay",
 		"extendedFreeTrailEndsWarning",
-		"sharedStorageType",
 		"sharedStorageProfileId"
 	);
 

diff --git a/var_console/configs/lang/en.php b/var_console/configs/lang/en.php
@@ -107,9 +107,6 @@
 	'Kaltura_Client_Enum_PartnerStatus::BLOCKED' => 'Blocked',
 	'Kaltura_Client_Enum_PartnerStatus::FULL_BLOCK' => 'Removed',
 
-	'Kaltura_Client_Enum_SharedFileSystemType::NFS' => 'NFS',
-	'Kaltura_Client_Enum_SharedFileSystemType::S3' => 'S3',
-
 	'Kaltura_Client_Enum_UserStatus::BLOCKED' => 'Blocked',
 	'Kaltura_Client_Enum_UserStatus::ACTIVE' => 'Active',
 	'Kaltura_Client_Enum_UserStatus::DELETED' => 'Deleted',