morpheus-cli 4.2.8 → 4.2.10

data/lib/morpheus/cli/shell.rb

@@ -96,7 +96,8 @@ class Morpheus::Cli::Shell
     @exploded_commands = []
     Morpheus::Cli::CliRegistry.all.each do |cmd, klass|
       @exploded_commands << cmd.to_s
-      subcommands = klass.subcommands rescue []
+      #subcommands = klass.subcommands rescue []
+      subcommands = klass.visible_subcommands rescue []
       subcommands.keys.each do |sub_cmd|
         @exploded_commands << "#{cmd} #{sub_cmd}"
       end
@@ -118,7 +119,7 @@ class Morpheus::Cli::Shell
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = usage
       # change to a temporary home directory, delete it afterwards.
-      opts.on('-e','--exec EXPRESSION', "Execute the command(s) expression and exit.") do |val|
+      opts.on('-e','--exec EXPRESSION', "Execute the command expression and exit. Expression can be a single morpheus command or several by using parenthesis and operators (, ), &&, ||, and ;") do |val|
         @execute_mode = true
         @execute_mode_command = val
       end
@@ -129,43 +130,12 @@ class Morpheus::Cli::Shell
         @@insecure = true
         Morpheus::RestClient.enable_ssl_verification = false
       end
-       opts.on('-Z','--incognito', "Incognito mode. Use a temporary shell. Remotes are loaded without without saved credentials or history logging.") do
-        @incognito_mode = true
-        #@norc = true # perhaps?
-        tmpdir = ENV['MORPHEUS_CLI_TMPDIR'] || ENV['TMPDIR'] || ENV['TMP']
-        if !tmpdir
-          puts_error "Temporary directory not found. Use environment variable MORPHEUS_CLI_TMPDIR or TMPDIR or TMP"
-        end
-        @original_home_directory = my_terminal.home_directory
-        @temporary_home_directory = File.join(tmpdir, "morpheus-temp-shell-#{rand().to_s[2..7]}")
-        # change to a temporary home directory
-        Morpheus::Logging::DarkPrinter.puts "incognito mode" if Morpheus::Logging.debug?
-        Morpheus::Logging::DarkPrinter.puts "temporary home directory is #{@temporary_home_directory}" if Morpheus::Logging.debug?
-        my_terminal.set_home_directory(@temporary_home_directory)
-        # wow..this already has cached list of Remote.appliances
-        # this is kinda nice though..keep it for now, 
-        #Morpheus::Cli::Remote.load_appliance_file
-        
-        Morpheus::Cli::Remote.appliances.each do |app_name, app|
-          #app[:username] = "(anonymous)"
-          #app[:status] = "fresh"
-          app[:authenticated] = false
-          app.delete(:username)
-          app.delete(:last_login_at)
-          app.delete(:last_logout_at)
-          app.delete(:last_success_at)
-          app.delete(:last_check)
-          app.delete(:username)
-          app.delete(:error)
-          #app[:error] = "ho ho ho"
-        end
-        
-        # Morpheus::Cli::Remote.save_appliances(new_remote_config)
-
-        # Morpheus::Cli::Remote.clear_active_appliance
-        # Morpheus::Cli::Credentials.clear_saved_credentials(@appliance_name)
-        # Morpheus::Cli::Credentials.load_saved_credentials
-        # Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials()
+      opts.on('-Z','--temporary', "Temporary shell. Use a temporary shell with the current remote configuration, credentials and history loaded. Temporary shells do not save changes to remote configuration changes and command history.") do
+        @temporary_shell_mode = true
+      end
+      opts.on('-z','--clean', "Clean shell. Use a temporary shell without any remote configuration, credentials or command history loaded.") do
+        @temporary_shell_mode = true
+        @clean_shell_mode = true
       end
       opts.on('-C','--nocolor', "Disable ANSI coloring") do
         Term::ANSIColor::coloring = false
@@ -174,7 +144,7 @@ class Morpheus::Cli::Shell
         Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
         ::RestClient.log = Morpheus::Logging.debug? ? Morpheus::Logging::DarkPrinter.instance : nil
       end
-      opts.on('-B','--benchmark', "Print benchmark time after each command is finished, including shell itself." ) do
+      opts.on('-B','--benchmark', "Print benchmark time after each command is finished" ) do
         Morpheus::Benchmarking.enabled = true
         my_terminal.benchmarking = Morpheus::Benchmarking.enabled
       end
