aspera-cli 4.0.0.pre1 → 4.0.0.pre2

data/docs/test_env.conf

@@ -3,7 +3,7 @@ config:
   version: 4.0.0.pre1
 default:
   config: cli_default
-  oncloud: tst_oncloud
+  aoc: tst_aoc
   faspex: tst_faspex
   faspex5: tst_faspex5
   shares: tst_shares
@@ -20,18 +20,6 @@ cli_default:
   interactive: your value here
   smtp: your value here
   ascp_path: your value here
-misc:
-  upload_folder: your value here
-  syncuser: your value here
-  faspex_publink_recv_from_fxuser: your value here
-  faspex_publink_send_to_fxuser: your value here
-  faspex_publink_send_to_dropbox: your value here
-  shares_upload: your value here
-  orch_workflow_id: your value here
-  file_dcm: your value here
-  file_pdf: your value here
-  file_docx: your value here
-  file_mxf: your value here
 local_user:
   ssh_keys: your value here
 smtp_config:
@@ -43,7 +31,7 @@ smtp_config:
   from_name: your value here
   username: your value here
   password: your value here
-tst_oncloud:
+tst_aoc:
   url: your value here
   username: your value here
   auth: your value here
@@ -115,3 +103,38 @@ tst_cos:
   crn: your value here
   bucket: your value here
   endpoint: your value here
+misc:
+  upload_folder: your value here
+  syncuser: your value here
+  faspex_publink_recv_from_fxuser: your value here
+  faspex_publink_send_to_fxuser: your value here
+  faspex_publink_send_to_dropbox: your value here
+  shares_upload: your value here
+  orch_workflow_id: your value here
+  file_dcm: your value here
+  file_pdf: your value here
+  file_docx: your value here
+  file_mxf: your value here
+  aws_bucket_key: your value here
+  aws_bucket_secret: your value here
+  aws_bucket_name: your value here
+  aws_bucket_region: your value here
+  aoc_publink_recv_from_aocuser: your value here
+  aoc_publink_send_shd_inbox: your value here
+  aoc_publink_send_aoc_user: your value here
+  aoc_publink_folder: your value here
+  aoc_shbx_ws: your value here
+  aoc_shbx_name: your value here
+  aoc_node1_name: your value here
+  aoc_node1_secret: your value here
+  icos_bucket_key: your value here
+  icos_bucket_secret: your value here
+  icos_bucket_name: your value here
+  icos_bucket_region: your value here
+  icos_bucket_endpoint: your value here
+  icos_bucket_apikey: your value here
+  icos_resource_instance_id: your value here
+  email_internal: your value here
+  email_external: your value here
+  aoc_org: your value here
+  aoc_user: your value here

data/examples/aoc.rb

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
-require 'aspera/on_cloud'
+require 'aspera/aoc'
 require 'aspera/log'
 
 Aspera::Log.instance.level=:debug
 
