aspera-cli 4.16.0 → 4.17.0

data/lib/aspera/cli/plugins/node.rb

@@ -3,12 +3,12 @@
 # cspell:ignore snid fnid bidi ssync asyncs rund asnodeadmin mkfile mklink asperabrowser asperabrowserurl watchfolders watchfolderd entsrv
 require 'aspera/cli/basic_auth_plugin'
 require 'aspera/cli/sync_actions'
-require 'aspera/fasp/transfer_spec'
+require 'aspera/transfer/spec'
 require 'aspera/nagios'
 require 'aspera/hash_ext'
 require 'aspera/id_generator'
-require 'aspera/node'
-require 'aspera/aoc'
+require 'aspera/api/node'
+require 'aspera/api/aoc'
 require 'aspera/oauth'
 require 'aspera/node_simulator'
 require 'aspera/assert'
@@ -18,10 +18,9 @@ require 'zlib'
 module Aspera
   module Cli
     module Plugins
-      class Node < Aspera::Cli::BasicAuthPlugin
+      class Node < Cli::BasicAuthPlugin
         include SyncActions
         class << self
-          @@node_options_declared = false # rubocop:disable Style/ClassVars
           def application_name
             'HSTS Node API'
           end
@@ -36,7 +35,7 @@ module Aspera
                 "http://#{address_or_url}:9091"
               ]
             end
-
+            error = nil
             urls.each do |base_url|
               next unless base_url.match?('https?://')
               api = Rest.new(base_url: base_url)
@@ -48,8 +47,10 @@ module Aspera
                 url: result[:http].uri.to_s[0..url_length]
               }
             rescue StandardError => e
+              error = e
               Log.log.debug{"detect error: #{e}"}
             end
+            raise error if error
             return nil
           end
 
@@ -65,15 +66,13 @@ module Aspera
             }
           end
 
-          def declare_options(options, force: false)
-            return if @@node_options_declared && !force
-            @@node_options_declared = true # rubocop:disable Style/ClassVars
+          def declare_options(options)
             options.declare(:validator, 'Identifier of validator (optional for central)')
             options.declare(:asperabrowserurl, 'URL for simple aspera web ui', default: 'https://asperabrowser.mybluemix.net')
             options.declare(:sync_name, 'Sync name')
             options.declare(
               :default_ports, 'Use standard FASP ports or get from node api (gen4)', values: :bool, default: :yes,
-              handler: {o: Aspera::Node, m: :use_standard_ports})
+              handler: {o: Api::Node, m: :use_standard_ports})
             options.declare(:root_id, 'File id of top folder if using bearer tokens')
             SyncActions.declare_options(options)
             options.parse_options!
@@ -117,28 +116,29 @@ module Aspera
         COMMANDS_SHARES = (BASE_ACTIONS - %i[search]).freeze
         COMMANDS_FASPEX = COMMON_ACTIONS
 
-        def initialize(env, api: nil)
-          super(env)
-          Node.declare_options(options, force: env[:all_manuals])
+        def initialize(api: nil, **env)
+          super(**env, basic_options: api.nil?)
+          Node.declare_options(options) if api.nil?
+          return if only_manual
           @api_node =
-            if !api.nil? || env[:all_manuals]
-              # this can be Aspera::Node or Aspera::Rest (shares)
+            if !api.nil?
+              # this can be Api::Node or Rest (shares)
               api
-            elsif Oauth.bearer?(options.get_option(:password, mandatory: true))
+            elsif OAuth::Factory.bearer?(options.get_option(:password, mandatory: true))
               # info is provided like node_info of aoc
-              Aspera::Node.new(params: {
+              Api::Node.new(
                 base_url: options.get_option(:url, mandatory: true),
-                headers:  Aspera::Node.bearer_headers(options.get_option(:password, mandatory: true))
-              })
+                headers:  Api::Node.bearer_headers(options.get_option(:password, mandatory: true))
+              )
             else
               # this is normal case
-              Aspera::Node.new(params: {
+              Api::Node.new(
                 base_url: options.get_option(:url, mandatory: true),
                 auth:     {
                   type:     :basic,
                   username: options.get_option(:username, mandatory: true),
                   password: options.get_option(:password, mandatory: true)
-                }})
+                })
             end
         end
 
@@ -166,7 +166,7 @@ module Aspera
             result = success_msg
             if p.key?('error')
               Log.log.error{"#{p['error']['user_message']} : #{p['path']}"}
