morpheus-cli 5.4.2 → 5.4.4

data/lib/morpheus/cli/commands/provisioning_settings_command.rb

@@ -69,6 +69,7 @@ class Morpheus::Cli::ProvisioningSettingsCommand
         "Hide Datastore Stats On Selection" => lambda {|it| format_boolean(it['hideDatastoreStats'])},
         "Cross-Tenant Naming Policies" => lambda {|it| format_boolean(it['crossTenantNamingPolicies'])},
         "Reuse Naming Sequence Numbers" => lambda {|it| format_boolean(it['reuseSequence'])},
+        "Show Console Keyboard Layout Settings" => lambda {|it| format_boolean(it['showConsoleKeyboardSettings'])},
         "Deployment Archive Store" => lambda {|it| it['deployStorageProvider'] ? it['deployStorageProvider']['name'] : nil},
         # Cloud-Init Settings
         "Cloud-Init Username" => lambda {|it| it['cloudInitUsername']},

data/lib/morpheus/cli/commands/remote.rb

@@ -102,7 +102,7 @@ EOT
           "URL" => lambda {|it| it[:url] || it[:host] },
           "Status" => lambda {|it| format_appliance_status(it, cyan) },
           "Version" => lambda {|it| it[:build_version] ? "#{it[:build_version]}" : '' },
-          "Appliance URL" => lambda {|it| it[:appliance_url] ? "#{it[:appliance_url]}" : '' },
+          #"Appliance URL" => lambda {|it| it[:appliance_url] ? "#{it[:appliance_url]}" : '' },
           "Secure" => lambda {|it| format_boolean(it[:insecure] != true && (it[:url] || it[:host]).to_s.include?("https")) },
           "Active" => lambda {|it| it[:active] ? "Yes " + format_is_current() : "No" },
           #"Authenticated" => lambda {|it| format_boolean it[:authenticated] },
@@ -336,7 +336,7 @@ EOT
       print cyan,"Added remote #{new_appliance_name}, status is #{format_appliance_status(appliance)}",reset,"\n"
     end
 
-    appliance, json_response = ::Morpheus::Cli::Remote.refresh_remote(new_appliance_name.to_sym)
+    #appliance, json_response = ::Morpheus::Cli::Remote.refresh_remote(new_appliance_name.to_sym)
     # if !options[:quiet]
     #   print cyan
     #   puts "Status: #{format_appliance_status(appliance)}"
@@ -390,7 +390,8 @@ EOT
         end
 
       end
-
+      # refresh to get buildVersion now that we are logged in
+      appliance, json_response = ::Morpheus::Cli::Remote.refresh_remote(new_appliance_name.to_sym)
     else
       #puts "Status is #{format_appliance_status(appliance)}"
     end
@@ -1278,7 +1279,7 @@ EOT
       "URL" => lambda {|it| it[:url] || it[:host] },
       #"Status" => lambda {|it| format_appliance_status(it, cyan) },
       "Version" => lambda {|it| it[:build_version] ? "#{it[:build_version]}" : '' },
-      "Appliance URL" => lambda {|it| it[:appliance_url] ? "#{it[:appliance_url]}" : '' },
+      #"Appliance URL" => lambda {|it| it[:appliance_url] ? "#{it[:appliance_url]}" : '' },
       "Secure" => lambda {|it| format_appliance_secure(it) },
       "Active" => lambda {|it| it[:active] ? "Yes " + format_is_current() : "No" },
       # "Active" => lambda {|it| format_boolean(it[:active]) },
@@ -1696,7 +1697,10 @@ EOT
         # wtf, no url...
         return appliance, json_response
       else
-        setup_interface = Morpheus::SetupInterface.new({url:appliance_url, verify_ssl: !appliance[:insecure], timeout: timeout})
+        # access token is needed for buildVersion
+        wallet = Morpheus::Cli::Credentials.new(app_name, appliance_url).load_saved_credentials()
+        setup_interface = Morpheus::SetupInterface.new({url:appliance_url, verify_ssl: !appliance[:insecure], timeout: timeout, 
+          access_token: (wallet && wallet['access_token']) ? wallet['access_token'] : nil})
         start_time = Time.now
         begin
           json_response = setup_interface.check(params)
@@ -1734,17 +1738,19 @@ EOT
         appliance[:last_check][:took] = (took_sec.to_f*1000).round
       end
       if json_response
