morpheus-cli 3.6.9 → 3.6.11

data/lib/morpheus/cli/tasks.rb

@@ -37,6 +37,7 @@ class Morpheus::Cli::Tasks
     connect(options)
     begin
       params.merge!(parse_list_options(options))
+      @tasks_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @tasks_interface.dry.get(params)
         return
@@ -94,6 +95,7 @@ class Morpheus::Cli::Tasks
   def _get(id, options)
     task_name = id
     begin
+      @tasks_interface.setopts(options)
       if options[:dry_run]
         if task_name.to_s =~ /\A\d{1,}\Z/
           print_dry_run @tasks_interface.dry.get(task_name.to_i)
@@ -196,6 +198,7 @@ class Morpheus::Cli::Tasks
       end
 
       payload = {task: task_payload}
+      @tasks_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @tasks_interface.dry.update(task['id'], payload)
         return
@@ -226,6 +229,7 @@ class Morpheus::Cli::Tasks
     optparse.parse!(args)
     connect(options)
     begin
+      @tasks_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @tasks_interface.dry.task_types()
         return
@@ -312,6 +316,7 @@ class Morpheus::Cli::Tasks
         input_options = Morpheus::Cli::OptionTypes.prompt(task_type['optionTypes'],options[:options],@api_client, options[:params])
         payload = {task: {name: task_name, taskOptions: input_options['taskOptions'], taskType: {code: task_type['code'], id: task_type['id']}}}
       end
+      @tasks_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @tasks_interface.dry.create(payload)
         return
@@ -354,6 +359,7 @@ class Morpheus::Cli::Tasks
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the task #{task['name']}?")
         exit
       end
+      @tasks_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @tasks_interface.dry.destroy(task['id'], params)
         return

data/lib/morpheus/cli/tenants_command.rb

@@ -43,13 +43,14 @@ class Morpheus::Cli::TenantsCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       build_common_options(opts, options, [:list, :query, :json, :remote, :dry_run])
-      opts.footer = "List tenants."
+      opts.footer = "List tenants (accounts)."
     end
     optparse.parse!(args)
     connect(options)
     begin
       params = {}
       params.merge!(parse_list_options(options))
+      @accounts_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @accounts_interface.dry.list(params)
         return
@@ -90,6 +91,7 @@ class Morpheus::Cli::TenantsCommand
     begin
       params = {}
       params.merge!(parse_list_options(options))
+      @accounts_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @accounts_interface.dry.list(params)
         return
@@ -114,12 +116,12 @@ class Morpheus::Cli::TenantsCommand
       build_common_options(opts, options, [:json, :remote, :dry_run])
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(', ')}\n#{optparse}"
     end
     connect(options)
     begin
+      @accounts_interface.setopts(options)
       if options[:dry_run]
         if args[0].to_s =~ /\A\d{1,}\Z/
           print_dry_run @accounts_interface.dry.get(args[0].to_i)
@@ -130,12 +132,11 @@ class Morpheus::Cli::TenantsCommand
       end
       account = find_account_by_name_or_id(args[0])
       exit 1 if account.nil?
-
       if options[:json]
         print JSON.pretty_generate({account: account})
         print "\n"
       else
-        print_h1 "Account Details"
+        print_h1 "Tenant Details"
         print cyan
         puts "ID: #{account['id']}"
         puts "Name: #{account['name']}"
@@ -206,6 +207,7 @@ class Morpheus::Cli::TenantsCommand
         puts as_json(payload, options)
         return 0
       end
+      @accounts_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @accounts_interface.dry.create(payload)
         return
@@ -215,7 +217,7 @@ class Morpheus::Cli::TenantsCommand
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-        print_green_success "Account #{account_payload['name']} added"
+        print_green_success "Tenant #{account_payload['name']} added"
         get([account_payload["name"]])
       end
 
@@ -271,6 +273,7 @@ class Morpheus::Cli::TenantsCommand
         puts as_json(payload, options)
         return 0
       end
+      @accounts_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @accounts_interface.dry.update(account['id'], payload)
         return
@@ -282,7 +285,7 @@ class Morpheus::Cli::TenantsCommand
         print "\n"
       else
         account_name = account_payload['name'] || account['name']
-        print_green_success "Account #{account_name} updated"
+        print_green_success "Tenant #{account_name} updated"
         get([account_name])
       end
     rescue RestClient::Exception => e
@@ -314,6 +317,7 @@ class Morpheus::Cli::TenantsCommand
         puts as_json(payload, options)
         return 0
       end
+      @accounts_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @accounts_interface.dry.destroy(account['id'])
         return
@@ -323,7 +327,7 @@ class Morpheus::Cli::TenantsCommand
         print JSON.pretty_generate(json_response)
         print "\n"
       else
-        print_green_success "Account #{account['name']} removed"
+        print_green_success "Tenant #{account['name']} removed"
       end
 
     rescue RestClient::Exception => e

data/lib/morpheus/cli/user_groups_command.rb

