morpheus-cli 5.5.0 → 5.5.1

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

@@ -2,6 +2,7 @@ require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::JobsCommand
   include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::JobsHelper
   include Morpheus::Cli::AccountsHelper
 
   set_command_name :'jobs'
@@ -90,7 +91,7 @@ class Morpheus::Cli::JobsCommand
           # "Last Updated" => lambda {|job| format_local_dt(job['lastUpdated']) },
           "Last Run" => lambda {|job| format_local_dt(job['lastRun']) },
           "Next Run" =>  lambda {|job| job['enabled'] && job['scheduleMode'] && job['scheduleMode'] != 'manual' ? format_local_dt(job['nextFire']) : '' },
-          "Last Result" =>  lambda {|job| format_status(job['lastResult']) },
+          "Last Result" =>  lambda {|job| format_job_status(job['lastResult']) },
         }
         print as_pretty_table(jobs, columns.upcase_keys!, options)
         print_results_pagination(json_response)
@@ -124,7 +125,7 @@ class Morpheus::Cli::JobsCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[job] [max-exec-count]")
-      build_common_options(opts, options, [:json, :dry_run, :remote])
+      build_standard_get_options(opts, options)
       opts.footer = "Get details about a job.\n" +
           "[job] is required. Job ID or name.\n" +
           "[max-exec-count] is optional. Specified max # of most recent executions. Defaults is 3"
@@ -274,17 +275,13 @@ class Morpheus::Cli::JobsCommand
         options[:schedule] = 'dateTime'
         params['dateTime'] = val.to_s
       end
-      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote, :quiet])
+      build_standard_add_options(opts, options)
       opts.footer = "Create job."
     end
     optparse.parse!(args)
     connect(options)
-    if args.count > 1
-      raise_command_error "wrong number of arguments, expected 0 or 1 and got (#{args.count}) #{args}\n#{optparse}"
-      return 1
-    end
+    verify_args!(args:args, optparse:optparse, max:1)
 
-    begin
       if options[:payload]
         payload = parse_payload(options, 'job')
       else
@@ -425,22 +422,10 @@ class Morpheus::Cli::JobsCommand
         return
       end
       json_response = @jobs_interface.create(payload)
-
-      if options[:json]
-        puts as_json(json_response, options)
-      elsif !options[:quiet]
-        if json_response['success']
-          print_green_success  "Job created"
-          _get(json_response['id'], 0, options)
-        else
-          print_red_alert "Error creating job: #{json_response['msg'] || json_response['errors']}"
-        end
+      render_response(json_response, options, 'job') do
+        print_green_success  "Job created"
+        _get(json_response['id'], 0, options)
       end
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
-    end
   end
 
   def update(args)
@@ -492,18 +477,14 @@ class Morpheus::Cli::JobsCommand
         options[:schedule] = 'dateTime'
         params['dateTime'] = val.to_s
       end