-        if json_response.key?('applianceUrl')
-          appliance[:appliance_url] = json_response['applianceUrl']
-        end
-        if json_response.key?('buildVersion')
-          appliance[:build_version] = json_response['buildVersion']
+        # if json_response.key?('applianceUrl')
+        #   appliance[:appliance_url] = json_response['applianceUrl']
+        # end
+        if json_response['success'] == true
           appliance[:status] = 'ready'
           appliance[:last_check][:success] = true
           # consider bumping this after every successful api command
           appliance[:last_success_at] = Time.now.to_i
           appliance.delete(:error)
         end
+        if !json_response['buildVersion'].to_s.empty?
+          appliance[:build_version] = json_response['buildVersion']
+        end
         if json_response.key?('setupNeeded')
           if json_response['setupNeeded'] == true
             appliance[:setup_needed] = true

data/lib/morpheus/cli/commands/security_groups.rb

@@ -855,7 +855,7 @@ class Morpheus::Cli::SecurityGroups
 
         end
 
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'sourceType', 'fieldLabel' => 'Source Type', 'type' => 'select', 'optionSource' => 'securityGroupSourceType', 'required' => true, 'defaultValue' => 'cidr'}], options[:options], @api_client)
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'sourceType', 'fieldLabel' => 'Source Type', 'type' => 'select', 'optionSource' => 'securityGroupSourceType', 'required' => true, 'defaultValue' => 'cidr'}], options[:options], @api_client, {'rule.securityGroupId': security_group['id'], 'securityGroupRule.direction': payload['rule']['direction']})
         payload['rule']['sourceType'] = v_prompt['sourceType'] unless v_prompt['sourceType'].nil?
 
         if payload['rule']['sourceType'] == 'cidr'
@@ -869,7 +869,7 @@ class Morpheus::Cli::SecurityGroups
           payload['rule']['sourceTier'] = {"id" => v_prompt['sourceTier']} unless v_prompt['sourceTier'].nil?
         end
 
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'destinationType', 'fieldLabel' => 'Destination Type', 'type' => 'select', 'optionSource' => 'securityGroupDestinationType', 'required' => true, 'defaultValue' => 'instance'}], options[:options], @api_client)
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'destinationType', 'fieldLabel' => 'Destination Type', 'type' => 'select', 'optionSource' => 'securityGroupDestinationType', 'required' => true, 'defaultValue' => 'instance'}], options[:options], @api_client, {'rule.securityGroupId': security_group['id'], 'securityGroupRule.direction': payload['rule']['direction']})
         payload['rule']['destinationType'] = v_prompt['destinationType'] unless v_prompt['destinationType'].nil?
 
         if payload['rule']['destinationType'] == 'cidr'

data/lib/morpheus/cli/commands/service_plans_command.rb

@@ -7,7 +7,7 @@ class Morpheus::Cli::ServicePlanCommand
 
   set_command_name :'service-plans'
 
-  register_subcommands :list, :get, :add, :update, :activate, :deactivate
+  register_subcommands :list, :get, :add, :update, :activate, :deactivate, :remove
   set_default_subcommand :list
 
   def connect(opts)
@@ -119,8 +119,6 @@ class Morpheus::Cli::ServicePlanCommand
   def _get(plan_id, options = {})
     params = {}
     begin
-      @service_plans_interface.setopts(options)
-
       if !(plan_id.to_s =~ /\A\d{1,}\Z/)
         plan = find_service_plan(plan_id)
 
@@ -130,7 +128,7 @@ class Morpheus::Cli::ServicePlanCommand
         end
         plan_id = plan['id']
       end
-
+      @service_plans_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @service_plans_interface.dry.get(plan_id)
         return
@@ -575,7 +573,7 @@ class Morpheus::Cli::ServicePlanCommand
         options[:provisionType] = options[:provisionType] || (args.count > 1 ? args[1] : nil)
 
         if !options[:provisionType].nil?
-          provision_types = @service_plans_interface.provision_types()['provisionTypes']
+          provision_types = @service_plans_interface.provision_types({max: 10000})['provisionTypes']
           provision_type = provision_types.find {|it| it['name'] == options[:provisionType] || it['code'] == options[:provisionType] || it['id'] == options[:provisionType].to_i}
 
           if provision_type.nil?
@@ -740,6 +738,55 @@ class Morpheus::Cli::ServicePlanCommand
     end
   end
 