-              result = 'ERROR: ' + p['error']['user_message']
+              result = "ERROR: #{p['error']['user_message']}"
               errors.push([p['path'], p['error']['user_message']])
             end
             final_result[:data].push({type => p['path'], 'result' => result})
@@ -192,7 +192,7 @@ module Aspera
           case command
           when :delete
             paths_to_delete = get_next_arg_add_prefix(prefix_path, 'file list', :multiple)
-            resp = @api_node.create('files/delete', { paths: paths_to_delete.map{|i| {'path' => i.start_with?('/') ? i : '/' + i} }})
+            resp = @api_node.create('files/delete', { paths: paths_to_delete.map{|i| {'path' => i.start_with?('/') ? i : "/#{i}"} }})
             return c_result_translate_rem_prefix(resp, 'file', 'deleted', prefix_path)
           when :search
             search_root = get_next_arg_add_prefix(prefix_path, 'search root')
@@ -284,7 +284,7 @@ module Aspera
             request_transfer_spec[:paths] = if command.eql?(:download)
               transfer.ts_source_paths
             else
-              [{ destination: transfer.destination_folder(Fasp::TransferSpec::DIRECTION_SEND) }]
+              [{ destination: transfer.destination_folder(Transfer::Spec::DIRECTION_SEND) }]
             end
             # add fixed parameters if any (for COS)
             @api_node.add_tspec_info(request_transfer_spec) if @api_node.respond_to?(:add_tspec_info)
@@ -301,10 +301,10 @@ module Aspera
             @api_node.call(
               operation: 'GET',
               subpath: "files/#{URI.encode_www_form_component(remote_path)}/contents",
-              save_to_file: File.join(transfer.destination_folder(Fasp::TransferSpec::DIRECTION_RECEIVE), file_name))
+              save_to_file: File.join(transfer.destination_folder(Transfer::Spec::DIRECTION_RECEIVE), file_name))
             return Main.result_status("downloaded: #{file_name}")
           end
-          error_unreachable_line
+          Aspera.error_unreachable_line
         end
 
         # common API to node and Shares
@@ -328,8 +328,8 @@ module Aspera
                 ak_info = @api_node.read("access_keys/#{access_key_id}")[:data]
                 # change API credentials if different access key
                 if !access_key_id.eql?('self')
-                  @api_node.params[:auth][:username] = ak_info['id']
-                  @api_node.params[:auth][:password] = config.lookup_secret(url: @api_node.params[:base_url], username: ak_info['id'], mandatory: true)
+                  @api_node.auth_params[:username] = ak_info['id']
+                  @api_node.auth_params[:password] = config.lookup_secret(url: @api_node.base_url, username: ak_info['id'], mandatory: true)
                 end
                 root_file_id = ak_info['root_file_id']
               end
@@ -381,9 +381,9 @@ module Aspera
             if node_license['failure'].is_a?(String) && node_license['failure'].include?('ACL')
               Log.log.error('server must have: asnodeadmin -mu <node user> --acl-add=internal --internal')
             end
-            return { type: :single_object, data: node_license}
+            return {type: :single_object, data: node_license}
           when :api_details
-            return { type: :single_object, data: @api_node.params }
+            return {type: :single_object, data: {base_url: @api_node.base_url}.merge(@api_node.params)}
           end
         end
 
@@ -406,26 +406,26 @@ module Aspera
             command_legacy = options.get_next_command(V3_IN_V4_ACTIONS)
             # TODO: shall we support all methods here ? what if there is a link ?
             apifid = @api_node.resolve_api_fid(top_file_id, '')
-            return Node.new(@agents, api: apifid[:api]).execute_action(command_legacy)
+            return Node.new(**init_params, api: apifid[:api]).execute_action(command_legacy)
           when :node_info, :bearer_token_node
             apifid = @api_node.resolve_api_fid(top_file_id, options.get_next_argument('path'))
             result = {
-              url:     apifid[:api].params[:base_url],
+              url:     apifid[:api].base_url,
               root_id: apifid[:file_id]
             }
-            assert_values(apifid[:api].params[:auth][:type], %i[basic oauth2])
-            case apifid[:api].params[:auth][:type]
+            Aspera.assert_values(apifid[:api].auth_params[:type], %i[basic oauth2])
+            case apifid[:api].auth_params[:type]
             when :basic