-      build_common_options(opts, options, [:options, :payload, :list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_standard_update_options(opts, options)
       opts.footer = "Update job.\n" +
           "[job] is required. Job ID or name"
     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
+    verify_args!(args:args, optparse:optparse, count:1)
 
-    begin
       job = find_by_name_or_id('job', args[0])
 
       if job.nil?
@@ -609,22 +590,10 @@ class Morpheus::Cli::JobsCommand
         return
       end
       json_response = @jobs_interface.update(job['id'], payload)
-
-      if options[:json]
-        puts as_json(json_response, options)
-      elsif !options[:quiet]
-        if json_response['success']
-          print_green_success  "Job updated"
-          _get(job['id'], nil, options)
-        else
-          print_red_alert "Error updating job: #{json_response['msg'] || json_response['errors']}"
-        end
+      render_response(json_response, options, 'job') do
+        print_green_success  "Job updated"
+        _get(job['id'], nil, options)
       end
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
-    end
   end
 
   def execute(args)
@@ -684,48 +653,31 @@ class Morpheus::Cli::JobsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage( "[job]")
-      build_common_options(opts, options, [:json, :dry_run, :remote])
+      build_standard_remove_options(opts, options)
       opts.footer = "Remove job.\n" +
           "[job] is required. Job ID or name"
     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
-      job = find_by_name_or_id('job', args[0])
-
-      if job.nil?
-        print_red_alert "Job #{args[0]} not found"
-        exit 1
-      end
-
-      unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove the job '#{job['name']}'?", options)
-        return 9, "aborted command"
-      end
-
-      @jobs_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @jobs_interface.dry.destroy(job['id'], params)
-        return
-      end
-
-      json_response = @jobs_interface.destroy(job['id'], params)
-
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
-      elsif !options[:quiet]
-        print_green_success "Job #{job['name']} removed"
-      end
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
+    verify_args!(args:args, optparse:optparse, count:1)
+    job = find_by_name_or_id('job', args[0])
+    if job.nil?
+      print_red_alert "Job #{args[0]} not found"
       exit 1
     end
+    unless options[:yes] || ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to remove the job '#{job['name']}'?", options)
+      return 9, "aborted command"
+    end
+    @jobs_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @jobs_interface.dry.destroy(job['id'], params)
+      return
+    end
+    json_response = @jobs_interface.destroy(job['id'], params)
+    render_response(json_response, options) do
+      print_green_success "Job #{job['name']} removed"
+    end
+    return 0, nil
   end
 
   def list_executions(args)
@@ -739,7 +691,7 @@ class Morpheus::Cli::JobsCommand
       opts.on("--internal [true|false]", String, "Filters executions based on internal flag. Internal executions are excluded by default.") do |val|
         params["internalOnly"] = (val.to_s != "false")
       end
-      build_standard_list_options(opts, options)
+      build_standard_list_options(opts, options, [:details])
       opts.footer = "List job executions.\n" +
           "[job] is optional. Job ID or name to filter executions."
 
@@ -792,10 +744,7 @@ class Morpheus::Cli::JobsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
-      opts.on('-D', '--details [on|off]', String, "Can be used to enable / disable execution details. Default is on") do |val|
-        options[:details] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
-      end
-      build_common_options(opts, options, [:json, :dry_run, :remote])
+      build_standard_get_options(opts, options, [:details])
       opts.footer = "Get details about a job.\n" +
           "[id] is required. Job execution ID."
     end
@@ -805,82 +754,17 @@ class Morpheus::Cli::JobsCommand
     end
     connect(options)
 
-    begin
-      @jobs_interface.setopts(options)
-
-      if options[:dry_run]
-        print_dry_run @jobs_interface.dry.get_execution(args[0], params)
-        return
-      end
-      json_response = @jobs_interface.get_execution(args[0], params)
-
-      render_result = render_with_format(json_response, options, 'jobExecution')
-      return 0 if render_result
-
-      title = "Morpheus Job Execution"
-      subtitles = []
-      subtitles += parse_list_subtitles(options)
-      print_h1 title, subtitles
-
-      exec = json_response['jobExecution']
-      process = exec['process']
-      print cyan
-      description_cols = {
-          "ID" => lambda {|it| it['id'] },
-          "Job" => lambda {|it| it['job'] ? it['job']['name'] : ''},
-          "Job Type" => lambda {|it| it['job'] && it['job']['type'] ? (it['job']['type']['code'] == 'morpheus.workflow' ? 'Workflow' : 'Task') : ''},
-          # "Description" => lambda {|it| it['description'] || (it['job'] ? it['job']['description'] : '') },
-          "Start Date" => lambda {|it| format_local_dt(it['startDate'])},
-          "ETA/Time" => lambda {|it| it['duration'] ? format_human_duration(it['duration'] / 1000.0) : ''},
-          "Status" => lambda {|it| format_status(it['status'])},
-          "Error" => lambda {|it| it['process'] && (it['process']['message'] || it['process']['error']) ? red + (it['process']['message'] || it['process']['error']) + cyan : ''},
-          "Created By" => lambda {|it| it['createdBy'].nil? ? '' : it['createdBy']['displayName'] || it['createdBy']['username']}
-      }
-      description_cols["Process ID"] = lambda {|it| process['id']} if !process.nil?
-
-      print_description_list(description_cols, exec)
-
-      if !process.nil?
-        if options[:details]
-        process_data = get_process_event_data(process)
-          print_h2 "Execution Details"
-          description_cols = {
-              "Process ID" => lambda {|it| it[:id]},
-              "Description" => lambda {|it| it[:description]},
-              "Start Date" => lambda {|it| it[:start_date]},
-              "Created By" => lambda {|it| it[:created_by]},
-              "Duration" => lambda {|it| it[:duration]},
-              "Status" => lambda {|it| it[:status]}
-          }
-          if !options[:details]
-            description_cols["Output"] = lambda {|it| it[:output]} if process_data[:output] && process_data[:output].strip.length > 0
-            description_cols["Error"] = lambda {|it| it[:error]} if process_data[:error] && process_data[:error].strip.length > 0
-          end
-
-          print_description_list(description_cols, process_data)
-
-          if process_data[:output] && process_data[:output].strip.length > 0
-            print_h2 "Output"
-            print process['output']
-          end
-          if process_data[:error] && process_data[:error].strip.length > 0
-            print_h2 "Error"
-            print process['message'] || process['error']
-            print reset,"\n"
-          end
-        end
-
-        if process['events'] && !process['events'].empty?
-          print_h2 "Execution Events"
-          print_process_events(process['events'])
-        end
-      end
-      print reset,"\n"
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+    @jobs_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @jobs_interface.dry.get_execution(args[0], params)
+      return
     end
+    json_response = @jobs_interface.get_execution(args[0], params)
+    render_response(json_response, options, 'jobExecution') do
+      print_h1 "Morpheus Job Execution", [], options
+      print_job_execution(json_response['jobExecution'], options)
+    end
+    return 0, nil
   end
 
   def get_execution_event(args)
@@ -888,7 +772,7 @@ class Morpheus::Cli::JobsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id] [event]")
-      build_common_options(opts, options, [:json, :dry_run, :remote])
+      build_standard_get_options(opts, options)
       opts.footer = "Get details about a job.\n" +
           "[id] is required. Job execution ID.\n" +
           "[event] is required. Process event ID."
@@ -947,72 +831,8 @@ class Morpheus::Cli::JobsCommand
 
   private
 
-  def get_process_event_data(process_or_event)
-    {
-        id: process_or_event['id'],
-        description: process_or_event['description'] || (process_or_event['refType'] == 'instance' ? process_or_event['displayName'] : (process_or_event['processTypeName'] || '').capitalize),
-        start_date: format_local_dt(process_or_event['startDate']),
-        created_by: process_or_event['createdBy'] ? process_or_event['createdBy']['displayName'] : '',
-        duration: format_human_duration((process_or_event['duration'] || process_or_event['statusEta'] || 0) / 1000.0),
-        status: format_status(process_or_event['status']),
-        error: truncate_string(process_or_event['message'] || process_or_event['error'], 32),
-        output: truncate_string(process_or_event['output'], 32)
-    }
-  end
-
-  # both process and process events
-  def print_process_events(events, options={})
-    print as_pretty_table(events.collect {|it| get_process_event_data(it)}, [:id, :description, :start_date, :created_by, :duration, :status, :error], options)
-    print reset,"\n"
-  end
-
-  def print_job_executions(execs, options={})
-    if execs.empty?
-      print cyan,"No job executions found.",reset,"\n"
-    else
-      rows = execs.collect do |ex|
-        {
-            id: ex['id'],
-            job: ex['job'] ? ex['job']['name'] : '',
-            description: ex['description'] || ex['job'] ? ex['job']['description'] : '',
-            type: ex['job'] && ex['job']['type'] ? (ex['job']['type']['code'] == 'morpheus.workflow' ? 'Workflow' : 'Task') : '',
-            start: format_local_dt(ex['startDate']),
-            duration: ex['duration'] ? format_human_duration(ex['duration'] / 1000.0) : '',
-            status: format_status(ex['status']),
-            error: truncate_string(ex['process'] && (ex['process']['message'] || ex['process']['error']) ? ex['process']['message'] || ex['process']['error'] : '', 32)
-        }
-      end
-
-      columns = [
-          :id, :job, :type, {'START DATE' => :start}, {'ETA/TIME' => :duration}, :status, :error
-      ]
-      print as_pretty_table(rows, columns, options)
-      print reset,"\n"
-    end
-  end
-
-  def format_status(status_string, return_color=cyan)
-    out = ""
-    if status_string
-      if ['complete','success', 'successful', 'ok'].include?(status_string)
-        out << "#{green}#{status_string.upcase}"
-      elsif ['error', 'offline', 'failed', 'failure'].include?(status_string)
-        out << "#{red}#{status_string.upcase}"
-      else
-        out << "#{yellow}#{status_string.upcase}"
-      end
-    end
-    out + return_color
-  end
-
-  def find_by_name_or_id(type, val)
-    interface = instance_variable_get "@#{type}s_interface"
-    typeCamelCase = type.gsub(/(?:^|_)([a-z])/) do $1.upcase end
-    typeCamelCase = typeCamelCase[0, 1].downcase + typeCamelCase[1..-1]
-    (val.to_s =~ /\A\d{1,}\Z/) ? interface.get(val.to_i)[typeCamelCase] : interface.list({'name' => val})["#{typeCamelCase}s"].first
-  end
-
   def load_job_type_id_by_code(code)
     @options_interface.options_for_source('jobTypes', {})['data'].find {|it| it['code'] == code}['value'] rescue nil
   end
+
 end

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

@@ -118,10 +118,10 @@ class Morpheus::Cli::LibraryContainerTypesCommand
     begin
       @library_container_types_interface.setopts(options)
       if options[:dry_run]
-        if arg.to_s =~ /\A\d{1,}\Z/
-          print_dry_run @library_container_types_interface.dry.get(layout_id, arg.to_i)
+        if id.to_s =~ /\A\d{1,}\Z/
+          print_dry_run @library_container_types_interface.dry.get(layout_id, id.to_i)
         else
-          print_dry_run @library_container_types_interface.dry.list(layout_id, {name:arg})
+          print_dry_run @library_container_types_interface.dry.list(layout_id, {name:id})
         end
         return
       end
@@ -255,6 +255,24 @@ class Morpheus::Cli::LibraryContainerTypesCommand
       opts.on('--technology CODE', String, "Technology. This is the provision type code.") do |val|
         params['provisionTypeCode'] = val
       end
+      opts.on('--ports NAME=PORT,NAME=PORT', String, "List of exposed port definitions in the format NAME=PORT|PROTOCOL, Example: \"WEB=80|HTTP,SECURE=443|HTTPS\"") do |val|
+        params['containerPorts'] ||= []
+        parsed_ports = val.split(",").each do |value_pair|
+          k,v = value_pair.strip.split("=")
+          value_array = v.split("|")
+          port_name = k.to_s.strip
+          port_number = value_array[0].to_s.strip.to_i
+          exposed_port = {'name' => port_name,'port' => port_number }
+          if value_array[1]
+            exposed_port['loadBalanceProtocol'] = value_array[1].strip
+          end
+          if exposed_port['name'].to_s.empty? || !exposed_port['port'] || exposed_port['port'].to_i <= 0
+            raise_command_error "Invalid exposed port definition: '#{value_pair}'. Expected format is 'NAME=PORT'", args, optparse
+          end
+          params['containerPorts'] << exposed_port
+        end
+        # options[:options]['containerPorts'] = params['containerPorts']
+      end
       opts.on('--scripts x,y,z', Array, "List of Script IDs") do |val|
         script_ids = val #.collect {|it| it.to_i }
       end
@@ -345,6 +363,12 @@ class Morpheus::Cli::LibraryContainerTypesCommand
         
         # payload.deep_merge!(provision_type_v_prompt)
         
+        # PORTS 
+        # if !params['containerPorts']
+        #   v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'containerPorts', 'type' => 'exposedPorts', 'fieldLabel' => 'Exposed Ports', 'description' => 'The exposed ports in the format NAME=PORT,NAME=PORT for example HTTP=80,HTTPS=443'}], prompt_params)
+        #   params['containerPorts'] = v_prompt['containerPorts']
+        # end
+
         # ENVIRONMENT VARIABLES
         if evars
           params['environmentVariables'] = evars
@@ -367,6 +391,7 @@ class Morpheus::Cli::LibraryContainerTypesCommand
           # prompt
         end
 
+
         # payload = {'containerType' => params}
         payload['containerType'] ||= {}
         payload['containerType'].deep_merge!(params)
@@ -422,6 +447,24 @@ class Morpheus::Cli::LibraryContainerTypesCommand
       # opts.on('--technology CODE', String, "Technology") do |val|
       #   params['provisionTypeCode'] = val
       # end
+      opts.on('--ports NAME=PORT,NAME=PORT', String, "List of exposed port definitions in the format NAME=PORT|PROTOCOL, Example: \"WEB=80|HTTP,SECURE=443|HTTPS\"") do |val|
+        params['containerPorts'] ||= []
+        parsed_ports = val.split(",").each do |value_pair|
+          k,v = value_pair.strip.split("=")
+          value_array = v.split("|")
+          port_name = k.to_s.strip
+          port_number = value_array[0].to_s.strip.to_i
+          exposed_port = {'name' => port_name,'port' => port_number }
+          if value_array[1]
+            exposed_port['loadBalanceProtocol'] = value_array[1].strip
+          end
+          if exposed_port['name'].to_s.empty? || !exposed_port['port'] || exposed_port['port'].to_i <= 0
+            raise_command_error "Invalid exposed port definition: '#{value_pair}'. Expected format is 'NAME=PORT'", args, optparse
+          end
+          params['containerPorts'] << exposed_port
+        end
+        # options[:options]['containerPorts'] = params['containerPorts']
+      end
       opts.on('--scripts x,y,z', Array, "List of Script IDs") do |val|
         script_ids = val #.collect {|it| it.to_i }
       end
@@ -455,6 +498,12 @@ class Morpheus::Cli::LibraryContainerTypesCommand
         # params = Morpheus::Cli::OptionTypes.prompt(option_types, options[:options], @api_client, options[:params])
         payload.deep_merge!({'containerType' => passed_options}) unless passed_options.empty?
         
+        # PORTS 
+        # if !params['containerPorts']
+        #   v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'containerPorts', 'type' => 'exposedPorts', 'fieldLabel' => 'Exposed Ports', 'description' => 'The exposed ports in the format NAME=PORT,NAME=PORT for example HTTP=80,HTTPS=443'}], prompt_params)
+        #   params['containerPorts'] = v_prompt['containerPorts']
+        # end
+
         # ENVIRONMENT VARIABLES
         if evars
 

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

@@ -36,20 +36,18 @@ class Morpheus::Cli::LibraryOptionTypesCommand
       options[:phrase] = args.join(" ")
     end
     connect(options)
-    begin
-      params = {}
-      params.merge!(parse_list_options(options))
-      @option_types_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @option_types_interface.dry.list(params)
-        return
-      end
+    
+    params = {}
+    params.merge!(parse_list_options(options))
+    @option_types_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @option_types_interface.dry.list(params)
+      return
+    end
 
-      json_response = @option_types_interface.list(params)
-
-      render_result = render_with_format(json_response, options, 'optionTypes')
-      return 0 if render_result
+    json_response = @option_types_interface.list(params)
 
+    render_response(json_response, options, "optionTypes") do
       option_types = json_response['optionTypes']
       subtitles = []
       subtitles += parse_list_subtitles(options)
@@ -84,10 +82,8 @@ class Morpheus::Cli::LibraryOptionTypesCommand
         print_results_pagination(json_response)
       end
       print reset,"\n"
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
+    return 0, nil
   end
 
    def get(args)
@@ -110,23 +106,21 @@ class Morpheus::Cli::LibraryOptionTypesCommand
   end
 
   def _get(id, options)
-    begin
-      @option_types_interface.setopts(options)
-      if options[:dry_run]
-        if id.to_s =~ /\A\d{1,}\Z/
-          print_dry_run @option_types_interface.dry.get(id.to_i)
-        else
-          print_dry_run @option_types_interface.dry.list({name: id})
-        end
-        return
+    
+    @option_types_interface.setopts(options)
+    if options[:dry_run]
+      if id.to_s =~ /\A\d{1,}\Z/
+        print_dry_run @option_types_interface.dry.get(id.to_i)
+      else
+        print_dry_run @option_types_interface.dry.list({name: id})
       end
-      option_type = find_option_type_by_name_or_id(id)
-      return 1 if option_type.nil?
-      json_response = {'optionType' => option_type}
-
-      render_result = render_with_format(json_response, options, 'optionType')
-      return 0 if render_result
+      return
+    end
+    option_type = find_option_type_by_name_or_id(id)
+    return 1 if option_type.nil?
+    json_response = {'optionType' => option_type}
 
+    render_response(json_response, options, "optionType") do
       print_h1 "Option Type Details"
       print cyan
       columns = {
@@ -144,15 +138,13 @@ class Morpheus::Cli::LibraryOptionTypesCommand
         "Default Value" => 'defaultValue',
         "Required" => lambda {|it| format_boolean(it['required']) },
         "Export As Tag" => lambda {|it| it['exportMeta'].nil? ? '' : format_boolean(it['exportMeta']) },
+        "Verify Pattern" => 'verifyPattern',
       }
       columns.delete("Option List") if option_type['optionList'].nil?
       print as_description_list(option_type, columns, options)
       print reset,"\n"
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
     end
+    return 0, nil
   end
 
   def add(args)
@@ -165,37 +157,38 @@ class Morpheus::Cli::LibraryOptionTypesCommand
     end
     optparse.parse!(args)
     connect(options)
-    begin
-      payload = nil
-      if options[:payload]
-        payload = options[:payload]
-        payload.deep_merge!({'optionType' => parse_passed_options(options)})
-      else
-        payload = {}
-        payload.deep_merge!({'optionType' => parse_passed_options(options)})
-        option_type_payload = Morpheus::Cli::OptionTypes.prompt(new_option_type_option_types, options[:options], @api_client)
-        # tweak payload for API
-        option_type_payload['optionList'] = {'id' => option_type_payload['optionList'].to_i} if option_type_payload['optionList'].is_a?(String) || option_type_payload['optionList'].is_a?(Numeric)
-        option_type_payload['required'] = ['on','true'].include?(option_type_payload['required'].to_s) if option_type_payload.key?('required')
-        option_type_payload['exportMeta'] = ['on','true'].include?(option_type_payload['exportMeta'].to_s) if option_type_payload.key?('exportMeta')
-        payload.deep_merge!({'optionType' => option_type_payload})
-      end
-      @option_types_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @option_types_interface.dry.create(payload)
-        return
-      end
-      json_response = @option_types_interface.create(payload)
-      render_result = render_with_format(json_response, options)
-      return 0 if render_result
+    verify_args!(args:args, optparse:optparse, max:1)
+    if args[0]
+      options[:options]['name'] = args[0]
+    end
+    
+    payload = nil
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({'optionType' => parse_passed_options(options)})
+    else
+      payload = {}
+      payload.deep_merge!({'optionType' => parse_passed_options(options)})
+      option_type_payload = Morpheus::Cli::OptionTypes.prompt(new_option_type_option_types, options[:options], @api_client)
+      # tweak payload for API
+      option_type_payload['optionList'] = {'id' => option_type_payload['optionList'].to_i} if option_type_payload['optionList'].is_a?(String) || option_type_payload['optionList'].is_a?(Numeric)
+      option_type_payload['required'] = ['on','true'].include?(option_type_payload['required'].to_s) if option_type_payload.key?('required')
+      option_type_payload['exportMeta'] = ['on','true'].include?(option_type_payload['exportMeta'].to_s) if option_type_payload.key?('exportMeta')
+      payload.deep_merge!({'optionType' => option_type_payload})
+    end
+    @option_types_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @option_types_interface.dry.create(payload)
+      return
+    end
+    json_response = @option_types_interface.create(payload)
+      
+    render_response(json_response, options, "optionType") do
       option_type = json_response['optionType']
       print_green_success "Added Option Type #{option_type['name']}"
-      #list([])
-      get([option_type['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+      _get(option_type['id'], options)
     end
+    return 0, nil
   end
 
   def update(args)
@@ -302,6 +295,7 @@ class Morpheus::Cli::LibraryOptionTypesCommand
       {'fieldName' => 'defaultValue', 'fieldLabel' => 'Default Value', 'type' => 'text', 'displayOrder' => 9},
       {'fieldName' => 'required', 'fieldLabel' => 'Required', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 10},
       {'fieldName' => 'exportMeta', 'fieldLabel' => 'Export As Tag', 'type' => 'checkbox', 'defaultValue' => false, 'description' => 'Export as Tag.', 'displayOrder' => 11},
+      {'fieldName' => 'verifyPattern', 'fieldLabel' => 'Verify Pattern', 'type' => 'text', 'dependsOnCode' => 'optionType.type:text', 'description' => 'A regexp string that validates the input, use (?i) to make the matcher case insensitive', 'displayOrder' => 12},
     ]
   end