+  def remove(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage( "[plan]")
+      build_common_options(opts, options, [:json, :dry_run, :remote, :auto_confirm])
+      opts.footer = "Delete a service plan.\n" +
+        "[plan] is required. Service plan ID, name or code"
+    end
+    optparse.parse!(args)
+    connect(options)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args}\n#{optparse}"
+      return 1
+    end
+
+    begin
+      plan = find_service_plan(args[0])
+
+      if !plan
+        print_red_alert "Service plan #{args[0]} not found"
+        return 1
+      end
+
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to delete the service plan '#{plan['name']}'?", options)
+        return 9, "aborted command"
+      end
+
+      @service_plans_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @service_plans_interface.dry.destroy(plan['id'], params)
+        return
+      end
+
+      json_response = @service_plans_interface.destroy(plan['id'], params)
+
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      elsif !options[:quiet]
+        print_green_success "Service plan #{plan['name']} deleted"
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   private
 
   def find_service_plan(val)

data/lib/morpheus/cli/commands/setup.rb

@@ -95,7 +95,7 @@ EOT
       # my_terminal.execute("setup needed?")
       # theres a bug here with --remote-url :status == "unknown"
       # but hey, we got json back, so set status to "ready"
-      if appliance_status_json && appliance_status_json['setupNeeded'] == false
+      if appliance_status_json
         @remote_appliance[:status] == 'ready'
       end
       remote_status_string = format_appliance_status(@remote_appliance, cyan)

data/lib/morpheus/cli/commands/snapshots.rb

@@ -0,0 +1,139 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::Snapshots
+  include Morpheus::Cli::CliCommand
+
+  set_command_name :snapshots
+  set_command_description "View or remove snapshot"
+  register_subcommands :get, :remove
+
+  alias_subcommand :details, :get
+  set_default_subcommand :get
+
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @snapshots_interface = @api_client.snapshots
+  end
+  
+  def handle(args)
+    handle_subcommand(args)
+  end
+
+  def get(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[id]")
+      opts.footer = "Get Snapshot details." + "\n" +
+                    "[snapshotId] is required. This is the id of the snapshot."
+      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts_error "[id] argument is required"
+      puts_error optparse
+      return 1
+    end
+
+    connect(options)
+    id_list = parse_id_list(args)
+
+    return run_command_for_each_arg(id_list) do |arg|
+      _get(arg, options)
+    end
+  end
+
+  def _get(arg, options)
+    begin
+
+      @snapshots_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @snapshots_interface.dry.get(arg.to_i)
+        return
+      end
+
+      json_response = @snapshots_interface.get(arg.to_i)
+      if options[:json]
+        puts as_json(json_response, options, "snapshot")
+        return 0
+      elsif options[:yaml]
+        puts as_yaml(json_response, options, "snapshot")
+        return 0
+      end
+
+      if options[:csv]
+        puts records_as_csv([json_response['snapshot']], options)
+        return 0
+      end
+      snapshot = json_response['snapshot']
+
+      print_h1 "Snapshot Details"
+      print cyan
+      description_cols = {
+        "ID" => 'id',
+        "Name" => 'name',
+        "Description" => 'description',
+        "External Id" => 'externalId',
+        "Status" => 'status',
+        "State" => 'state',
+        "Snapshot Type" => 'snapshotType',
+        "Snapshot Created" => 'snapshotCreated',
+        "Cloud" => 'zone.name',
+        "Datastore" => 'datastore',
+        "Parent Snapshot" => 'parentSnapshot',
+        "Active" => 'currentlyActive',
+        "Date Created" => 'dateCreated'
+      }
+      print_description_list(description_cols, snapshot)
+
+      print reset, "\n"
+
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      return 1
+    end
+  end
+
+  def remove(args)
+    options = {}
+    instance = nil
+    snapshot_id = nil
+
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+     opts.banner = subcommand_usage("[instance]")
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
+      opts.footer = "Remove/Delete a snapshot." + "\n" +
+                    "[snapshotId] is required. This is the id of the snapshot to delete."
+    end
+    
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    snapshot_id = args[0].to_i
+    connect(options)
+    begin
+      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove a snapshot?", options)
+        exit 1
+      end
+ 
+      payload = {}
+      if options[:dry_run]
+        print_dry_run @snapshots_interface.dry.remove(snapshot_id, payload)
+        return
+      end
+      
+      json_response = @snapshots_interface.remove(snapshot_id, payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Snapshot delete initiated."
+      end
+      return 0
+
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+end

data/lib/morpheus/cli/commands/storage_server_types.rb

@@ -41,10 +41,5 @@ class Morpheus::Cli::StorageServerTypes
     }
   end
 
-  # overridden to support name or code
-  def find_storage_server_type_by_name_or_id(name)
-    storage_server_type_for_name_or_id(name)
-  end
-
 end
 

data/lib/morpheus/cli/commands/storage_servers.rb

@@ -66,12 +66,6 @@ class Morpheus::Cli::StorageServers
     }
   end
 