@@ -32,6 +32,7 @@ class Morpheus::Cli::UserGroupsCommand
     connect(options)
     begin
       params.merge!(parse_list_options(options))
+      @user_groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_groups_interface.dry.list(nil, params)
         return
@@ -91,6 +92,7 @@ class Morpheus::Cli::UserGroupsCommand
       if user_group.nil?
         return 1
       end
+      @user_groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_groups_interface.dry.get(nil, user_group['id'])
         return
@@ -209,6 +211,7 @@ class Morpheus::Cli::UserGroupsCommand
         # todo: prompt?
         payload = {'userGroup' => params}
       end
+      @user_groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_groups_interface.dry.create(nil, payload)
         return
@@ -289,6 +292,7 @@ class Morpheus::Cli::UserGroupsCommand
         # todo: prompt?
         payload = {'userGroup' => params}
       end
+      @user_groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_groups_interface.dry.update(nil, user_group["id"], payload)
         return
@@ -350,6 +354,7 @@ class Morpheus::Cli::UserGroupsCommand
         user_group_payload['users'] = new_user_ids
         payload = {'userGroup' => user_group_payload}
       end
+      @user_groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_groups_interface.dry.update(nil, user_group["id"], payload)
         return 0
@@ -414,6 +419,7 @@ class Morpheus::Cli::UserGroupsCommand
         user_group_payload['users'] = new_user_ids
         payload = {'userGroup' => user_group_payload}
       end
+      @user_groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_groups_interface.dry.update(nil, user_group["id"], payload)
         return 0
@@ -465,7 +471,7 @@ class Morpheus::Cli::UserGroupsCommand
       # }
       # payload['userGroup'].merge!(user_group)
       payload = params
-
+      @user_groups_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_groups_interface.dry.destroy(nil, user_group["id"])
         return

data/lib/morpheus/cli/user_settings_command.rb

@@ -41,6 +41,7 @@ class Morpheus::Cli::UserSettingsCommand
     
     begin
       params.merge!(parse_list_options(options))
+      @user_settings_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_settings_interface.dry.get(params)
         return
@@ -129,7 +130,7 @@ class Morpheus::Cli::UserSettingsCommand
         payload['user'] ||= {}
         payload['user'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
       end
-
+      @user_settings_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_settings_interface.dry.update(params, payload)
         return
@@ -179,6 +180,7 @@ class Morpheus::Cli::UserSettingsCommand
     end
     
     begin
+      @user_settings_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_settings_interface.dry.update_avatar(image_file, params)
         return
@@ -217,6 +219,7 @@ class Morpheus::Cli::UserSettingsCommand
     end
     
     begin
+      @user_settings_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_settings_interface.dry.remove_avatar(params)
         return
@@ -302,6 +305,7 @@ class Morpheus::Cli::UserSettingsCommand
     params['clientId'] = args[0]
     begin
       payload = {}
+      @user_settings_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_settings_interface.dry.regenerate_access_token(params, payload)
         return
@@ -350,6 +354,7 @@ class Morpheus::Cli::UserSettingsCommand
     params['clientId'] = args[0]
     begin
       payload = {}
+      @user_settings_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_settings_interface.dry.clear_access_token(params, payload)
         return
@@ -397,6 +402,7 @@ class Morpheus::Cli::UserSettingsCommand
     
     begin
       params.merge!(parse_list_options(options))
+      @user_settings_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_settings_interface.dry.available_clients(params)
         return

data/lib/morpheus/cli/user_sources_command.rb

@@ -63,7 +63,7 @@ class Morpheus::Cli::UserSourcesCommand
       end
       
       params.merge!(parse_list_options(options))
-
+      @user_sources_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_sources_interface.dry.list(account_id, params)
         return
@@ -130,6 +130,7 @@ class Morpheus::Cli::UserSourcesCommand
     # account_id = account['id']
     # user_source_id = args[1]
     begin
+      @user_sources_interface.setopts(options)
       if options[:dry_run]
         if user_source_id.to_s =~ /\A\d{1,}\Z/
           print_dry_run @user_sources_interface.dry.get(account_id, user_source_id.to_i)
@@ -352,7 +353,7 @@ class Morpheus::Cli::UserSourcesCommand
         
 
       end
-      # dry run?
+      @user_sources_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_sources_interface.dry.create(account_id, payload)
         return
@@ -447,7 +448,7 @@ class Morpheus::Cli::UserSourcesCommand
         payload['userSource'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
 
       end
-
+      @user_sources_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_sources_interface.dry.update(nil, user_source['id'], payload)
         return
@@ -497,7 +498,7 @@ class Morpheus::Cli::UserSourcesCommand
         # support old -O options
         payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
       end
-
+      @user_sources_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_sources_interface.dry.activate(nil, user_source['id'], payload)
         return
@@ -547,7 +548,7 @@ class Morpheus::Cli::UserSourcesCommand
         # support old -O options
         payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
       end
-
+      @user_sources_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_sources_interface.dry.deactivate(nil, user_source['id'], payload)
         return
@@ -599,7 +600,7 @@ class Morpheus::Cli::UserSourcesCommand
         # support old -O options
         payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
       end
-
+      @user_sources_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_sources_interface.dry.update_subdomain(nil, user_source['id'], payload)
         return
@@ -641,6 +642,7 @@ class Morpheus::Cli::UserSourcesCommand
       unless Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the user source #{user_source['name']}?", options)
         exit
       end
+      @user_sources_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_sources_interface.dry.destroy(nil, user_source['id'])
         return
@@ -682,7 +684,7 @@ class Morpheus::Cli::UserSourcesCommand
     begin
       # construct payload
       params.merge!(parse_list_options(options))
-
+      @user_sources_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_sources_interface.dry.list_types(params)
         return
@@ -749,7 +751,7 @@ class Morpheus::Cli::UserSourcesCommand
       # end
 
       # construct payload
-
+      @user_sources_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @user_sources_interface.dry.list_types(user_source_type_id, params)
         return

data/lib/morpheus/cli/users.rb

@@ -47,6 +47,7 @@ class Morpheus::Cli::Users
 
       params = {}
       params.merge!(parse_list_options(options))
+      @users_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @users_interface.dry.list(account_id, params)
         return
@@ -98,6 +99,7 @@ class Morpheus::Cli::Users
       account_id = account ? account['id'] : nil
       params = {}
       params.merge!(parse_list_options(options))
+      @users_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @users_interface.dry.list(account_id, params)
         return
@@ -152,6 +154,7 @@ class Morpheus::Cli::Users
     begin
       account = find_account_from_options(options)
       account_id = account ? account['id'] : nil
+      @users_interface.setopts(options)
       if options[:dry_run]
         if args[0].to_s =~ /\A\d{1,}\Z/
           print_dry_run @users_interface.dry.get(account_id, args[0].to_i)
@@ -280,6 +283,7 @@ class Morpheus::Cli::Users
         puts as_json(payload, options)
         return 0
       end
+      @users_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @users_interface.dry.create(account_id, payload)
         return
@@ -370,7 +374,7 @@ class Morpheus::Cli::Users
 
         payload = {'user' => params}
       end
-
+      @users_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @users_interface.dry.update(account_id, user['id'], payload)
         return
@@ -452,7 +456,7 @@ class Morpheus::Cli::Users
           'password' => new_password
         } 
       }
