morpheus-cli 5.3.0 → 5.3.1.1

data/lib/morpheus/cli/security_group_rules.rb

@@ -16,7 +16,7 @@ class Morpheus::Cli::SecurityGroupRules
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @security_group_rules_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).security_group_rules
+    @security_group_rules_interface = @api_client.security_group_rules
     @active_security_group = ::Morpheus::Cli::SecurityGroups.load_security_group_file
   end
 

data/lib/morpheus/cli/service_plans_command.rb

@@ -427,7 +427,10 @@ class Morpheus::Cli::ServicePlanCommand
         # permissions
         if !options[:no_prompt]
           perms = prompt_permissions(options, ['plans', 'groupDefaults'])
-          params['visibility'] = perms.delete('resourcePool')['visibility']
+          if perms['resourcePool'] && !perms['resourcePool']['visibility'].nil?
+            params['visibility'] = perms['resourcePool']['visibility']
+          end
+          perms.delete('resourcePool')
           params['permissions'] = perms
         end
         payload = {'servicePlan' => params}

data/lib/morpheus/cli/setup.rb

@@ -61,7 +61,6 @@ EOT
       payload.deep_merge!(parse_passed_options(options))
 
       # JD: This should just do a Remote.check_appliance() first... needs to work with --remote-url though.
-      # @setup_interface = Morpheus::SetupInterface.new({url:@appliance_url,access_token:@access_token})
       appliance_status_json = nil
       begin
         appliance_status_json = @setup_interface.get()

data/lib/morpheus/cli/subnets_command.rb

@@ -349,8 +349,8 @@ class Morpheus::Cli::SubnetsCommand
         subnet_type_option_types = subnet_type['optionTypes']
         if subnet_type_option_types && subnet_type_option_types.size > 0
           # prompt for option types
-          subnet_type_params = Morpheus::Cli::OptionTypes.prompt(subnet_type_option_types,options[:options],@api_client, {networkId: network['id']})
-          payload['subnet'].deep_merge!(subnet_type_params)
+          subnet_type_params = Morpheus::Cli::OptionTypes.prompt(subnet_type_option_types,options[:options],@api_client, {networkId: network['id'], zoneId: network['zone']['id']})
+          payload['subnet'].deep_merge!(subnet_type_params['subnet'])
 
         else
           # DEFAULT INPUTS
@@ -365,6 +365,14 @@ class Morpheus::Cli::SubnetsCommand
 
         end
 
+        # CIDR
+        if options['cidr']
+          payload['subnet']['cidr'] = options['cidr']
+        elsif !subnet_type['code'].include? 'azure'
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cidr', 'fieldLabel' => 'CIDR', 'type' => 'text', 'required' => true, 'description' => ''}], options)
+          payload['subnet']['cidr'] = v_prompt['cidr']
+        end
+
         # DHCP
         if options['dhcpServer']
           payload['subnet']['dhcpServer'] = options['dhcpServer']
@@ -432,6 +440,7 @@ class Morpheus::Cli::SubnetsCommand
         print_dry_run @subnets_interface.dry.create(network['id'], payload)
         return
       end
+
       json_response = @subnets_interface.create(network['id'], payload)
       if options[:json]
         puts as_json(json_response, options)

data/lib/morpheus/cli/tenants_command.rb

@@ -25,9 +25,9 @@ class Morpheus::Cli::TenantsCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @users_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).users
-    @accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
-    @roles_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).roles
+    @users_interface = @api_client.users
+    @accounts_interface = @api_client.accounts
+    @roles_interface = @api_client.roles
   end
 
   def handle(args)

data/lib/morpheus/cli/user_groups_command.rb

@@ -12,9 +12,9 @@ class Morpheus::Cli::UserGroupsCommand
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @user_groups_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).user_groups
-    @users_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).users
-    @accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
+    @user_groups_interface = @api_client.user_groups
+    @users_interface = @api_client.users
+    @accounts_interface = @api_client.accounts
   end
 
   def handle(args)

data/lib/morpheus/cli/user_settings_command.rb

@@ -6,7 +6,7 @@ class Morpheus::Cli::UserSettingsCommand
 
   set_command_name :'user-settings'
 