@@ -185,6 +155,107 @@ class Morpheus::Cli::Shell
     end
     optparse.parse!(args)
 
+    # is this a temporary/temporary_shell shell?
+    # this works just by changing the cli home directory and updating appliances
+    if @temporary_shell_mode
+      #Morpheus::Logging::DarkPrinter.puts "temporary shell started" if Morpheus::Logging.debug?
+      # for now, always use the original home directory
+      # or else this will just keep growing deeper and deeper.
+      @parent_shell_directories ||= []
+      @parent_shell_directories << my_terminal.home_directory
+      @previous_home_directory = @parent_shell_directories.last
+      if @original_home_directory.nil?
+        @original_home_directory = @previous_home_directory
+      end
+      
+      #@norc = true # perhaps?
+      # instead of using TMPDIR, create tmp shell directory inside $MORPHEUS_CLI_HOME/tmp
+      # should chown these files too..
+      #tmpdir = ENV['MORPHEUS_CLI_TMPDIR'] || ENV['TMPDIR'] || ENV['TMP']
+      tmpdir = ENV['MORPHEUS_CLI_TMPDIR']
+      if !tmpdir
+        tmpdir = File.join(@original_home_directory, "tmp")
+      end
+      if !File.exists?(tmpdir)
+        # Morpheus::Logging::DarkPrinter.puts "creating tmpdir #{tmpdir}" if Morpheus::Logging.debug?
+        FileUtils.mkdir_p(tmpdir)
+      end
+      # this won't not happen since we mkdir above
+      if !File.exists?(tmpdir)
+        raise_command_error "Temporary directory not found. Use environment variable MORPHEUS_CLI_TMPDIR"
+      end
+      # change to a temporary home directory
+      @temporary_home_directory = File.join(tmpdir, "tmpshell-#{rand().to_s[2..7]}")
+      
+      #if !File.exists?(@temporary_home_directory)
+        Morpheus::Logging::DarkPrinter.puts "starting temporary shell at #{@temporary_home_directory}" if Morpheus::Logging.debug?
+        FileUtils.mkdir_p(@temporary_home_directory)
+      # end
+      
+
+      my_terminal.set_home_directory(@temporary_home_directory)
+
+
+      # wow..this already has cached list of Remote.appliances
+      # this is kinda nice though..keep it for now, 
+      #Morpheus::Cli::Remote.load_appliance_file
+      if @clean_shell_mode == true
+        # clean shell means no loading of remotes, aliases, history
+        # @norc = true
+        # todo: avoid writing files here and just work in memory for temporary shell
+        Morpheus::Cli::Remote.save_appliances({})
+      else
+        # keep remotes and credentials and activity or history
+        # this is done just by copying configuration files to the tmp home dir
+        # 
+        # should use Morpheus::Cli::DotFile.morpheus_profile_filename
+        # and # should use Morpheus::Cli::DotFile.morpheus_profile_filename
+        # this already got run though.. this temporary mode should work for any terminal command,
+        # not just in shell
+        # .morpheus_profile has aliases
+        # this has already been loaded, probably should reload it...
+        if File.exists?(File.join(@previous_home_directory, ".morpheus_profile"))
+          FileUtils.cp(File.join(@previous_home_directory, ".morpheus_profile"), File.join(@temporary_home_directory, ".morpheus_profile"))
+        end
+        if @norc != true
+          if File.exists?(File.join(@previous_home_directory, ".morpheusrc"))
+            FileUtils.cp(File.join(@previous_home_directory, ".morpheusrc"), File.join(@temporary_home_directory, ".morpheusrc"))
+          end
+        end
+        if File.exists?(File.join(@previous_home_directory, "appliances"))
+          FileUtils.cp(File.join(@previous_home_directory, "appliances"), File.join(@temporary_home_directory, "appliances"))
+        end
+        if File.exists?(File.join(@previous_home_directory, "credentials"))
+          FileUtils.cp(File.join(@previous_home_directory, "credentials"), File.join(@temporary_home_directory, "credentials"))
+        end
+        if File.exists?(File.join(@previous_home_directory, "groups"))
+          FileUtils.cp(File.join(@previous_home_directory, "groups"), File.join(@temporary_home_directory, "groups"))
+        end
+        # stay logged in
+        # maybe have a different option for removing just credentials, and command history..
+        Morpheus::Cli::Remote.appliances.each do |app_name, app|
+          #app[:username] = "(anonymous)"
+          #app[:status] = "fresh"
+          #app[:authenticated] = false
+          # app.delete(:active) # keep remote active..
+          #app.delete(:username)
+          #app.delete(:last_login_at)
+          #app.delete(:last_logout_at)
+          # app[:last_logout_at] = Time.now.to_i
+          # keep last_success and last check
+          #app.delete(:last_success_at)
+          #app.delete(:last_check)
+          #app.delete(:username)
+        end
+
+        # Morpheus::Cli::Remote.save_appliances(new_remote_config)
+        # Morpheus::Cli::Remote.clear_active_appliance
+        # Morpheus::Cli::Credentials.clear_saved_credentials(@appliance_name)
+        # Morpheus::Cli::Credentials.load_saved_credentials
+        # Morpheus::Cli::Credentials.new(@appliance_name, @appliance_url).load_saved_credentials()
+      end
+    end
+
     @history_logger ||= load_history_logger rescue nil
     @history_logger.info "shell started" if @history_logger
     load_history_from_log_file()