-      
+      @users_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @users_interface.dry.update(account_id, user['id'], payload)
         return
@@ -496,6 +500,7 @@ class Morpheus::Cli::Users
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the user #{user['username']}?")
         exit
       end
+      @users_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @users_interface.dry.destroy(account_id, user['id'])
         return

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.6.9"
+    VERSION = "3.6.11"
   end
 end

data/lib/morpheus/cli/virtual_images.rb

@@ -57,6 +57,7 @@ class Morpheus::Cli::VirtualImages
       if options[:filterType]
         params[:filterType] = options[:filterType]
       end
+      @virtual_images_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @virtual_images_interface.dry.get(params)
         return
@@ -131,6 +132,7 @@ class Morpheus::Cli::VirtualImages
     image_name = args[0]
     connect(options)
     begin
+      @virtual_images_interface.setopts(options)
       if options[:dry_run]
         if args[0].to_s =~ /\A\d{1,}\Z/
           print_dry_run @virtual_images_interface.dry.get(args[0].to_i)
@@ -264,6 +266,7 @@ class Morpheus::Cli::VirtualImages
         end
         payload = {'virtualImage' => params}
       end
+      @virtual_images_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @virtual_images_interface.dry.update(image['id'], payload)
         return
@@ -293,6 +296,7 @@ class Morpheus::Cli::VirtualImages
     connect(options)
     begin
       params = {}
+      @virtual_images_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @virtual_images_interface.dry.virtual_image_types(params)
         return
@@ -399,7 +403,7 @@ class Morpheus::Cli::VirtualImages
         virtual_image_payload['accounts'] = tenants_list
       end
       payload = {virtualImage: virtual_image_payload}
-
+      @virtual_images_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @virtual_images_interface.dry.create(payload)
         if file_url
@@ -497,6 +501,7 @@ class Morpheus::Cli::VirtualImages
     begin
       image = find_virtual_image_by_name_or_id(image_name)
       return 1 if image.nil?
+      @virtual_images_interface.setopts(options)
       if file_url
         if options[:dry_run]
           print_dry_run @virtual_images_interface.dry.upload_by_url(image['id'], file_url, file_name)
@@ -556,6 +561,7 @@ class Morpheus::Cli::VirtualImages
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the virtual image filename #{filename}?")
         exit
       end
+      @virtual_images_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @virtual_images_interface.dry.destroy_file(image['id'], filename)
         return
@@ -591,6 +597,7 @@ class Morpheus::Cli::VirtualImages
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the virtual image #{image['name']}?")
         exit
       end
+      @virtual_images_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @virtual_images_interface.dry.destroy(image['id'])
         return