-  register_subcommands :get, :update, :'update-avatar', :'view-avatar', :'regenerate-access-token', :'clear-access-token', :'list-clients'
+  register_subcommands :get, :update, :'update-avatar', :'remove-avatar', :'view-avatar', :'update-desktop-background', :'remove-desktop-background', :'view-desktop-background', :'regenerate-access-token', :'clear-access-token', :'list-clients'
   
   set_default_subcommand :get
   
@@ -51,29 +51,20 @@ EOT
       return 1
     end
     
-    begin
-      if options[:user]
-        user = find_user_by_username_or_id(nil, options[:user], {global:true})
-        return 1 if user.nil?
-        params['userId'] = user['id']
-      end
-      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
-      end
-      json_response = @user_settings_interface.get(params)
-      if options[:json]
-        puts as_json(json_response, options, "user")
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "user")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv([json_response['user']], options)
-        return 0
-      end
+    if options[:user]
+      user = find_user_by_username_or_id(nil, options[:user], {global:true})
+      return 1 if user.nil?
+      params['userId'] = user['id']
+    end
+    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
+    end
+    json_response = @user_settings_interface.get(params)
+    
+    render_response(json_response, options) do
 
       user_settings = json_response['user'] || json_response['userSettings']
       access_tokens = user_settings['accessTokens'] || json_response['accessTokens'] || json_response['apiAccessTokens'] || []
@@ -94,7 +85,11 @@ EOT
         "Linux Key Pair" => lambda {|it| it['linuxKeyPairId'] },
         "Windows Username" => lambda {|it| it['windowsUsername'] },
         "Windows Password" => lambda {|it| it['windowsPassword'] },
+        "Default Group" => lambda {|it| it['defaultGroup'] ? it['defaultGroup']['name'] : '' },
+        "Default Cloud" => lambda {|it| it['defaultCloud'] ? it['defaultCloud']['name'] : '' },
         "Default Persona" => lambda {|it| it['defaultPersona'] ? it['defaultPersona']['name'] : '' },
+        "Desktop Background" => lambda {|it| it['desktopBackground'] ? it['desktopBackground'].split('/').last : '' },
+        "2FA Enabled" => lambda {|it| it['isUsing2FA'].nil? ? '' : format_boolean(it['isUsing2FA']) },
       }
       print_description_list(description_cols, user_settings)      
 
@@ -117,18 +112,15 @@ EOT
       end
       
       print reset #, "\n"
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
     end
+    return 0, nil
   end
 
 
   def update(args)
-    raw_args = args
     options = {}
     params = {}
+    query_params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[options]")
       opts.on("-u", "--user USER", "User username or ID") do |val|
@@ -138,7 +130,8 @@ EOT
         params['userId'] = val.to_s
       end
       #opts.add_hidden_option('--user-id')
-      build_common_options(opts, options, [:payload, :options, :json, :dry_run, :quiet, :remote])
+      build_option_type_options(opts, options, update_user_settings_option_types)
+      build_standard_update_options(opts, options)
       opts.footer = <<-EOT
 Update user settings.
 Done for the current user by default, unless a user is specified with the --user option.
@@ -152,29 +145,161 @@ EOT
       return 1
     end
     