-              result[:username] = apifid[:api].params[:auth][:username]
-              result[:password] = apifid[:api].params[:auth][:password]
+              result[:username] = apifid[:api].auth_params[:username]
+              result[:password] = apifid[:api].auth_params[:password]
             when :oauth2
-              result[:username] = apifid[:api].params[:headers][Aspera::Node::HEADER_X_ASPERA_ACCESS_KEY]
+              result[:username] = apifid[:api].params[:headers][Api::Node::HEADER_X_ASPERA_ACCESS_KEY]
               result[:password] = apifid[:api].oauth_token
-            else error_unreachable_line
+            else Aspera.error_unreachable_line
             end
             return {type: :single_object, data: result} if command_repo.eql?(:node_info)
             # check format of bearer token
-            Oauth.bearer_extract(result[:password])
+            OAuth::Factory.bearer_extract(result[:password])
             return Main.result_status(result[:password])
           when :browse
             apifid = @api_node.resolve_api_fid(top_file_id, options.get_next_argument('path'))
@@ -440,12 +440,12 @@ module Aspera
             return {type: :object_list, data: items, fields: %w[name type recursive_size size modified_time access_level]}
           when :find
             apifid = @api_node.resolve_api_fid(top_file_id, options.get_next_argument('path'))
-            test_block = Aspera::Node.file_matcher_from_argument(options)
+            test_block = Api::Node.file_matcher_from_argument(options)
             return {type: :object_list, data: @api_node.find_files(apifid[:file_id], test_block), fields: ['path']}
           when :mkdir
-            containing_folder_path = options.get_next_argument('path').split(Aspera::Node::PATH_SEPARATOR)
+            containing_folder_path = options.get_next_argument('path').split(Api::Node::PATH_SEPARATOR)
             new_folder = containing_folder_path.pop
-            apifid = @api_node.resolve_api_fid(top_file_id, containing_folder_path.join(Aspera::Node::PATH_SEPARATOR))
+            apifid = @api_node.resolve_api_fid(top_file_id, containing_folder_path.join(Api::Node::PATH_SEPARATOR))
             result = apifid[:api].create("files/#{apifid[:file_id]}/files", {name: new_folder, type: :folder})[:data]
             return Main.result_status("created: #{result['name']} (id=#{result['id']})")
           when :rename
@@ -464,11 +464,11 @@ module Aspera
             return execute_sync_action do |sync_direction, _local_path, remote_path|
               # Gen4 API
               # direction is push pull, bidi
-              assert_values(sync_direction, %i[push pull bidi])
+              Aspera.assert_values(sync_direction, %i[push pull bidi])
               ts_direction = case sync_direction
-              when :push, :bidi then Fasp::TransferSpec::DIRECTION_SEND
-              when :pull then Fasp::TransferSpec::DIRECTION_RECEIVE
-              else error_unreachable_line
+              when :push, :bidi then Transfer::Spec::DIRECTION_SEND
+              when :pull then Transfer::Spec::DIRECTION_RECEIVE
+              else Aspera.error_unreachable_line
               end
               # remote is specified by option to_folder
               apifid = @api_node.resolve_api_fid(top_file_id, remote_path)
@@ -477,8 +477,8 @@ module Aspera
               transfer_spec
             end
           when :upload
-            apifid = @api_node.resolve_api_fid(top_file_id, transfer.destination_folder(Fasp::TransferSpec::DIRECTION_SEND))
-            return Main.result_transfer(transfer.start(apifid[:api].transfer_spec_gen4(apifid[:file_id], Fasp::TransferSpec::DIRECTION_SEND)))
+            apifid = @api_node.resolve_api_fid(top_file_id, transfer.destination_folder(Transfer::Spec::DIRECTION_SEND))
+            return Main.result_transfer(transfer.start(apifid[:api].transfer_spec_gen4(apifid[:file_id], Transfer::Spec::DIRECTION_SEND)))
           when :download
             source_paths = transfer.ts_source_paths
             # special case for AoC : all files must be in same folder
@@ -490,11 +490,11 @@ module Aspera
               case file_info['type']
               when 'file'
                 # if the single source is a file, we need to split into folder path and filename
-                src_dir_elements = source_folder.split(Aspera::Node::PATH_SEPARATOR)
+                src_dir_elements = source_folder.split(Api::Node::PATH_SEPARATOR)
                 # filename is the last one
                 source_paths = [{'source' => src_dir_elements.pop}]
                 # source folder is what remains