@@ -223,22 +294,33 @@ class Morpheus::Cli::Shell
       end
     end
     
-    # incognito mode, cover our tracks
+    # temporary_shell_mode, cover our tracks
     if @temporary_home_directory
-      if @temporary_home_directory.include?("morpheus-temp-shell")
+      if @temporary_home_directory.include?("tmpshell")
         begin
           FileUtils.remove_dir(@temporary_home_directory, true)
-          Morpheus::Logging::DarkPrinter.puts "cleaning up temporary home directory #{@temporary_home_directory}" if Morpheus::Logging.debug?
+          Morpheus::Logging::DarkPrinter.puts "cleaning up temporary shell at #{@temporary_home_directory}" if Morpheus::Logging.debug?
         rescue
         end
       end
-      @temporary_home_directory = nil
-      if @original_home_directory
-        my_terminal.set_home_directory(@original_home_directory)
+      parent_shell_directory = @parent_shell_directories ? @parent_shell_directories.pop : nil
+      if parent_shell_directory
+        # switch terminal shell back to parent shell.  
+        # should just be forking instead of all this...
+        my_terminal.set_home_directory(parent_shell_directory)
+        if @original_home_directory && @original_home_directory == parent_shell_directory
+          # back to original shell, not temporary, right? 
+          # todo: probably need to reload shell here?
+          @temporary_home_directory = nil
+        else
+          # back to another temporary shell
+          # todo: probably need to reload shell here?
+          @temporary_home_directory = parent_shell_directory
+        end
+      else
+        # there was no parent, this would be weird since temporary_home_directory was true..
       end
-      @original_home_directory = nil
     end
-
     return result
   end
 
@@ -263,11 +345,13 @@ class Morpheus::Cli::Shell
         return 0
         #exit 0
       elsif input == 'help'
-
-        puts "You are in a morpheus client shell."
+        if @temporary_shell_mode
+          puts "You are in a (temporary) morpheus shell"
+        else
+          puts "You are in a morpheus shell."
+        end
         puts "See the available commands below."
 
