@@ -119,18 +119,6 @@ def schedule_edit
119119 # This is only because ops_controller tries to set form locals, otherwise we should not use the @edit variable
120120 @edit = { :sched_id => @schedule . id }
121121
122- depot = @schedule . file_depot
123- full_uri , _query = depot . try ( :uri ) &.split ( '?' )
124- @uri_prefix , @uri = full_uri . to_s . split ( '://' )
125- @log_userid = depot . try ( :authentication_userid )
126- @log_password = depot . try ( :authentication_password )
127- @log_aws_region = depot . try ( :aws_region )
128- @openstack_region = depot . try ( :openstack_region )
129- @keystone_api_version = depot . try ( :keystone_api_version )
130- @v3_domain_ident = depot . try ( :v3_domain_ident )
131- @swift_api_port = full_uri . blank? ? nil : URI ( full_uri ) . port
132- @security_protocol = depot . try ( :security_protocol )
133-
134122 # This is a hack to trick the controller into thinking we loaded an edit variable
135123 session [ :edit ] = { :key => "schedule_edit__#{ @schedule . id || 'new' } " }
136124
@@ -267,29 +255,6 @@ def schedule_disable
267255 schedule_toggle ( false )
268256 end
269257
270- # TODO: I think we can drop this now that log collection is dropped, however, PXE needs FileDepot validation, and
271- # I'm not sure if this method is also used by PXE validation. Note that application_controller has a log_depot_validate
272- # as well, which might be the one used for PXE. By extension, build_uri_settings can probably also be dropped.
273- def log_depot_validate
274- assert_privileges ( "schedule_admin" )
275-
276- if params [ :log_password ]
277- file_depot = FileDepot . new
278- else
279- id = params [ :id ] || params [ :backup_schedule_type ]
280- file_depot = MiqSchedule . find ( id ) . file_depot
281- end
282- uri_settings = build_uri_settings ( file_depot )
283- begin
284- MiqSchedule . new . verify_file_depot ( uri_settings )
285- rescue => bang
286- add_flash ( _ ( "Error during 'Validate': %{message}" ) % { :message => bang . message } , :error )
287- else
288- add_flash ( _ ( 'Depot Settings successfuly validated' ) )
289- end
290- javascript_flash
291- end
292-
293258 private
294259
295260 def schedule_check_compliance? ( schedule )
@@ -726,18 +691,6 @@ def build_schedule_options_for_select
726691 ]
727692 end
728693
729- def retrieve_aws_regions
730- ManageIQ ::Providers ::Amazon ::Regions . regions . flat_map { |region | [ region [ 1 ] . values_at ( :description , :name ) ] }
731- end
732-
733- def retrieve_openstack_api_versions
734- [ [ 'Keystone v2' , 'v2' ] , [ 'Keystone v3' , 'v3' ] ]
735- end
736-
737- def retrieve_security_protocols
738- [ [ _ ( 'SSL without validation' ) , 'ssl' ] , [ _ ( 'SSL' ) , 'ssl-with-validation' ] , [ _ ( 'Non-SSL' ) , 'non-ssl' ] ]
739- end
740-
741694 def schedule_set_basic_record_vars ( schedule )
742695 schedule . name = params [ :name ]
743696 schedule . description = params [ :description ]
@@ -762,27 +715,4 @@ def schedule_set_interval_record_vars(schedule)
762715 schedule . run_at [ :interval ] [ :unit ] = params [ :timer_typ ] . downcase
763716 schedule . run_at [ :interval ] [ :value ] = params [ :timer_value ]
764717 end
765-
766- def build_uri_settings ( file_depot )
767- uri_settings = { }
768- type = FileDepot . supported_protocols [ params [ :uri_prefix ] ]
769- raise _ ( "Invalid or unsupported file depot type." ) if type . nil?
770-
771- protocols = FileDepot . supported_depots . map { |k , _v | [ k , k . constantize ] } . to_h
772- if protocols [ type ] . try ( :requires_credentials? )
773- log_password = params [ :log_password ] || file_depot . try ( :authentication_password )
774- uri_settings = { :username => params [ :log_userid ] , :password => log_password }
775- end
776- uri_settings [ :uri ] = "#{ params [ :uri_prefix ] } ://#{ params [ :uri ] } "
777- uri_settings [ :uri_prefix ] = params [ :uri_prefix ]
778- uri_settings [ :log_protocol ] = params [ :log_protocol ]
779- uri_settings [ :aws_region ] = params [ :log_aws_region ]
780- uri_settings [ :openstack_region ] = params [ :openstack_region ]
781- uri_settings [ :keystone_api_version ] = params [ :keystone_api_version ]
782- uri_settings [ :v3_domain_ident ] = params [ :v3_domain_ident ]
783- uri_settings [ :security_protocol ] = params [ :security_protocol ]
784- uri_settings [ :swift_api_port ] = params [ :swift_api_port ]
785- uri_settings [ :type ] = type
786- uri_settings
787- end
788718end
0 commit comments