-aocapi=Aspera::OnCloud.new(
+aocapi=Aspera::AoC.new(
 url: 'https://myorg.ibmaspera.com',
 auth: :jwt,
 private_key: File.read('path/to_your_private_key.pem'),

data/examples/transfer.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # Example: transfer a file using one of the provided transfer agents
-
+# location of ascp can be specified with env var "ascp"
+# temp folder can be specified with env var "tmp"
 require 'aspera/fasp/local'
 require 'aspera/fasp/listener'
 require 'aspera/fasp/installation'
@@ -8,8 +9,15 @@ require 'aspera/log'
 require 'aspera/rest'
 require 'aspera/rest_errors_aspera'
 require 'json'
+require 'tmpdir'
+
+tmpdir=ENV['tmp']||Dir.tmpdir || '.'
 
-tmpdir=ENV['tmp'] || '.'
+DEMO_CONFIG=[
+  'ssh://asperaweb@eudemo.asperademo.com:33001',
+  'https://node_asperaweb@eudemo.asperademo.com:9092',
+  'demoaspera',
+]
 
 ##############################################################
 # generic initialisation : configuration of FaspManager
@@ -17,17 +25,18 @@ tmpdir=ENV['tmp'] || '.'
 # set trace level for sample, set to :debug to see complete list of debug information
 Aspera::Log.instance.level=:debug
 
-# set path to your copy of ascp binary
-Aspera::Fasp::Installation.instance.ascp_path=ENV['ascp'] || '/Library/aspera/bin/ascp'
-# some required files are generated here (keys, certs)
-Aspera::Fasp::Installation.instance.config_folder = tmpdir
-
 # register aspera REST call error handlers
 Aspera::RestErrorsAspera.registerHandlers
 
+# some required files are generated here (keys, certs)
+Aspera::Fasp::Installation.instance.folder = tmpdir
+# set path to your copy of ascp binary (else, let the system find)
+Aspera::Fasp::Installation.instance.ascp_path=ENV['ascp'] if ENV.has_key?('ascp')
 # another way is to detect installed products and use one of them
 #Aspera::Fasp::Installation.instance.installed_products.each{|p|puts("found: #{p[:name]}")}
 #Aspera::Fasp::Installation.instance.use_ascp_from_product('Aspera Connect')
+# or install:
+# 
 
 # get FASP Manager singleton based on above ascp location
 fasp_manager=Aspera::Fasp::Local.new
@@ -57,11 +66,11 @@ fasp_manager.add_listener(MyListener.new)
 # manually build teansfer spec
 transfer_spec={
   #'remote_host'     =>'demo.asperasoft.com',
-  'remote_host'     =>'eudemo.asperademo.com',
-  'remote_user'     =>'asperaweb',
-  'remote_password' =>'demoaspera',
+  'remote_host'     =>URI.parse(DEMO_CONFIG[0]).host,
+  'ssh_port'        =>URI.parse(DEMO_CONFIG[0]).port,
+  'remote_user'     =>URI.parse(DEMO_CONFIG[0]).user,
+  'remote_password' =>DEMO_CONFIG[2],
   'direction'       =>'receive',
-  'ssh_port'        =>33001,
   'destination_root'=>tmpdir,
   'paths'           =>[{'source'=>'aspera-test-dir-tiny/200KB.1'}]
 }
@@ -86,11 +95,11 @@ raise "Error(s) occured: #{errors.join(',')}" if !errors.empty?
 
 # create rest client for Node API on a public demo system, using public demo credentials
 node_api=Aspera::Rest.new({
-  :base_url => 'https://eudemo.asperademo.com:9092',
+  :base_url => DEMO_CONFIG[1],
   :auth     => {
   :type     => :basic,
-  :username => 'node_asperaweb',
-  :password => 'demoaspera'
+  :username => URI.parse(DEMO_CONFIG[1]).user,
+  :password => DEMO_CONFIG[2]
   }})
 # define sample file(s) and destination folder
 sources=["#{tmpdir}/sample_file.txt"]

data/lib/aspera/{on_cloud.rb → aoc.rb}

@@ -1,10 +1,11 @@
 require 'aspera/log'
 require 'aspera/rest'
 require 'aspera/hash_ext'
+require 'aspera/data_repository'
 require 'base64'
 
 module Aspera
-  class OnCloud < Rest
+  class AoC < Rest
     private
     @@use_standard_ports = true
 
@@ -13,13 +14,9 @@ module Aspera
     PROD_DOMAIN='ibmaspera.com'
     # to avoid infinite loop in pub link redirection
     MAX_REDIRECT=10
-    DEFAULT_CLIENT='aspera.global-cli-client'
-    # Random generator seed
-    # strings /Applications/Aspera\ Drive.app/Contents/MacOS/AsperaDrive|grep -E '.{100}==$'|base64 --decode
-    CLIENT_RANDOM={
-      'aspera.drive' => '1FwelGbL9xsv3M8H-VXPs5k69OdbaMgfB66qfBqlELFPk6r9ANztmGMOSLqaXEWXEPwk-6JnMZ7-RaXAYLd5thLbcL3QzgeU',
-      'aspera.global-cli-client' => 'bK_qpqFpP-OPEuRJ9mnmdw_ebLtpSqCnqhuAKfKdoLXC6OF2yLMgsfAMBmXg7XI_zplV4gBqNOvlJdgCxlP0Zjm4GsRsmprf'
-    }
+    CLIENT_APPS=['aspera.global-cli-client','aspera.drive']
+    DATA_REPO_INDEX_START = 4
+
     # path in URL of public links
     PATHS_PUBLIC_LINK=['/packages/public/receive','/packages/public/send','/files/public']
     JWT_AUDIENCE='https://api.asperafiles.com/api/v1/oauth2/token'
@@ -30,7 +27,7 @@ module Aspera
       'fasp_port'   => 33001
     }
 
-    private_constant :PRODUCT_NAME,:PROD_DOMAIN,:MAX_REDIRECT,:DEFAULT_CLIENT,:CLIENT_RANDOM,:PATHS_PUBLIC_LINK,:JWT_AUDIENCE,:OAUTH_API_SUBPATH,:DEFAULT_TSPEC_INFO
+    private_constant :PRODUCT_NAME,:PROD_DOMAIN,:MAX_REDIRECT,:CLIENT_APPS,:PATHS_PUBLIC_LINK,:JWT_AUDIENCE,:OAUTH_API_SUBPATH,:DEFAULT_TSPEC_INFO
 
     public
     # various API scopes supported
@@ -45,9 +42,16 @@ module Aspera
     FILES_APP='files'
     PACKAGES_APP='packages'
 
-    def self.get_client_ids(id,secret,client_name=DEFAULT_CLIENT)
-      return id,secret unless id.nil? and secret.nil?
-      return client_name,CLIENT_RANDOM[client_name].reverse
+    CLIENT_RANDOM={
+      'aspera.global-cli-client' => 'frpmsRsG4mjZ0PlxCgdJlvONqBg4Vlpz_IX7gXmBMAfsgMLy2FO6CXLodKfKAuhqnCqSptLbe_wdmnm9JRuEPO-PpFqpq_Kb',
+      'aspera.drive' => 'UegzQ3LcbLht5dLYAXaR-7ZMnJ6-kwPEXWEXaqLSOMGmtzNA9r6kPFLElqBfq66BfgMabdO96k5sPXV-H8M3vsx9LbGlewF1'
+    }
+
+    def self.get_client_info(client_name=CLIENT_APPS.first)
+      client_index=CLIENT_APPS.index(client_name)
+      raise "no such pre-defined client: #{client_name}" if client_index.nil?
+      # strings /Applications/Aspera\ Drive.app/Contents/MacOS/AsperaDrive|grep -E '.{100}==$'|base64 --decode
+      return client_name,Base64.urlsafe_encode64(DataRepository.instance.get_bin(DATA_REPO_INDEX_START+client_index))
     end
 
     # @param url of AoC instance
@@ -149,13 +153,18 @@ module Aspera
       aoc_rest_p[:base_url]="#{api_base_url}/#{opt[:subpath]}"
       # base auth URL
       aoc_auth_p[:base_url] = "#{api_base_url}/#{OAUTH_API_SUBPATH}/#{organization}"
+      aoc_auth_p[:client_id]=opt[:client_id]
+      aoc_auth_p[:client_secret] = opt[:client_secret]
 
       if !aoc_auth_p.has_key?(:grant)
         raise ArgumentError,"Missing mandatory option: auth" if opt[:auth].nil?
         aoc_auth_p[:grant] = opt[:auth]
       end
 
-      aoc_auth_p[:client_id],aoc_auth_p[:client_secret] = self.class.get_client_ids(opt[:client_id],opt[:client_secret])
+      if aoc_auth_p[:client_id].nil?
+        aoc_auth_p[:client_id],aoc_auth_p[:client_secret] = self.class.get_client_info()
+      end
+
       raise ArgumentError,"Missing mandatory option: scope" if opt[:scope].nil?
       aoc_auth_p[:scope] = opt[:scope]
 
@@ -166,7 +175,7 @@ module Aspera
         aoc_auth_p[:redirect_uri] = opt[:redirect_uri]
       when :jwt
         # add jwt payload for global ids
-        if CLIENT_RANDOM.keys.include?(aoc_auth_p[:client_id])
+        if CLIENT_APPS.include?(aoc_auth_p[:client_id])
           aoc_auth_p.merge!({:jwt_add=>{org: organization}})
         end
         raise ArgumentError,"Missing mandatory option: private_key" if opt[:private_key].nil?
@@ -417,5 +426,5 @@ module Aspera
       return {node_info: current_node_info, file_id: current_file_id}
     end
 
-  end # OnCloud
+  end # AoC
 end # Aspera

data/lib/aspera/cli/main.rb

@@ -76,6 +76,7 @@ module Aspera
         @plugin_env[:persistency]=PersistencyFolder.new(File.join(@plugin_env[:config].main_folder,'persist_store'))
         Oauth.persist_mgr=@plugin_env[:persistency]
         Fasp::Parameters.file_list_folder=File.join(@plugin_env[:config].main_folder,'filelists')
+        Aspera::RestErrorAnalyzer.instance.log_file=File.join(@plugin_env[:config].main_folder,'rest_exceptions.log')
         # register aspera REST call error handlers
         Aspera::RestErrorsAspera.registerHandlers
       end

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

@@ -1,5 +1,5 @@
 require 'aspera/rest'
-require 'aspera/on_cloud'
+require 'aspera/aoc'
 
 module Aspera
   module Cli
@@ -14,7 +14,7 @@ module Aspera
           when :entitlement
             entitlement_id = self.options.get_option(:username,:mandatory),
             customer_id = self.options.get_option(:password,:mandatory)
-            api_metering=OnCloud.metering_api(entitlement_id,customer_id)
+            api_metering=AoC.metering_api(entitlement_id,customer_id)
             return {:type=>:single_object, :data=>api_metering.read('entitlement')[:data]}
           end
         end

data/lib/aspera/cli/plugins/{oncloud.rb → aoc.rb}

@@ -2,7 +2,7 @@ require 'aspera/cli/plugins/node'
 require 'aspera/cli/plugins/ats'
 require 'aspera/cli/basic_auth_plugin'
 require 'aspera/cli/transfer_agent'
-require 'aspera/on_cloud'
+require 'aspera/aoc'
 require 'aspera/persistency_action_once'
 require 'securerandom'
 require 'resolv'
@@ -47,10 +47,10 @@ module Aspera
           self.options.set_option(:new_user_option,{'package_contact'=>true})
           self.options.set_option(:operation,:push)
           self.options.set_option(:auth,:jwt)
-          self.options.set_option(:scope,OnCloud::SCOPE_FILES_USER)
+          self.options.set_option(:scope,AoC::SCOPE_FILES_USER)
           self.options.set_option(:private_key,'@file:'+env[:private_key_path]) if env[:private_key_path].is_a?(String)
           self.options.parse_options!
-          OnCloud.set_use_default_ports(self.options.get_option(:default_ports))
+          AoC.set_use_default_ports(self.options.get_option(:default_ports))
           return if env[:man_only]
           update_aoc_api
         end
@@ -79,8 +79,8 @@ module Aspera
 
         # starts transfer using transfer agent
         def transfer_start(app,direction,node_file,ts_add)
-          ts_add.deep_merge!(OnCloud.analytics_ts(app,direction,@workspace_id,@workspace_name))
-          ts_add.deep_merge!(OnCloud.console_ts(app,user_info['name'],user_info['email']))
+          ts_add.deep_merge!(AoC.analytics_ts(app,direction,@workspace_id,@workspace_name))
+          ts_add.deep_merge!(AoC.console_ts(app,user_info['name'],user_info['email']))
           return self.transfer.start(*@api_aoc.tr_spec(app,direction,node_file,ts_add))
         end
 
@@ -96,12 +96,12 @@ module Aspera
           when :bearer_token_node
             thepath=self.options.get_next_argument('path')
             node_file = @api_aoc.resolve_node_file(top_node_file,thepath)
-            node_api=@api_aoc.get_node_api(node_file[:node_info],OnCloud::SCOPE_NODE_USER)
+            node_api=@api_aoc.get_node_api(node_file[:node_info],AoC::SCOPE_NODE_USER)
             return Main.result_status(node_api.oauth_token)
           when :browse
             thepath=self.options.get_next_argument('path')
             node_file = @api_aoc.resolve_node_file(top_node_file,thepath)
-            node_api=@api_aoc.get_node_api(node_file[:node_info],OnCloud::SCOPE_NODE_USER)
+            node_api=@api_aoc.get_node_api(node_file[:node_info],AoC::SCOPE_NODE_USER)
             file_info = node_api.read("files/#{node_file[:file_id]}")[:data]
             if file_info['type'].eql?('folder')
               result=node_api.read("files/#{node_file[:file_id]}/files",self.options.get_option(:value,:optional))
@@ -124,17 +124,17 @@ module Aspera
             return {:type=>:object_list,:data=>@api_aoc.find_files(node_file,test_block),:fields=>['path']}
           when :mkdir
             thepath=self.options.get_next_argument('path')
-            containing_folder_path = thepath.split(OnCloud::PATH_SEPARATOR)
+            containing_folder_path = thepath.split(AoC::PATH_SEPARATOR)
             new_folder=containing_folder_path.pop
-            node_file = @api_aoc.resolve_node_file(top_node_file,containing_folder_path.join(OnCloud::PATH_SEPARATOR))
-            node_api=@api_aoc.get_node_api(node_file[:node_info],OnCloud::SCOPE_NODE_USER)
+            node_file = @api_aoc.resolve_node_file(top_node_file,containing_folder_path.join(AoC::PATH_SEPARATOR))
+            node_api=@api_aoc.get_node_api(node_file[:node_info],AoC::SCOPE_NODE_USER)
             result=node_api.create("files/#{node_file[:file_id]}/files",{:name=>new_folder,:type=>:folder})[:data]
             return Main.result_status("created: #{result['name']} (id=#{result['id']})")
           when :rename
             thepath=self.options.get_next_argument('source path')
             newname=self.options.get_next_argument('new name')
             node_file = @api_aoc.resolve_node_file(top_node_file,thepath)
-            node_api=@api_aoc.get_node_api(node_file[:node_info],OnCloud::SCOPE_NODE_USER)
+            node_api=@api_aoc.get_node_api(node_file[:node_info],AoC::SCOPE_NODE_USER)
             result=node_api.update("files/#{node_file[:file_id]}",{:name=>newname})[:data]
             return Main.result_status("renamed #{thepath} to #{newname}")
           when :delete
@@ -142,7 +142,7 @@ module Aspera
             return do_bulk_operation(thepath,'deleted','path') do |thepath|
               raise "expecting String (path), got #{thepath.class.name} (#{thepath})" unless thepath.is_a?(String)
               node_file = @api_aoc.resolve_node_file(top_node_file,thepath)
-              node_api=@api_aoc.get_node_api(node_file[:node_info],OnCloud::SCOPE_NODE_USER)
+              node_api=@api_aoc.get_node_api(node_file[:node_info],AoC::SCOPE_NODE_USER)
               result=node_api.delete("files/#{node_file[:file_id]}")[:data]
               {'path'=>thepath}
             end
@@ -165,63 +165,63 @@ module Aspera
             client_node_file = @api_aoc.resolve_node_file(client_home_node_file,client_folder)
             server_node_file = @api_aoc.resolve_node_file(server_home_node_file,server_folder)
             # force node as transfer agent
-            @agents[:transfer].set_agent_instance(Fasp::Node.new(@api_aoc.get_node_api(client_node_file[:node_info],OnCloud::SCOPE_NODE_USER)))
+            @agents[:transfer].set_agent_instance(Fasp::Node.new(@api_aoc.get_node_api(client_node_file[:node_info],AoC::SCOPE_NODE_USER)))
             # additional node to node TS info
             add_ts={
               'remote_access_key'   => server_node_file[:node_info]['access_key'],
               'destination_root_id' => server_node_file[:file_id],
               'source_root_id'      => client_node_file[:file_id]
             }
-            return Main.result_transfer(transfer_start(OnCloud::FILES_APP,client_tr_oper,server_node_file,add_ts))
+            return Main.result_transfer(transfer_start(AoC::FILES_APP,client_tr_oper,server_node_file,add_ts))
           when :upload
             node_file = @api_aoc.resolve_node_file(top_node_file,self.transfer.destination_folder('send'))
             add_ts={'tags'=>{'aspera'=>{'files'=>{'parentCwd'=>"#{node_file[:node_info]['id']}:#{node_file[:file_id]}"}}}}
-            return Main.result_transfer(transfer_start(OnCloud::FILES_APP,'send',node_file,add_ts))
+            return Main.result_transfer(transfer_start(AoC::FILES_APP,'send',node_file,add_ts))
           when :download
             source_paths=self.transfer.ts_source_paths
             # special case for AoC : all files must be in same folder
             source_folder=source_paths.shift['source']
             # if a single file: split into folder and path
             if source_paths.empty?
-              source_folder=source_folder.split(OnCloud::PATH_SEPARATOR)
+              source_folder=source_folder.split(AoC::PATH_SEPARATOR)
               source_paths=[{'source'=>source_folder.pop}]
-              source_folder=source_folder.join(OnCloud::PATH_SEPARATOR)
+              source_folder=source_folder.join(AoC::PATH_SEPARATOR)
             end
             node_file = @api_aoc.resolve_node_file(top_node_file,source_folder)
             # override paths with just filename
             add_ts={'tags'=>{'aspera'=>{'files'=>{'parentCwd'=>"#{node_file[:node_info]['id']}:#{node_file[:file_id]}"}}}}
             add_ts.merge!({'paths'=>source_paths})
-            return Main.result_transfer(transfer_start(OnCloud::FILES_APP,'receive',node_file,add_ts))
+            return Main.result_transfer(transfer_start(AoC::FILES_APP,'receive',node_file,add_ts))
           when :http_node_download
             source_paths=self.transfer.ts_source_paths
             source_folder=source_paths.shift['source']
             if source_paths.empty?
-              source_folder=source_folder.split(OnCloud::PATH_SEPARATOR)
+              source_folder=source_folder.split(AoC::PATH_SEPARATOR)
               source_paths=[{'source'=>source_folder.pop}]
-              source_folder=source_folder.join(OnCloud::PATH_SEPARATOR)
+              source_folder=source_folder.join(AoC::PATH_SEPARATOR)
             end
             raise CliBadArgument,'one file at a time only in HTTP mode' if source_paths.length > 1
             file_name = source_paths.first['source']
             node_file = @api_aoc.resolve_node_file(top_node_file,File.join(source_folder,file_name))
-            node_api=@api_aoc.get_node_api(node_file[:node_info],OnCloud::SCOPE_NODE_USER)
+            node_api=@api_aoc.get_node_api(node_file[:node_info],AoC::SCOPE_NODE_USER)
             node_api.call({:operation=>'GET',:subpath=>"files/#{node_file[:file_id]}/content",:save_to_file=>File.join(self.transfer.destination_folder('receive'),file_name)})
             return Main.result_status("downloaded: #{file_name}")
           when :v3
             # Note: other "common" actions are unauthorized with user scope
             command_legacy=self.options.get_next_command(Node::SIMPLE_ACTIONS)
             # TODO: shall we support all methods here ? what if there is a link ?
-            node_api=@api_aoc.get_node_api(top_node_file[:node_info],OnCloud::SCOPE_NODE_USER)
+            node_api=@api_aoc.get_node_api(top_node_file[:node_info],AoC::SCOPE_NODE_USER)
             return Node.new(@agents.merge(skip_basic_auth_options: true, node_api: node_api)).execute_action(command_legacy)
           when :file
             fileid=self.options.get_next_argument('file id')
             node_file = @api_aoc.resolve_node_file(top_node_file)
-            node_api=@api_aoc.get_node_api(node_file[:node_info],OnCloud::SCOPE_NODE_USER)
+            node_api=@api_aoc.get_node_api(node_file[:node_info],AoC::SCOPE_NODE_USER)
             items=node_api.read("files/#{fileid}")[:data]
             return {:type=>:single_object,:data=>items}
           when :permissions
             fileid=self.options.get_next_argument('file id')
             node_file = @api_aoc.resolve_node_file(top_node_file)
-            node_api=@api_aoc.get_node_api(node_file[:node_info],OnCloud::SCOPE_NODE_USER)
+            node_api=@api_aoc.get_node_api(node_file[:node_info],AoC::SCOPE_NODE_USER)
             command_perms=self.options.get_next_command([:show,:create])
             case command_perms
             when :show
@@ -258,8 +258,8 @@ module Aspera
           throw "ERR"
         end # execute_node_gen4_command
 
-        # build constructor option list for OnCloud based on options of CLI
-        def oncloud_params(subpath)
+        # build constructor option list for AoC based on options of CLI
+        def aoc_params(subpath)
           # copy command line options to args
           opt=[:link,:url,:auth,:client_id,:client_secret,:scope,:redirect_uri,:private_key,:username].inject({}){|m,i|m[i]=self.options.get_option(i,:optional);m}
           opt[:subpath]=subpath
@@ -270,7 +270,7 @@ module Aspera
         # Parameters based on command line options
         # @return nil
         def update_aoc_api
-          @api_aoc=OnCloud.new(oncloud_params('api/v1'))
+          @api_aoc=AoC.new(aoc_params('api/v1'))
           # add access key secrets
           @api_aoc.add_secrets(self.config.get_secrets)
           return nil
@@ -420,7 +420,7 @@ module Aspera
         end
 
         def execute_admin_action
-          self.options.set_option(:scope,OnCloud::SCOPE_FILES_ADMIN)
+          self.options.set_option(:scope,AoC::SCOPE_FILES_ADMIN)
           update_aoc_api
           command_admin=self.options.get_next_command([ :ats, :resource, :usage_reports, :analytics, :subscription, :auth_providers ])
           case command_admin
@@ -434,7 +434,7 @@ module Aspera
             end
           when :subscription
             org=@api_aoc.read('organization')[:data]
-            bss_api=OnCloud.new(oncloud_params('bss/platform'))
+            bss_api=AoC.new(aoc_params('bss/platform'))
             graphql_query="
     query ($organization_id: ID!) {
       aoc (organization_id: $organization_id) {
@@ -488,7 +488,7 @@ module Aspera
           when :ats
             ats_api = Rest.new(@api_aoc.params.deep_merge({
               :base_url => @api_aoc.params[:base_url]+'/admin/ats/pub/v1',
-              :auth     => {:scope => OnCloud::SCOPE_FILES_ADMIN_USER}
+              :auth     => {:scope => AoC::SCOPE_FILES_ADMIN_USER}
             }))
             return @ats.execute_action_gen(ats_api)
             #          when :search_nodes
@@ -507,7 +507,7 @@ module Aspera
           when :analytics
             analytics_api = Rest.new(@api_aoc.params.deep_merge({
               :base_url => @api_aoc.params[:base_url].gsub('/api/v1','')+'/analytics/v2',
-              :auth     => {:scope => OnCloud::SCOPE_FILES_ADMIN_USER}
+              :auth     => {:scope => AoC::SCOPE_FILES_ADMIN_USER}
             }))
             command_analytics=self.options.get_next_command([ :application_events, :transfers ])
             case command_analytics
@@ -750,7 +750,7 @@ module Aspera
               # execute transfer
               node_file = {node_info: node_info, file_id: package_info['contents_file_id']}
               # raise esception if at least one error
-              Main.result_transfer(transfer_start(OnCloud::PACKAGES_APP,'send',node_file,OnCloud.package_tags(package_info,'upload')))
+              Main.result_transfer(transfer_start(AoC::PACKAGES_APP,'send',node_file,AoC.package_tags(package_info,'upload')))
               # return all info on package
               return { :type=>:single_object, :data =>package_info}
             when :recv
@@ -786,7 +786,7 @@ module Aspera
                 self.format.display_status("downloading package: #{package_info['name']}")
                 add_ts={'paths'=>[{'source'=>'.'}]}
                 node_file = {node_info: node_info, file_id: package_info['contents_file_id']}
-                statuses=transfer_start(OnCloud::PACKAGES_APP,'receive',node_file,OnCloud.package_tags(package_info,'download').merge(add_ts))
+                statuses=transfer_start(AoC::PACKAGES_APP,'receive',node_file,AoC.package_tags(package_info,'download').merge(add_ts))
                 result_transfer.push({'package'=>package_id,'status'=>statuses.map{|i|i.to_s}.join(',')})
                 # update skip list only if all transfer sessions completed
                 if TransferAgent.session_status(statuses).eql?(:success)
@@ -861,7 +861,7 @@ module Aspera
               end
               result=self.entity_action(@api_aoc,'short_links',nil,:id,'self')
               if result[:data].is_a?(Hash) and result[:data].has_key?('created_at') and result[:data]['resource_type'].eql?('UrlToken')
-                node_api=@api_aoc.get_node_api(node_file[:node_info],OnCloud::SCOPE_NODE_USER)
+                node_api=@api_aoc.get_node_api(node_file[:node_info],AoC::SCOPE_NODE_USER)
                 perm_data={
                   "file_id"      =>node_file[:file_id],
                   "access_type"  =>"user",