-
         puts "\nCommands:"
         # commands = @morpheus_commands + @shell_commands
         @morpheus_commands.sort.each {|cmd|
@@ -434,9 +518,11 @@ class Morpheus::Cli::Shell
           print "#{input}, how may I #{cyan}help#{reset} you?\n"
         end
         return 0
-      elsif input == "shell"
-        print "#{cyan}You are already in a shell.#{reset}\n"
-        return false
+      elsif input.strip =~ /^shell\s*/
+        # just allow shell to fall through
+        # we should reload the configs and history file after the sub shell process terminates though.
+        # actually, that looks like it is working just fine already...?
+        print cyan,"starting a subshell",reset,"\n"
       elsif input =~ /^\.\s/
         # dot alias for source <file>
         log_history_command(input)
@@ -562,8 +648,10 @@ class Morpheus::Cli::Shell
           cmd_number = matches[1].to_i
           cmd = matches[2]
 
-          @last_command_number = cmd_number
-          @history[@last_command_number] = cmd
+          if cmd_number > @last_command_number
+            @last_command_number = cmd_number
+          end
+          @history[cmd_number] = cmd
 
           # for Ctrl+R history searching
           Readline::HISTORY << cmd

data/lib/morpheus/cli/subnets_command.rb

@@ -24,6 +24,7 @@ class Morpheus::Cli::SubnetsCommand
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @networks_interface = @api_client.networks
+    @network_pools_interface = @api_client.network_pools
     @network_types_interface = @api_client.network_types
     @subnets_interface = @api_client.subnets
     @subnet_types_interface = @api_client.subnet_types
@@ -125,7 +126,6 @@ class Morpheus::Cli::SubnetsCommand
     
   end
 
-
   def get(args)
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
@@ -186,7 +186,7 @@ class Morpheus::Cli::SubnetsCommand
         "Secondary DNS" => 'dnsSecondary',
         "Pool" => lambda {|it| it['pool'] ? it['pool']['name'] : '' },
         "DHCP" => lambda {|it| format_boolean it['dhcpServer'] },
-        #"Allow IP Override" => lambda {|it| it['allowStaticOverride'] ? 'Yes' : 'No' },
+        "Allow IP Override" => lambda {|it| it['allowStaticOverride'] ? 'Yes' : 'No' },
         "Active" => lambda {|it| format_boolean(it['active']) },
         "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
         "Tenants" => lambda {|it| it['tenants'] ? it['tenants'].collect {|it| it['name'] }.uniq.join(', ') : '' },
@@ -285,6 +285,15 @@ class Morpheus::Cli::SubnetsCommand
       opts.on('--active [on|off]', String, "Can be used to disable a subnet") do |val|
         options['active'] = val.to_s == 'on' || val.to_s == 'true'
       end
+      opts.on('--pool ID', String, "Network Pool") do |val|
+        options['pool'] = val.to_i
+      end
+      opts.on('--dhcp-server [on|off]', String, "DHCP Server") do |val|
+        options['dhcpServer'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
+      opts.on('--can-assign-pool [on|off]', String, "DHCP Server") do |val|
+        options['canAssignPool'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Create a new subnet." + "\n" +
                     "--network is required. This is the name or id of a network." #+ "\n" +
@@ -303,6 +312,15 @@ class Morpheus::Cli::SubnetsCommand
     begin
       passed_options = (options[:options] || {}).reject {|k,v| k.is_a?(Symbol) }
       payload = nil
+
+      # Network
+      prompt_results = prompt_for_network(network_id, options)
+      if prompt_results[:success]
+        network = prompt_results[:network]
+      else
+        return 1, "Network prompt failed."
+      end
+
       if options[:payload]
         payload = options[:payload]
         payload.deep_merge!({'subnet' => passed_options}) unless passed_options.empty?
@@ -310,14 +328,6 @@ class Morpheus::Cli::SubnetsCommand
       else
         payload = {'subnet' => {}}
         payload.deep_merge!({'subnet' => passed_options}) unless passed_options.empty?
-        
-        # Network
-        prompt_results = prompt_for_network(network_id, options)
-        if prompt_results[:success]
-          network = prompt_results[:network]
-        else
-          return 1, "Network prompt failed."
-        end
 
         # Name
         # v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Name for this subnet.'}], options[:options])
@@ -355,6 +365,28 @@ class Morpheus::Cli::SubnetsCommand
 
         end
 
+        # DHCP
+        if options['dhcpServer']
+          payload['subnet']['dhcpServer'] = options['dhcpServer']
+        elsif subnet_type['dhcpServerEditable'] && payload['subnet']['dhcpServer'].nil? && !options[:no_prompt]
+          payload['subnet']['dhcpServer'] = Morpheus::Cli::OptionTypes.confirm("DHCP Server?", {:default=>false})
+        end
+
+        # Allow IP Override
+        if options['allowStaticOverride']
+          payload['subnet']['allowStaticOverride']
+        elsif !options[:no_prompt]
+          payload['subnet']['allowStaticOverride'] = Morpheus::Cli::OptionTypes.confirm("Allow IP Override?", {:default=>false})
+        end
+
+        # IP Pool
+        if options['pool']
+          payload['subnet']['pool'] = {'id' => options['pool']}
+        elsif subnet_type['canAssignPool'] && !options[:no_prompt]
+          network_pool_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "pool", 'type' => 'select', 'fieldLabel' => "Network Pool", 'selectOptions' => list_network_pool_options(), 'required' => false, 'description' => 'Select Network Pool'}], options[:options], @api_client, {zoneId: network['zone']['id']}, options[:no_prompt])["pool"]
+          payload['subnet']['pool'] = {'id' => network_pool_id} if network_pool_id
+        end
+
         # Group Access
         # Group Access (default is All)
         if group_access_all.nil?