-                source_folder = src_dir_elements.join(Aspera::Node::PATH_SEPARATOR)
+                source_folder = src_dir_elements.join(Api::Node::PATH_SEPARATOR)
                 # TODO: instead of creating a new object, use the same, and change file id with parent folder id ? possible ?
                 apifid = @api_node.resolve_api_fid(top_file_id, source_folder)
               when 'link', 'folder'
@@ -505,14 +505,14 @@ module Aspera
                 raise "Unknown source type: #{file_info['type']}"
               end
             end
-            return Main.result_transfer(transfer.start(apifid[:api].transfer_spec_gen4(apifid[:file_id], Fasp::TransferSpec::DIRECTION_RECEIVE, {'paths'=>source_paths})))
+            return Main.result_transfer(transfer.start(apifid[:api].transfer_spec_gen4(apifid[:file_id], Transfer::Spec::DIRECTION_RECEIVE, {'paths'=>source_paths})))
           when :http_node_download
             source_paths = transfer.ts_source_paths
             source_folder = source_paths.shift['source']
             if source_paths.empty?
-              source_folder = source_folder.split(Aspera::Node::PATH_SEPARATOR)
+              source_folder = source_folder.split(Api::Node::PATH_SEPARATOR)
               source_paths = [{'source' => source_folder.pop}]
-              source_folder = source_folder.join(Aspera::Node::PATH_SEPARATOR)
+              source_folder = source_folder.join(Api::Node::PATH_SEPARATOR)
             end
             raise Cli::BadArgument, 'one file at a time only in HTTP mode' if source_paths.length > 1
             file_name = source_paths.first['source']
@@ -520,7 +520,7 @@ module Aspera
             apifid[:api].call(
               operation: 'GET',
               subpath: "files/#{apifid[:file_id]}/content",
-              save_to_file: File.join(transfer.destination_folder(Fasp::TransferSpec::DIRECTION_RECEIVE), file_name))
+              save_to_file: File.join(transfer.destination_folder(Transfer::Spec::DIRECTION_RECEIVE), file_name))
             return Main.result_status("downloaded: #{file_name}")
           when :show
             apifid = apifid_from_next_arg(top_file_id)
@@ -562,7 +562,7 @@ module Aspera
               create_param = options.get_next_argument('creation data', type: Hash)
               raise 'no file_id' if create_param.key?('file_id')
               create_param['file_id'] = apifid[:file_id]
-              create_param['access_levels'] = Aspera::Node::ACCESS_LEVELS unless create_param.key?('access_levels')
+              create_param['access_levels'] = Api::Node::ACCESS_LEVELS unless create_param.key?('access_levels')
               # add application specific tags (AoC)
               the_app = apifid[:api].app_info
               the_app[:api].permissions_set_create_params(create_param: create_param, app_info: the_app) unless the_app.nil?
@@ -571,11 +571,11 @@ module Aspera
               # notify application of creation
               the_app[:api].permissions_send_event(created_data: created_data, app_info: the_app) unless the_app.nil?
               return { type: :single_object, data: created_data}
-            else error_unreachable_line
+            else Aspera.error_unreachable_line
             end
-          else error_unreachable_line
+          else Aspera.error_unreachable_line
           end # command_repo
-          error_unreachable_line
+          Aspera.error_unreachable_line
         end # execute_command_gen4
 
         # This is older API