+    if options[:user]
+      user = find_user_by_username_or_id(nil, options[:user], {global:true})
+      return 1 if user.nil?
+      params['userId'] = user['id']
+    end
+
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({'user' => parse_passed_options(options)})
+    else
+      params.deep_merge!(parse_passed_options(options))
+      # do not prompt on update
+      v_prompt = Morpheus::Cli::OptionTypes.no_prompt(update_user_settings_option_types, options[:options], @api_client, options[:params])
+      v_prompt.deep_compact!
+      params.deep_merge!(v_prompt)
+      # convert checkbox "on" and "off" to true and false
+      params.booleanize!
+      # upload requires multipart instead of json
+      if params['avatar']
+        params['avatar'] = File.new(File.expand_path(params['avatar']), 'rb')
+        payload[:multipart] = true
+      end
+      if params['desktopBackground']
+        params['desktopBackground'] = File.new(File.expand_path(params['desktopBackground']), 'rb')
+        payload[:multipart] = true
+      end
+      # userId goes in query string, not payload...
+      query_params['userId'] = params.delete('userId') if params.key?('userId')
+      payload.deep_merge!({'user' => params})
+      if payload['user'].empty? # || options[:no_prompt]
+        raise_command_error "Specify at least one option to update.\n#{optparse}"
+      end
+    end
+
+    @user_settings_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @user_settings_interface.dry.update(payload, query_params)
+      return
+    end
+    json_response = @user_settings_interface.update(payload, query_params)
+    render_response(json_response, options) do
+      print_green_success "Updated user settings"
+      get_args = [] + (options[:remote] ? ["-r",options[:remote]] : []) + (query_params['userId'] ? ['--user-id', query_params['userId'].to_s] : [])
+      get(get_args)
+    end
+    return 0, nil
+    
+  end
+
+  def update_avatar(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[file]")
+      opts.on("-u", "--user USER", "User username or ID") do |val|
+        options[:user] = val.to_s
+      end
+      opts.on("--user-id ID", String, "User ID") do |val|
+        params['userId'] = val.to_s
+      end
+      #opts.add_hidden_option('--user-id')
+      build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
+      opts.footer = <<-EOT
+Update avatar profile image.
+[file] is required. This is the local path of a file to upload [png|jpg|svg].
+Done for the current user by default, unless a user is specified with the --user option.
+EOT
+    end
+    optparse.parse!(args)
+    connect(options)
+    if args.count != 1
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error  "wrong number of arguments, expected 1 and got (#{args.count}) #{args.inspect}\n#{optparse}"
+      return 1
+    end
+    filename = File.expand_path(args[0].to_s)
+    image_file = nil
+    if filename && File.file?(filename)
+      # maybe validate it's an image file? [.png|jpg|svg]
+      image_file = File.new(filename, 'rb')
+    else
+      # print_red_alert "File not found: #{filename}"
+      puts_error "#{Morpheus::Terminal.angry_prompt}File not found: #{filename}"
+      return 1
+    end
+    
     begin
       if options[:user]
         user = find_user_by_username_or_id(nil, options[:user], {global:true})
         return 1 if user.nil?
         params['userId'] = user['id']
       end
-      payload = {}
-      if options[:payload]
-        payload = options[:payload]
-      else
-  
+      @user_settings_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @user_settings_interface.dry.update_avatar(image_file, params)
+        return
+      end
+      json_response = @user_settings_interface.update_avatar(image_file, params)
+      if options[:quiet]
+        return 0
+      elsif options[:json]
+        puts as_json(json_response, options)
+        return 0
       end
 
-      if options[:options]
-        payload['user'] ||= {}
-        payload['user'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
+      print_green_success "Updated avatar"
+      get_args = [] + (options[:remote] ? ["-r",options[:remote]] : []) + (params['userId'] ? ['--user-id', params['userId'].to_s] : [])
+      get(get_args)
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+
+  def remove_avatar(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage()
+      opts.on("-u", "--user USER", "User username or ID") do |val|
+        options[:user] = val.to_s
+      end
+      opts.on("--user-id ID", String, "User ID") do |val|
+        params['userId'] = val.to_s
+      end
+      #opts.add_hidden_option('--user-id')
+      build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
+      opts.footer = <<-EOT
+Remove avatar profile image.
+[file] is required. This is the local path of a file to upload [png|jpg|svg].
+Done for the current user by default, unless a user is specified with the --user option.
+EOT
+    end
+    optparse.parse!(args)
+    connect(options)
+    if args.count != 0
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error  "wrong number of arguments, expected 0 and got (#{args.count}) #{args.inspect}\n#{optparse}"
+      return 1
+    end
+    
+    begin
+      if options[:user]
+        user = find_user_by_username_or_id(nil, options[:user], {global:true})
+        return 1 if user.nil?
+        params['userId'] = user['id']
       end
       @user_settings_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @user_settings_interface.dry.update(params, payload)
+        print_dry_run @user_settings_interface.dry.remove_avatar(params)
         return
       end
-      json_response = @user_settings_interface.update(params, payload)
+      json_response = @user_settings_interface.remove_avatar(params)
       if options[:quiet]
         return 0
       elsif options[:json]
@@ -182,7 +307,7 @@ EOT
         return 0
       end
 
-      print_green_success "Updated user settings"
+      print_green_success "Removed avatar"
       get_args = [] + (options[:remote] ? ["-r",options[:remote]] : []) + (params['userId'] ? ['--user-id', params['userId'].to_s] : [])
       get(get_args)
       return 0
@@ -192,7 +317,65 @@ EOT
     end
   end
 
-  def update_avatar(args)
+  def view_avatar(args)
+    raw_args = args
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage()
+      opts.on("-u", "--user USER", "User username or ID") do |val|
+        options[:user] = val.to_s
+      end
+      opts.on("--user-id ID", String, "User ID") do |val|
+        params['userId'] = val.to_s
+      end
+      #opts.add_hidden_option('--user-id')
+      build_common_options(opts, options, [:remote])
+      opts.footer = <<-EOT
+View avatar profile image.
+This opens the avatar image url with a web browser.
+Done for the current user by default, unless a user is specified with the --user option.
+EOT
+    end
+    optparse.parse!(args)
+    connect(options)
+    if args.count != 0
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error  "wrong number of arguments, expected 0 and got (#{args.count}) #{args.inspect}\n#{optparse}"
+      return 1
+    end
+    
+    begin
+      if options[:user]
+        user = find_user_by_username_or_id(nil, options[:user], {global:true})
+        return 1 if user.nil?
+        params['userId'] = user['id']
+      end
+      json_response = @user_settings_interface.get(params)
+      user_settings = json_response['user'] || json_response['userSettings']
+      
+      if user_settings['avatar']
+        link = user_settings['avatar']
+        if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+          system "start #{link}"
+        elsif RbConfig::CONFIG['host_os'] =~ /darwin/
+          system "open #{link}"
+        elsif RbConfig::CONFIG['host_os'] =~ /linux|bsd/
+          system "xdg-open #{link}"
+        end
+        return 0, nil
+      else
+        print_error red,"No avatar image found.",reset,"\n"
+        return 1
+      end
+      
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+
+  def update_desktop_background(args)
     options = {}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -206,7 +389,7 @@ EOT
       #opts.add_hidden_option('--user-id')
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
       opts.footer = <<-EOT
-Update avatar profile image.
+Update desktop background image used in the VDI persona.
 [file] is required. This is the local path of a file to upload [png|jpg|svg].
 Done for the current user by default, unless a user is specified with the --user option.
 EOT
@@ -237,10 +420,10 @@ EOT
       end
       @user_settings_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @user_settings_interface.dry.update_avatar(image_file, params)
+        print_dry_run @user_settings_interface.dry.update_desktop_background(image_file, params)
         return
       end
-      json_response = @user_settings_interface.update_avatar(image_file, params)
+      json_response = @user_settings_interface.update_desktop_background(image_file, params)
       if options[:quiet]
         return 0
       elsif options[:json]
@@ -248,7 +431,7 @@ EOT
         return 0
       end
 
-      print_green_success "Updated avatar"
+      print_green_success "Updated desktop background"
       get_args = [] + (options[:remote] ? ["-r",options[:remote]] : []) + (params['userId'] ? ['--user-id', params['userId'].to_s] : [])
       get(get_args)
       return 0
@@ -258,7 +441,7 @@ EOT
     end
   end
 
-  def remove_avatar(args)
+  def remove_desktop_background(args)
     options = {}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -272,7 +455,7 @@ EOT
       #opts.add_hidden_option('--user-id')
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
       opts.footer = <<-EOT
-Remove avatar profile image.
+Remove desktop background image.
 [file] is required. This is the local path of a file to upload [png|jpg|svg].
 Done for the current user by default, unless a user is specified with the --user option.
 EOT
@@ -293,10 +476,10 @@ EOT
       end
       @user_settings_interface.setopts(options)
       if options[:dry_run]
-        print_dry_run @user_settings_interface.dry.remove_avatar(params)
+        print_dry_run @user_settings_interface.dry.remove_desktop_background(params)
         return
       end
-      json_response = @user_settings_interface.remove_avatar(params)
+      json_response = @user_settings_interface.remove_desktop_background(params)
       if options[:quiet]
         return 0
       elsif options[:json]
@@ -304,7 +487,7 @@ EOT
         return 0
       end
 
-      print_green_success "Removed avatar"
+      print_green_success "Removed desktop background"
       get_args = [] + (options[:remote] ? ["-r",options[:remote]] : []) + (params['userId'] ? ['--user-id', params['userId'].to_s] : [])
       get(get_args)
       return 0
@@ -314,7 +497,7 @@ EOT
     end
   end
 
-  def view_avatar(args)
+  def view_desktop_background(args)
     raw_args = args
     options = {}
     params = {}
@@ -329,8 +512,8 @@ EOT
       #opts.add_hidden_option('--user-id')
       build_common_options(opts, options, [:remote])
       opts.footer = <<-EOT
-View avatar profile image.
-This opens the avatar image url with a web browser.
+View desktop background image.
+This opens the desktop background image url with a web browser.
 Done for the current user by default, unless a user is specified with the --user option.
 EOT
     end
@@ -351,8 +534,8 @@ EOT
       json_response = @user_settings_interface.get(params)
       user_settings = json_response['user'] || json_response['userSettings']
       
-      if user_settings['avatar']
-        link = user_settings['avatar']
+      if user_settings['desktopBackground']
+        link = user_settings['desktopBackground']
         if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
           system "start #{link}"
         elsif RbConfig::CONFIG['host_os'] =~ /darwin/
@@ -362,7 +545,7 @@ EOT
         end
         return 0, nil
       else
-        print_error red,"No avatar image found.",reset,"\n"
+        print_error red,"No desktop background image found.",reset,"\n"
         return 1
       end
       
@@ -600,4 +783,32 @@ EOT
     end
   end
 
+  protected
+
+  def update_user_settings_option_types
+    [
+      # todo: rest of the available user settings!
+      {'switch' => 'change-username', 'fieldName' => 'username', 'fieldLabel' => 'Username', 'type' => 'text', 'description' => 'Change user credentials to use a new username'},
+      {'switch' => 'change-password', 'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'description' => 'Change user credentials to use a new password'},
+      {'fieldName' => 'email', 'fieldLabel' => 'Email', 'type' => 'text'},
+      {'fieldName' => 'firstName', 'fieldLabel' => 'First Name', 'type' => 'text'},
+      {'fieldName' => 'lastName', 'fieldLabel' => 'Last Name', 'type' => 'text'},
+      {'fieldName' => 'email', 'fieldLabel' => 'Email', 'type' => 'text'},
+      {'fieldName' => 'receiveNotifications', 'fieldLabel' => 'Receive Notifications', 'type' => 'checkbox'},
+      {'fieldName' => 'linuxUsername', 'fieldLabel' => 'Linux Username', 'type' => 'text'},
+      {'fieldName' => 'linuxPassword', 'fieldLabel' => 'Linux Password', 'type' => 'password'},
+      {'fieldName' => 'linuxKeyPairId', 'fieldLabel' => 'Linux Key Pair ID', 'type' => 'password'},
+      {'fieldName' => 'windowsUsername', 'fieldLabel' => 'Windows Username', 'type' => 'text'},
+      {'fieldName' => 'windowsPassword', 'fieldLabel' => 'Windows Password', 'type' => 'password'},
+      {'fieldName' => 'defaultGroup', 'fieldLabel' => 'Default Group ID', 'type' => 'text'},
+      {'fieldName' => 'defaultCloud', 'fieldLabel' => 'Default Cloud ID', 'type' => 'text'},
+      {'fieldName' => 'defaultPersona', 'fieldLabel' => 'Default Persona Name or Code or ID', 'type' => 'text'},
+      {'switch' => 'change-password', 'fieldName' => 'password', 'fieldLabel' => 'Password', 'type' => 'password', 'description' => 'Change user credentials to use a new password'},
+      {'fieldName' => 'avatar', 'fieldLabel' => 'Avatar', 'type' => 'file', 'description' => 'Local filepath of image file to upload as user avatar'},
+      {'fieldName' => 'desktopBackground', 'fieldLabel' => 'Desktop Background', 'type' => 'file', 'description' => 'Local filepath of image file to upload as user desktop background'},
+      # api cannot yet modify isUsing2fa
+      # {'switch' => '2fa', 'fieldName' => 'isUsing2fa', 'fieldLabel' => '2FA Enabled', 'type' => 'checkbox', 'description' => 'Enable or Disable 2FA for your user.'}
+    ]
+  end
+
 end