-  # overridden to work with name or code
-  # nope, api works with name=code now too
-  # def find_storage_server_type_by_name_or_id(name)
-  #   storage_server_type_for_name_or_id(name)
-  # end
-
   def add_storage_server_option_types()
     [
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},

data/lib/morpheus/cli/commands/storage_volume_types.rb

@@ -41,10 +41,5 @@ class Morpheus::Cli::StorageVolumeTypes
     }
   end
 
-  # overridden to support name or code
-  def find_storage_volume_type_by_name_or_id(name)
-    storage_volume_type_for_name_or_id(name)
-  end
-
 end
 

data/lib/morpheus/cli/commands/storage_volumes.rb

@@ -65,12 +65,6 @@ class Morpheus::Cli::StorageVolumes
     }
   end
 
-  # overridden to work with name or code
-  # nope, api works with name=code now too
-  # def find_storage_volume_type_by_name_or_id(name)
-  #   storage_volume_type_for_name_or_id(name)
-  # end
-
   def add_storage_volume_option_types()
     [
       {'fieldContext' => 'storageServer', 'fieldName' => 'id', 'fieldLabel' => 'Storage Server', 'type' => 'select', 'optionSource' => 'storageServers', 'optionParams' => {'createType' => 'block'}, 'required' => true},

data/lib/morpheus/cli/commands/tasks.rb

@@ -179,7 +179,7 @@ class Morpheus::Cli::Tasks
           task_option_config = {}
           task_option_columns = []
           task_type['optionTypes'].sort { |x,y| x['displayOrder'].to_i <=> y['displayOrder'].to_i }.each do |optionType|
-            if optionType['fieldLabel'].to_s.downcase == 'script'
+            if optionType['code'] == 'script'
               script_content = task['taskOptions'][optionType['fieldName']]
             elsif optionType['fieldName'] == 'httpHeaders' || optionType['fieldName'] == 'webHeaders'
               http_headers = task['taskOptions']['httpHeaders'] || task['taskOptions']['webHeaders']
@@ -553,11 +553,11 @@ class Morpheus::Cli::Tasks
             payload['task']['retryCount'] = v_prompt['retryCount'].to_i unless v_prompt['retryCount'].nil?
           end
           # Retry Delay
-          if options[:options]['retryDelay']
-            payload['task']['retryDelay'] = options[:options]['retryDelay'].to_i
+          if options[:options]['retryDelaySeconds']
+            payload['task']['retryDelaySeconds'] = options[:options]['retryDelaySeconds'].to_i
           else
-            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'retryDelay', 'fieldLabel' => 'Retry Delay', 'type' => 'number', 'defaultValue' => 10}], options[:options], @api_client)
-            payload['task']['retryDelay'] = v_prompt['retryDelay'].to_i unless v_prompt['retryDelay'].nil?
+            v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'retryDelaySeconds', 'fieldLabel' => 'Retry Delay', 'type' => 'number', 'defaultValue' => 10}], options[:options], @api_client)
+            payload['task']['retryDelaySeconds'] = v_prompt['retryDelaySeconds'].to_i unless v_prompt['retryDelaySeconds'].nil?
           end
         end
 

data/lib/morpheus/cli/commands/user_settings_command.rb

@@ -803,7 +803,7 @@ EOT
       {'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'},
+      {'fieldName' => 'defaultPersona', 'fieldLabel' => 'Default Persona Name or Code or ID eg. standard, serviceCatalog or vdi', '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'},

data/lib/morpheus/cli/commands/virtual_images.rb

@@ -38,6 +38,9 @@ class Morpheus::Cli::VirtualImages
       end
       opts.on('--system', "System Images" ) do
         options[:filterType] = 'System'
+      end
+       opts.on('--synced', "Synced Images" ) do
+        options[:filterType] = 'Synced'
       end
       opts.on('--tags Name=Value',String, "Filter by tags (metadata name value pairs).") do |val|
         val.split(",").each do |value_pair|
@@ -51,7 +54,7 @@ class Morpheus::Cli::VirtualImages
         options[:details] = true
       end
       build_standard_list_options(opts, options)
-      opts.footer = "List virtual images."
+      opts.footer = "List virtual images. Default list applies User filter"
     end
     optparse.parse!(args)
     connect(options)