@@ -416,7 +448,6 @@ class Morpheus::Cli::SubnetsCommand
     end
   end
 
-
   def update(args)
     options = {}
     tenants = nil
@@ -462,6 +493,15 @@ class Morpheus::Cli::SubnetsCommand
       opts.on('--active [on|off]', String, "Can be used to disable a subnet") do |val|
         options['active'] = val.to_s == 'on' || val.to_s == 'true'
       end
+      opts.on('--pool ID', String, "Network Pool") do |val|
+        options['pool'] = val.to_i
+      end
+      opts.on('--dhcp-server [on|off]', String, "DHCP Server") do |val|
+        options['dhcpServer'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
+      opts.on('--can-assign-pool [on|off]', String, "DHCP Server") do |val|
+        options['canAssignPool'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == ''
+      end
       build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
       opts.footer = "Update a subnet." + "\n" +
                     "[subnet] is required. This is the name or id of a subnet."
@@ -527,6 +567,21 @@ class Morpheus::Cli::SubnetsCommand
           payload['subnet']['visibility'] = options['visibility']
         end
 
+        # DHCP
+        if options['dhcpServer'] != nil
+          payload['subnet']['dhcpServer'] = options['dhcpServer']
+        end
+
+        # Allow IP Override
+        if options['allowStaticOverride'] != nil
+          payload['subnet']['allowStaticOverride']
+        end
+
+        # IP Pool
+        if options['pool'] != nil
+          payload['subnet']['pool'] = {'id' => options['pool']}
+        end
+
       end
 
       @subnets_interface.setopts(options)
@@ -732,4 +787,9 @@ class Morpheus::Cli::SubnetsCommand
 
   private
 
+  def list_network_pool_options()
+    @network_pools_interface.list['networkPools'].collect do |np|
+      {'name' => np['name'], 'value' => np['id']}
+    end
+  end
 end

data/lib/morpheus/cli/tasks.rb

@@ -715,14 +715,14 @@ class Morpheus::Cli::Tasks
         print_dry_run @tasks_interface.dry.update(task['id'], payload)
         return 0
       end
-      response = @tasks_interface.update(task['id'], payload)
+      json_response = @tasks_interface.update(task['id'], payload)
       if options[:json]
         print JSON.pretty_generate(json_response)
-        if !response['success']
+        if !json_response['success']
           return 1
         end
       else
-        print_green_success "Task #{response['task']['name']} updated"
+        print_green_success "Task #{json_response['task']['name'] rescue ''} updated"
         get([task['id']])
       end
       return 0

data/lib/morpheus/cli/user_sources_command.rb

@@ -84,7 +84,7 @@ class Morpheus::Cli::UserSourcesCommand
       title = "Morpheus User Sources"
       subtitles = []
       if account
-        subtitles << "Account: #{account['name']}".strip
+        subtitles << "Tenant: #{account['name']}".strip
       end
       subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles
@@ -171,7 +171,7 @@ class Morpheus::Cli::UserSourcesCommand
         "Name" => lambda {|it| it['name'] },
         "Description" => lambda {|it| it['description'] },
         "Type" => lambda {|it| it['type'] },
-        "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
+        "Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
         #"Subdomain" => lambda {|it| it['subdomain'] },
         "Login URL" => lambda {|it| it['loginURL'] },
         "Default Role" => lambda {|it| it['defaultAccountRole'] ? it['defaultAccountRole']['authority'] : '' },
@@ -223,7 +223,7 @@ class Morpheus::Cli::UserSourcesCommand
     default_role_id = nil
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = subcommand_usage("[account] [name]")
-      opts.on('--account ID', String, "Account this user source belongs to") do |val|
+      opts.on('--account ID', String, "Tenant this user source belongs to") do |val|
         account_id = val
       end
       opts.on('--type CODE', String, "User Source Type") do |val|
@@ -855,7 +855,7 @@ class Morpheus::Cli::UserSourcesCommand
       {"ID" => lambda {|user_source| user_source['id'] } },
       {"NAME" => lambda {|user_source| user_source['name'] } },
       {"TYPE" => lambda {|user_source| user_source['type'] } },
-      {"ACCOUNT" => lambda {|user_source| user_source['account'] ? user_source['account']['name'] : '' } },
+      {"TENANT" => lambda {|user_source| user_source['account'] ? user_source['account']['name'] : '' } },
       {"ACTIVE" => lambda {|user_source| format_boolean user_source['active'] } },
     ]
     if opts[:include_fields]