@@ -634,7 +634,7 @@ module Aspera
             skip_ids_persistency = nil
             if options.get_option(:once_only, mandatory: true)
               skip_ids_persistency = PersistencyActionOnce.new(
-                manager: @agents[:persistency],
+                manager: persistency,
                 data:    iteration_data,
                 id:      IdGenerator.from_list([
                   'sync_files',
@@ -781,7 +781,7 @@ module Aspera
                 # do not process last one
                 break if end_date.nil?
                 # init data for this period
-                period_bandwidth = Fasp::TransferSpec::DIRECTION_ENUM_VALUES.map(&:to_sym).each_with_object({}) do |direction, h|
+                period_bandwidth = Transfer::Spec::DIRECTION_ENUM_VALUES.map(&:to_sym).each_with_object({}) do |direction, h|
                   h[direction] = dir_info.each_with_object({}) do |k2, h2|
                     h2[k2] = 0
                   end
@@ -799,7 +799,7 @@ module Aspera
                   info[:sessions] += 1
                   # end
                 end
-                next if Fasp::TransferSpec::DIRECTION_ENUM_VALUES.map(&:to_sym).all? do |dir|
+                next if Transfer::Spec::DIRECTION_ENUM_VALUES.map(&:to_sym).all? do |dir|
                   period_bandwidth[dir][:sessions].zero?
                 end
                 result.push({start: Time.at(start_date / 1_000_000), end: Time.at(end_date / 1_000_000)}.merge(period_bandwidth))
@@ -895,7 +895,7 @@ module Aspera
             }
             # encode parameters so that it looks good in url
             encoded_params = Base64.strict_encode64(Zlib::Deflate.deflate(JSON.generate(browse_params))).gsub(/=+$/, '').tr('+/', '-_').reverse
-            OpenApplication.instance.uri(options.get_option(:asperabrowserurl) + '?goto=' + encoded_params)
+            OpenApplication.instance.uri("#{options.get_option(:asperabrowserurl)}?goto=#{encoded_params}")
             return Main.result_status('done')
           when :basic_token
             return Main.result_status(Rest.basic_token(options.get_option(:username, mandatory: true), options.get_option(:password, mandatory: true)))
@@ -903,7 +903,7 @@ module Aspera
             private_key = OpenSSL::PKey::RSA.new(options.get_next_argument('private RSA key PEM value', type: String))
             token_info = options.get_next_argument('user and group identification', type: Hash)
             access_key = options.get_option(:username, mandatory: true)
-            return Main.result_status(Aspera::Node.bearer_token(payload: token_info, access_key: access_key, private_key: private_key))
+            return Main.result_status(Api::Node.bearer_token(payload: token_info, access_key: access_key, private_key: private_key))
           when :simulator
             require 'aspera/node_simulator'
             parameters = value_create_modify(command: command)
@@ -912,17 +912,12 @@ module Aspera
             uri = URI.parse(parameters[:url])
             server = WebServerSimple.new(uri, certificate: parameters[:certificate])
             server.mount(uri.path, NodeSimulatorServlet, parameters[:credentials], transfer)
-            # on ctrl-c, tell server main loop to exit
-            trap('INT') { server.shutdown }
-            formatter.display_status("Node Simulator listening on #{uri.port}")
-            Log.log.info{"Listening on #{uri.port}"}
-            # this is blocking until server exits
             server.start
             return Main.result_status('Simulator terminated')
           end # case command
           raise 'ERROR: shall not reach this line'
-        end # execute_action
-      end # Main
-    end # Plugin
-  end # Cli
-end # Aspera
+        end
+      end
+    end
+  end
+end

data/lib/aspera/cli/plugins/orchestrator.rb

@@ -9,13 +9,14 @@ require 'xmlsimple'
 module Aspera
   module Cli
     module Plugins
-      class Orchestrator < Aspera::Cli::BasicAuthPlugin
+      class Orchestrator < Cli::BasicAuthPlugin
         class << self
           STANDARD_PATH = '/aspera/orchestrator'
           def detect(address_or_url)
             address_or_url = "https://#{address_or_url}" unless address_or_url.match?(%r{^[a-z]{1,6}://})
             urls = [address_or_url]
             urls.push("#{address_or_url}#{STANDARD_PATH}") unless address_or_url.end_with?(STANDARD_PATH)
+            error = nil
             urls.each do |base_url|
               next unless base_url.match?('https?://')
               api = Rest.new(base_url: base_url)
@@ -28,8 +29,10 @@ module Aspera
                 url:     url[0..url.index(test_endpoint) - 2]
               }
             rescue StandardError => e
+              error = e
               Log.log.debug{"detect error: #{e}"}
             end
+            raise error if error
             return nil
           end
 
@@ -46,8 +49,8 @@ module Aspera
           end
         end
 
-        def initialize(env)
-          super(env)
+        def initialize(**env)
+          super
           options.declare(:result, "Specify result value as: 'work_step:parameter'")
           options.declare(:synchronous, 'Wait for completion', values: :bool, default: :no)
           options.declare(:ret_style, 'How return type is requested in api', values: %i[header arg ext], default: :arg)
@@ -57,24 +60,6 @@ module Aspera
 
         ACTIONS = %i[health info workflow plugins processes].freeze
 
-        # for JSON format: add extension ".json" or add url parameter: format=json or Accept: application/json
-        # id can be: a parameter id=x, or at the end of url /id, for workflows: work_order[workflow_id]=wf_id
-        #        def call_API_orig(endpoint,id=nil,url_params={format: :json},accept=nil)
-        #          # calls are GET
-        #          call_args={operation: 'GET',subpath: endpoint}
-        #          # specify id if necessary
-        #          call_args[:subpath]=call_args[:subpath]+'/'+id unless id.nil?
-        #          unless url_params.nil?
-        #            if url_params.has_key?(:format)
-        #              call_args[:headers]={'Accept'=>'application/'+url_params[:format].to_s}
-        #            end
-        #            call_args[:headers]={'Accept'=>accept} unless accept.nil?
-        #            # add params if necessary
-        #            call_args[:url_params]=url_params
-        #          end
-        #          return @api_orch.call(call_args)
-        #        end
-
         def call_ao(endpoint, opt={})
           opt[:prefix] = 'api' unless opt.key?(:prefix)
           # calls are GET
@@ -91,40 +76,45 @@ module Aspera
           unless format.nil?
             case call_type
             when :header
-              call_args[:headers] = {'Accept' => 'application/' + format}
+              call_args[:headers] = {'Accept' => "application/#{format}" }
             when :arg
               call_args[:url_params] ||= {}
               call_args[:url_params][:format] = format
             when :ext
               call_args[:subpath] = "#{call_args[:subpath]}.#{format}"
-            else error_unexpected_value(call_type)
+            else Aspera.error_unexpected_value(call_type)
             end
           end
-          result = @api_orch.call(call_args)
+          result = @api_orch.call(**call_args)
           result[:data] = XmlSimple.xml_in(result[:http].body, opt[:xml_opt] || {'ForceArray' => true}) if format.eql?('xml')
           Log.log.debug{Log.dump(:data, result[:data])}
           return result
         end
 
         def execute_action
-          rest_params = {base_url: options.get_option(:url, mandatory: true)}
-          case options.get_option(:auth_style, mandatory: true)
-          when :arg_pass
-            rest_params[:auth] = {
-              type:      :url,
-              url_query: {
-                'login'    => options.get_option(:username, mandatory: true),
-                'password' => options.get_option(:password, mandatory: true) }}
-          when :head_basic
-            rest_params[:auth] = {
-              type:     :basic,
-              username: options.get_option(:username, mandatory: true),
-              password: options.get_option(:password, mandatory: true) }
-          when :apikey
-            raise 'Not implemented'
-          end
+          auth_params =
+            case options.get_option(:auth_style, mandatory: true)
+            when :arg_pass
+              {
+                type:      :url,
+                url_query: {
+                  'login'    => options.get_option(:username, mandatory: true),
+                  'password' => options.get_option(:password, mandatory: true) }
+              }
+            when :head_basic
+              {
+                type:     :basic,
+                username: options.get_option(:username, mandatory: true),
+                password: options.get_option(:password, mandatory: true)
+              }
+            when :apikey
+              raise 'Not implemented'
+            end
 
-          @api_orch = Rest.new(rest_params)
+          @api_orch = Rest.new(
+            base_url: options.get_option(:url, mandatory: true),
+            auth: auth_params
+          )
 
           command1 = options.get_next_command(ACTIONS)
           case command1
@@ -142,11 +132,11 @@ module Aspera
             result = call_ao('remote_node_ping', format: 'xml', xml_opt: {'ForceArray' => false})[:data]
             return {type: :single_object, data: result}
           when :processes
-            # TODO: Jira ? API has only XML format
+            # TODO: Bug ? API has only XML format
             result = call_ao('processes_status', format: 'xml')[:data]
             return {type: :object_list, data: result['process']}
           when :plugins
-            # TODO: Jira ? only json format on url
+            # TODO: Bug ? only json format on url
             result = call_ao('plugin_version')[:data]
             return {type: :object_list, data: result['Plugin']}
           when :workflow
@@ -207,7 +197,7 @@ module Aspera
               result[:data] = call_ao('initiate', id: wf_id, args: call_params, accept: override_accept)[:data]
               return result
             end # wf command
-          else error_unexpected_value(command)
+          else Aspera.error_unexpected_value(command)
           end # case command
         end # execute_action
       end # Orchestrator