morpheus-cli 5.3.1 → 5.3.2.2

data/lib/morpheus/cli/invoices_command.rb

@@ -31,20 +31,16 @@ class Morpheus::Cli::InvoicesCommand
         options[:show_all] = true
         options[:show_dates] = true
         options[:show_estimates] = true
-        # options[:show_costs] = true
-        options[:show_prices] = true
+        options[:show_costs] = true
       end
       opts.on('--dates', "Display Ref Start, Ref End, etc.") do |val|
         options[:show_dates] = true
       end
-      opts.on('--estimates', '--estimates', "Display all estimated costs, from usage info: Compute, Storage, Network, Extra" ) do
-        options[:show_estimates] = true
+      opts.on('--costs', '--costs', "Display Costs in addition to prices" ) do
+        options[:show_costs] = true
       end
-      # opts.on('--costs', '--costs', "Display all costs: Compute, Storage, Network, Extra" ) do
-      #   options[:show_costs] = true
-      # end
-      opts.on('--prices', '--prices', "Display prices: Total, Compute, Storage, Network, Extra" ) do
-        options[:show_prices] = true
+      opts.on('--estimates', '--estimates', "Display all estimated prices, from usage metering info: Compute, Memory, Storage, Network, Extra" ) do
+        options[:show_estimates] = true
       end
       opts.on('-t', '--type TYPE', "Filter by Ref Type eg. ComputeSite (Group), ComputeZone (Cloud), ComputeServer (Host), Instance, Container, User") do |val|
         params['refType'] ||= []
@@ -226,42 +222,55 @@ class Morpheus::Cli::InvoicesCommand
           # {"LAST COST DATE" => lambda {|it| format_local_dt(it['lastCostDate']) } },
           # {"LAST ACTUAL DATE" => lambda {|it| format_local_dt(it['lastActualDate']) } },
         ] : []) + [
-          {"COMPUTE" => lambda {|it| format_money(it['computeCost'], 'usd', {sigdig:options[:sigdig]}) } },
-          # {"MEMORY" => lambda {|it| format_money(it['memoryCost']) } },
-          {"STORAGE" => lambda {|it| format_money(it['storageCost'], 'usd', {sigdig:options[:sigdig]}) } },
-          {"NETWORK" => lambda {|it| format_money(it['networkCost'], 'usd', {sigdig:options[:sigdig]}) } },
-          {"EXTRA" => lambda {|it| format_money(it['extraCost'], 'usd', {sigdig:options[:sigdig]}) } },
-          {"MTD" => lambda {|it| format_money(it['runningCost'], 'usd', {sigdig:options[:sigdig]}) } },
-          {"TOTAL" => lambda {|it| 
-            format_money(it['totalCost'], 'usd', {sigdig:options[:sigdig]}) + ((it['totalCost'].to_f > 0 && it['totalCost'] != it['runningCost']) ? " (Projected)" : "")
+          {"COMPUTE PRICE" => lambda {|it| format_money(it['computePrice'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"MEMORY PRICE" => lambda {|it| format_money(it['memoryPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"STORAGE PRICE" => lambda {|it| format_money(it['storagePrice'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"NETWORK PRICE" => lambda {|it| format_money(it['networkPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"EXTRA PRICE" => lambda {|it| format_money(it['extraPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"MTD PRICE" => lambda {|it| format_money(it['runningPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"TOTAL PRICE" => lambda {|it| 
+            format_money(it['totalPrice'], 'usd', {sigdig:options[:sigdig]}) + ((it['totalCost'].to_f > 0 && it['totalCost'] != it['runningCost']) ? " (Projected)" : "")
           } }
         ]
         
-        if options[:show_prices]
+        if options[:show_costs] && json_response['masterAccount'] != false
           columns += [
-            {"COMPUTE PRICE" => lambda {|it| format_money(it['computePrice'], 'usd', {sigdig:options[:sigdig]}) } },
-            # {"MEMORY PRICE" => lambda {|it| format_money(it['memoryPrice'], 'usd', {sigdig:options[:sigdig]}) } },
-            {"STORAGE PRICE" => lambda {|it| format_money(it['storagePrice'], 'usd', {sigdig:options[:sigdig]}) } },
-            {"NETWORK PRICE" => lambda {|it| format_money(it['networkPrice'], 'usd', {sigdig:options[:sigdig]}) } },
-            {"EXTRA PRICE" => lambda {|it| format_money(it['extraPrice'], 'usd', {sigdig:options[:sigdig]}) } },
-            {"MTD PRICE" => lambda {|it| format_money(it['runningPrice'], 'usd', {sigdig:options[:sigdig]}) } },
-            {"TOTAL PRICE" => lambda {|it| 
-              format_money(it['totalPrice'], 'usd', {sigdig:options[:sigdig]}) + ((it['totalCost'].to_f > 0 && it['totalCost'] != it['runningCost']) ? " (Projected)" : "")
-            } }
-          ]
+          {"COMPUTE COST" => lambda {|it| format_money(it['computeCost'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"MEMORY COST" => lambda {|it| format_money(it['memoryCost']) } },
+          {"STORAGE COST" => lambda {|it| format_money(it['storageCost'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"NETWORK COST" => lambda {|it| format_money(it['networkCost'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"EXTRA COST" => lambda {|it| format_money(it['extraCost'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"MTD COST" => lambda {|it| format_money(it['runningCost'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"TOTAL COST" => lambda {|it| 
+            format_money(it['totalCost'], 'usd', {sigdig:options[:sigdig]}) + ((it['totalCost'].to_f > 0 && it['totalCost'] != it['runningCost']) ? " (Projected)" : "")
+          } }
+        ]
         end
         if options[:show_estimates]
           columns += [
-            {"COMPUTE EST." => lambda {|it| format_money(it['estimatedComputeCost'], 'usd', {sigdig:options[:sigdig]}) } },
-            # {"MEMORY  EST." => lambda {|it| format_money(it['estimatedMemoryCost'], 'usd', {sigdig:options[:sigdig]}) } },
-            {"STORAGE EST." => lambda {|it| format_money(it['estimatedStorageCost'], 'usd', {sigdig:options[:sigdig]}) } },
-            {"NETWORK EST." => lambda {|it| format_money(it['estimatedNetworkCost'], 'usd', {sigdig:options[:sigdig]}) } },
-            {"EXTRA EST." => lambda {|it| format_money(it['estimatedExtraCost'], 'usd', {sigdig:options[:sigdig]}) } },
-            {"MTD EST." => lambda {|it| format_money(it['estimatedRunningCost'], 'usd', {sigdig:options[:sigdig]}) } },
-            {"TOTAL EST." => lambda {|it| 
-              format_money(it['estimatedTotalCost'], 'usd', {sigdig:options[:sigdig]}) + ((it['estimatedTotalCost'].to_f > 0 && it['estimatedTotalCost'] != it['estimatedRunningCost']) ? " (Projected)" : "")
+            {"METERED COMPUTE PRICE" => lambda {|it| format_money(it['estimatedComputePrice'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"METERED MEMORY PRICE" => lambda {|it| format_money(it['estimatedMemoryPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"METERED STORAGE PRICE" => lambda {|it| format_money(it['estimatedStoragePrice'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"METERED NETWORK PRICE" => lambda {|it| format_money(it['estimatedNetworkPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"METERED EXTRA PRICE" => lambda {|it| format_money(it['estimatedExtraPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"METERED MTD PRICE" => lambda {|it| format_money(it['estimatedRunningPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+            {"METERED TOTAL PRICE" => lambda {|it| 
+              format_money(it['estimatedTotalPrice'], 'usd', {sigdig:options[:sigdig]}) + ((it['estimatedTotalPrice'].to_f > 0 && it['estimatedTotalPrice'] != it['estimatedRunningPrice']) ? " (Projected)" : "")
             } },
           ]
+          if options[:show_costs] && json_response['masterAccount'] != false
+            columns += [
+              {"METERED COMPUTE COST" => lambda {|it| format_money(it['estimatedComputeCost'], 'usd', {sigdig:options[:sigdig]}) } },
+              {"METERED MEMORY COST" => lambda {|it| format_money(it['estimatedMemoryCost'], 'usd', {sigdig:options[:sigdig]}) } },
+              {"METERED STORAGE COST" => lambda {|it| format_money(it['estimatedStorageCost'], 'usd', {sigdig:options[:sigdig]}) } },
+              {"METERED NETWORK COST" => lambda {|it| format_money(it['estimatedNetworkCost'], 'usd', {sigdig:options[:sigdig]}) } },
+              {"METERED EXTRA COST" => lambda {|it| format_money(it['estimatedExtraCost'], 'usd', {sigdig:options[:sigdig]}) } },
+              {"METERED MTD COST" => lambda {|it| format_money(it['estimatedRunningCost'], 'usd', {sigdig:options[:sigdig]}) } },
+              {"METERED TOTAL COST" => lambda {|it| 
+                format_money(it['estimatedTotalCost'], 'usd', {sigdig:options[:sigdig]}) + ((it['estimatedTotalCost'].to_f > 0 && it['estimatedTotalCost'] != it['estimatedRunningCost']) ? " (Projected)" : "")
+              } },
+            ]
+          end
         end
         columns += [
           {"ESTIMATE" => lambda {|it| format_boolean(it['estimate']) } },
@@ -297,18 +306,22 @@ class Morpheus::Cli::InvoicesCommand
 
           if invoice_totals
             cost_rows = [
-              {label: 'Cost'.upcase, compute: invoice_totals['actualComputeCost'], memory: invoice_totals['actualMemoryCost'], storage: invoice_totals['actualStorageCost'], network: invoice_totals['actualNetworkCost'], license: invoice_totals['actualLicenseCost'], extra: invoice_totals['actualExtraCost'], running: invoice_totals['actualRunningCost'], total: invoice_totals['actualTotalCost']},
+              {label: 'Price'.upcase, compute: invoice_totals['actualComputePrice'], memory: invoice_totals['actualMemoryPrice'], storage: invoice_totals['actualStoragePrice'], network: invoice_totals['actualNetworkPrice'], license: invoice_totals['actualLicensePrice'], extra: invoice_totals['actualExtraPrice'], running: invoice_totals['actualRunningPrice'], total: invoice_totals['actualTotalPrice']},
             ]
-            if options[:show_prices]
+            if options[:show_costs]
               cost_rows += [
-                {label: 'Price'.upcase, compute: invoice_totals['actualComputePrice'], memory: invoice_totals['actualMemoryPrice'], storage: invoice_totals['actualStoragePrice'], network: invoice_totals['actualNetworkPrice'], license: invoice_totals['actualLicensePrice'], extra: invoice_totals['actualExtraPrice'], running: invoice_totals['actualRunningPrice'], total: invoice_totals['actualTotalPrice']},
+                {label: 'Cost'.upcase, compute: invoice_totals['actualComputeCost'], memory: invoice_totals['actualMemoryCost'], storage: invoice_totals['actualStorageCost'], network: invoice_totals['actualNetworkCost'], license: invoice_totals['actualLicenseCost'], extra: invoice_totals['actualExtraCost'], running: invoice_totals['actualRunningCost'], total: invoice_totals['actualTotalCost']}
               ]
             end
             if options[:show_estimates]
               cost_rows += [
-                {label: 'Metered Cost'.upcase, compute: invoice_totals['estimatedComputeCost'], memory: invoice_totals['estimatedMemoryCost'], storage: invoice_totals['estimatedStorageCost'], network: invoice_totals['estimatedNetworkCost'], license: invoice_totals['estimatedLicenseCost'], extra: invoice_totals['estimatedExtraCost'], running: invoice_totals['estimatedRunningCost'], total: invoice_totals['estimatedTotalCost']},
-                {label: 'Metered Price'.upcase, compute: invoice_totals['estimatedComputePrice'], memory: invoice_totals['estimatedMemoryPrice'], storage: invoice_totals['estimatedStoragePrice'], network: invoice_totals['estimatedNetworkPrice'], license: invoice_totals['estimatedLicensePrice'], extra: invoice_totals['estimatedExtraPrice'], running: invoice_totals['estimatedRunningPrice'], total: invoice_totals['estimatedTotalPrice']},
+                {label: 'Metered Price'.upcase, compute: invoice_totals['estimatedComputePrice'], memory: invoice_totals['estimatedMemoryPrice'], storage: invoice_totals['estimatedStoragePrice'], network: invoice_totals['estimatedNetworkPrice'], license: invoice_totals['estimatedLicensePrice'], extra: invoice_totals['estimatedExtraPrice'], running: invoice_totals['estimatedRunningPrice'], total: invoice_totals['estimatedTotalPrice']}
               ]
+              if options[:show_costs]
+                cost_rows += [
+                  {label: 'Metered Cost'.upcase, compute: invoice_totals['estimatedComputeCost'], memory: invoice_totals['estimatedMemoryCost'], storage: invoice_totals['estimatedStorageCost'], network: invoice_totals['estimatedNetworkCost'], license: invoice_totals['estimatedLicenseCost'], extra: invoice_totals['estimatedExtraCost'], running: invoice_totals['estimatedRunningCost'], total: invoice_totals['estimatedTotalCost']}
+                ]
+              end
             end
             cost_columns = {
               "" => lambda {|it| it[:label] },
@@ -351,16 +364,15 @@ class Morpheus::Cli::InvoicesCommand
       opts.banner = subcommand_usage("[id]")
       opts.on('-a', '--all', "Display all details, costs and prices." ) do
         options[:show_estimates] = true
-        # options[:show_costs] = true
-        options[:show_prices] = true
+        options[:show_costs] = true
         options[:max_line_items] = 10000
       end
-      opts.on('--prices', '--prices', "Display prices: Total, Compute, Storage, Network, Extra" ) do
-        options[:show_prices] = true
-      end
-      opts.on('--estimates', '--estimates', "Display all estimated costs, from usage info: Compute, Storage, Network, Extra" ) do
+      opts.on('--estimates', '--estimates', "Display all estimated prices, from usage metering info: Compute, Memory, Storage, Network, Extra" ) do
         options[:show_estimates] = true
       end
+      opts.on('--costs', '--costs', "Display Costs in addition to prices" ) do
+        options[:show_costs] = true
+      end
       opts.on('--no-line-items', '--no-line-items', "Do not display line items.") do |val|
         options[:hide_line_items] = true
       end
@@ -514,25 +526,25 @@ EOT
         print_results_pagination({total: line_items.size, size: paged_line_items.size}, {:label => "line item", :n_label => "line items"})
       end
 
-      # cost_types = ["Costs"]
-      # cost_types << "Prices" if options[:show_prices]
-      # cost_types << "Estimates" if options[:show_estimates]
-      # print_h2 cost_types.size == 1 ? "Totals" : "Total #{anded_list(cost_types)}"
       print_h2 "Invoice Totals"
 
       cost_rows = [
-        {label: 'Cost'.upcase, compute: invoice['computeCost'], memory: invoice['memoryCost'], storage: invoice['storageCost'], network: invoice['networkCost'], license: invoice['licenseCost'], extra: invoice['extraCost'], running: invoice['runningCost'], total: invoice['totalCost']},
+        {label: 'Price'.upcase, compute: invoice['computePrice'], memory: invoice['memoryPrice'], storage: invoice['storagePrice'], network: invoice['networkPrice'], license: invoice['licensePrice'], extra: invoice['extraPrice'], running: invoice['runningPrice'], total: invoice['totalPrice']},
       ]
-      if options[:show_prices]
+      if options[:show_costs] # && json_response['masterAccount'] != false
         cost_rows += [
-          {label: 'Price'.upcase, compute: invoice['computePrice'], memory: invoice['memoryPrice'], storage: invoice['storagePrice'], network: invoice['networkPrice'], license: invoice['licensePrice'], extra: invoice['extraPrice'], running: invoice['runningPrice'], total: invoice['totalPrice']},
+          {label: 'Cost'.upcase, compute: invoice['computeCost'], memory: invoice['memoryCost'], storage: invoice['storageCost'], network: invoice['networkCost'], license: invoice['licenseCost'], extra: invoice['extraCost'], running: invoice['runningCost'], total: invoice['totalCost']},
         ]
       end
       if options[:show_estimates]
         cost_rows += [
-          {label: 'Metered Cost'.upcase, compute: invoice['estimatedComputeCost'], memory: invoice['estimatedMemoryCost'], storage: invoice['estimatedStorageCost'], network: invoice['estimatedNetworkCost'], license: invoice['estimatedLicenseCost'], extra: invoice['estimatedExtraCost'], running: invoice['estimatedRunningCost'], total: invoice['estimatedTotalCost']},
-          {label: 'Metered Price'.upcase, compute: invoice['estimatedComputePrice'], memory: invoice['estimatedMemoryPrice'], storage: invoice['estimatedStoragePrice'], network: invoice['estimatedNetworkPrice'], license: invoice['estimatedLicensePrice'], extra: invoice['estimatedExtraPrice'], running: invoice['estimatedRunningPrice'], total: invoice['estimatedTotalPrice']},
+          {label: 'Metered Price'.upcase, compute: invoice['estimatedComputePrice'], memory: invoice['estimatedMemoryPrice'], storage: invoice['estimatedStoragePrice'], network: invoice['estimatedNetworkPrice'], license: invoice['estimatedLicensePrice'], extra: invoice['estimatedExtraPrice'], running: invoice['estimatedRunningPrice'], total: invoice['estimatedTotalPrice']}
         ]
+        if options[:show_costs] # && json_response['masterAccount'] != false
+          cost_rows += [
+            {label: 'Metered Cost'.upcase, compute: invoice['estimatedComputeCost'], memory: invoice['estimatedMemoryCost'], storage: invoice['estimatedStorageCost'], network: invoice['estimatedNetworkCost'], license: invoice['estimatedLicenseCost'], extra: invoice['estimatedExtraCost'], running: invoice['estimatedRunningCost'], total: invoice['estimatedTotalCost']},
+          ]
+        end
       end
       cost_columns = {
         "" => lambda {|it| it[:label] },
@@ -694,16 +706,12 @@ EOT
       opts.on('-a', '--all', "Display all details, costs and prices." ) do
         options[:show_actual_costs] = true
         options[:show_costs] = true
-        options[:show_prices] = true
       end
-      # opts.on('--actuals', '--actuals', "Display all actual costs: Compute, Storage, Network, Extra" ) do
+      # opts.on('--actuals', '--actuals', "Display all actual costs: Compute, Memory, Storage, Network, Extra" ) do
       #   options[:show_actual_costs] = true
       # end
-      # opts.on('--costs', '--costs', "Display all costs: Compute, Storage, Network, Extra" ) do
-      #   options[:show_costs] = true
-      # end
-      opts.on('--prices', '--prices', "Display prices: Total, Compute, Storage, Network, Extra" ) do
-        options[:show_prices] = true
+      opts.on('--costs', '--costs', "Display costs in addition to prices" ) do
+        options[:show_costs] = true
       end
       opts.on('--invoice-id ID', String, "Filter by Invoice ID") do |val|
         params['invoiceId'] ||= []
@@ -880,9 +888,9 @@ EOT
           {"USAGE" => lambda {|it| it['itemUsage'] } },
           {"RATE" => lambda {|it| it['itemRate'] } },
           {"UNIT" => lambda {|it| it['rateUnit'] } },
-          {"COST" => lambda {|it| format_money(it['itemCost'], 'usd', {sigdig:options[:sigdig]}) } },
-        ] + (options[:show_prices] ? [
           {"PRICE" => lambda {|it| format_money(it['itemPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+        ] + (options[:show_costs] ? [
+          {"COST" => lambda {|it| format_money(it['itemCost'], 'usd', {sigdig:options[:sigdig]}) } },
           {"TAX" => lambda {|it| format_money(it['itemTax'], 'usd', {sigdig:options[:sigdig]}) } },
         ] : []) + [
           {"ITEM ID" => lambda {|it| truncate_string_right(it['itemId'], 65) } },
@@ -915,9 +923,9 @@ EOT
             invoice_totals_columns = [
               {"Items" => lambda {|it| format_number(json_response['meta']['total']) rescue '' } },
               #{"Usage" => lambda {|it| it['itemUsage'] } },
-              {"Cost" => lambda {|it| format_money(it['itemCost'], 'usd', {sigdig:options[:sigdig]}) } },
-            ] + (options[:show_prices] ? [
               {"Price" => lambda {|it| format_money(it['itemPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+            ] + (options[:show_costs] ? [
+              {"Cost" => lambda {|it| format_money(it['itemCost'], 'usd', {sigdig:options[:sigdig]}) } },
               #{"Tax" => lambda {|it| format_money(it['itemTax'], 'usd', {sigdig:options[:sigdig]}) } },
           
             ] : [])

data/lib/morpheus/cli/key_pairs.rb

@@ -18,8 +18,8 @@ class Morpheus::Cli::KeyPairs
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
-    @key_pairs_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).key_pairs
+    @accounts_interface = @api_client.accounts
+    @key_pairs_interface = @api_client.key_pairs
   end
 
   def handle(args)

data/lib/morpheus/cli/library_cluster_layouts_command.rb

@@ -41,10 +41,9 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
       opts.footer = "List cluster layouts."
     end
     optparse.parse!(args)
+    # verify_args!(args:args, optparse:optparse, count:0)
     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
+      options[:phrase] = args.join(" ")
     end
     connect(options)
     begin

data/lib/morpheus/cli/library_container_scripts_command.rb

@@ -9,7 +9,7 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @container_scripts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_container_scripts
+    @container_scripts_interface = @api_client.library_container_scripts
   end
 
   def handle(args)
@@ -25,12 +25,11 @@ class Morpheus::Cli::LibraryContainerScriptsCommand
       opts.footer = "List container scripts."
     end
     optparse.parse!(args)
-    connect(options)
+    # verify_args!(args:args, optparse:optparse, count:0)
     if args.count > 0
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 0 and got (#{args.count}) #{args.join(', ')}\n#{optparse}"
-      return 1
+      options[:phrase] = args.join(" ")
     end
+    connect(options)
     begin
       # construct payload
       params.merge!(parse_list_options(options))

data/lib/morpheus/cli/library_container_templates_command.rb

@@ -11,7 +11,7 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @container_templates_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_container_templates
+    @container_templates_interface = @api_client.library_container_templates
   end
 
   def handle(args)
@@ -26,6 +26,10 @@ class Morpheus::Cli::LibraryContainerTemplatesCommand
       build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :dry_run, :remote])
     end
     optparse.parse!(args)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     connect(options)
     begin
       [:phrase, :offset, :max, :sort, :direction, :lastUpdated].each do |k|

data/lib/morpheus/cli/library_container_types_command.rb

@@ -18,12 +18,12 @@ class Morpheus::Cli::LibraryContainerTypesCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @library_container_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_container_types
-    @library_layouts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_layouts
-    #@library_instance_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_instance_types
-    @provision_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).provision_types
-    @option_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).option_types
-    #@option_type_lists_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).option_type_lists
+    @library_container_types_interface = @api_client.library_container_types
+    @library_layouts_interface = @api_client.library_layouts
+    #@library_instance_types_interface = @api_client.library_instance_types
+    @provision_types_interface = @api_client.provision_types
+    @option_types_interface = @api_client.option_types
+    #@option_type_lists_interface = @api_client.option_type_lists
   end
 
   def handle(args)
@@ -49,10 +49,9 @@ class Morpheus::Cli::LibraryContainerTypesCommand
       opts.footer = "List node types."
     end
     optparse.parse!(args)
+    # verify_args!(args:args, optparse:optparse, count:0)
     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
+      options[:phrase] = args.join(" ")
     end
     connect(options)
     begin

data/lib/morpheus/cli/library_instance_types_command.rb

@@ -19,10 +19,10 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @library_instance_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_instance_types
-    @provision_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).provision_types
-    @option_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).option_types
-    @option_type_lists_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).option_type_lists
+    @library_instance_types_interface = @api_client.library_instance_types
+    @provision_types_interface = @api_client.provision_types
+    @option_types_interface = @api_client.option_types
+    @option_type_lists_interface = @api_client.option_type_lists
   end
 
   def handle(args)
@@ -47,10 +47,9 @@ class Morpheus::Cli::LibraryInstanceTypesCommand
       opts.footer = "List instance types."
     end
     optparse.parse!(args)
+    # verify_args!(args:args, optparse:optparse, count:0)
     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
+      options[:phrase] = args.join(" ")
     end
     connect(options)
     begin

data/lib/morpheus/cli/library_layouts_command.rb

@@ -21,14 +21,14 @@ class Morpheus::Cli::LibraryLayoutsCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @library_layouts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_layouts
-    @library_instance_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_instance_types
+    @library_layouts_interface = @api_client.library_layouts
+    @library_instance_types_interface = @api_client.library_instance_types
     @library_container_types_interface = @api_client.library_container_types
     @spec_templates_interface = @api_client.library_spec_templates
     @spec_template_types_interface = @api_client.library_spec_template_types
-    @provision_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).provision_types
-    @option_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).option_types
-    @option_type_lists_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).option_type_lists
+    @provision_types_interface = @api_client.provision_types
+    @option_types_interface = @api_client.option_types
+    @option_type_lists_interface = @api_client.option_type_lists
   end
 
   def handle(args)
@@ -59,6 +59,10 @@ class Morpheus::Cli::LibraryLayoutsCommand
       opts.footer = "List layouts."
     end
     optparse.parse!(args)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     connect(options)
     begin
       # construct payload

data/lib/morpheus/cli/library_option_lists_command.rb

@@ -9,7 +9,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
   include Morpheus::Cli::LibraryHelper
 
   set_command_name :'library-option-lists'
-  register_subcommands :list, :get, :add, :update, :remove
+  register_subcommands :list, :get, :list_items, :add, :update, :remove
 
   def initialize()
     # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
@@ -17,10 +17,10 @@ class Morpheus::Cli::LibraryOptionListsCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @library_instance_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_instance_types
-    @provision_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).provision_types
-    @option_types_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).option_types
-    @option_type_lists_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).option_type_lists
+    @library_instance_types_interface = @api_client.library_instance_types
+    @provision_types_interface = @api_client.provision_types
+    @option_types_interface = @api_client.option_types
+    @option_type_lists_interface = @api_client.option_type_lists
   end
 
   def handle(args)
@@ -35,6 +35,10 @@ class Morpheus::Cli::LibraryOptionListsCommand
       opts.footer = "List option lists."
     end
     optparse.parse!(args)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
     connect(options)
     begin
       params = {}
@@ -61,16 +65,14 @@ class Morpheus::Cli::LibraryOptionListsCommand
             id: option_type_list['id'],
             name: option_type_list['name'],
             description: option_type_list['description'],
-            type: option_type_list['type'],
-            size: option_type_list['listItems'] ? option_type_list['listItems'].size : ''
+            type: ((option_type_list['type'] == 'api') ? "#{option_type_list['type']} (#{option_type_list['apiType']})" : option_type_list['type'])
           }
         end
           columns = [
           :id,
           :name,
           :description,
-          :type,
-          :size
+          :type
         ]
         print cyan
         print as_pretty_table(rows, columns, options)
@@ -90,8 +92,8 @@ class Morpheus::Cli::LibraryOptionListsCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
       build_standard_get_options(opts, options)
-      opts.on(nil,'--no-items', "Do not display List Items") do |val|
-        options[:no_list_items] = true
+      opts.on(nil,'--items', "Load and display option list items") do |val|
+        options[:list_items] = true
       end
       opts.footer = "Get details about an option list.\n" + 
                     "[name] is required. This is the name or id of an option list. Supports 1-N [name] arguments."
@@ -108,20 +110,31 @@ class Morpheus::Cli::LibraryOptionListsCommand
   end
   
   def _get(id, options)
-    
+    params = {}
+    params.merge!(parse_query_options(options))
     begin
       @option_type_lists_interface.setopts(options)
       if options[:dry_run]
         if id.to_s =~ /\A\d{1,}\Z/
-          print_dry_run @option_type_lists_interface.dry.get(id.to_i)
+          print_dry_run @option_type_lists_interface.dry.get(id.to_i, params)
         else
-          print_dry_run @option_type_lists_interface.dry.list({name: id})
+          print_dry_run @option_type_lists_interface.dry.list(params.merge({name: id}))
         end
         return
       end
       option_type_list = find_option_type_list_by_name_or_id(id)
       return 1 if option_type_list.nil?
-
+      list_items = nil
+      if options[:list_items]
+        list_items = option_type_list['listItems']
+        if list_items.nil?
+          begin
+            list_items = @option_type_lists_interface.list_items(option_type_list['id'])['listItems']
+          rescue => e
+            puts_error "Failed to load option list items: #{e.message}"
+          end
+        end
+      end
       json_response = {'optionTypeList' => option_type_list}
       render_result = render_with_format(json_response, options, 'optionTypeList')
       return 0 if render_result
@@ -142,12 +155,14 @@ class Morpheus::Cli::LibraryOptionListsCommand
           "ID" => 'id',
           "Name" => 'name',
           "Description" => 'description',
-          "Type" => lambda {|it| it['type'].to_s.capitalize },
+          "Type" => lambda {|it| it['type'] },
+          "API Type" => lambda {|it| it['apiType'] },
           "Source URL" => 'sourceUrl',
           "Real Time" => lambda {|it| format_boolean it['realTime'] },
           "Ignore SSL Errors" => lambda {|it| format_boolean it['ignoreSSLErrors'] },
           "Source Method" => lambda {|it| it['sourceMethod'].to_s.upcase }
         }
+        option_list_columns.delete("API Type") if option_type_list['type'] != 'api'
         source_headers = []
         if option_type_list['config'] && option_type_list['config']['sourceHeaders']
           source_headers = option_type_list['config']['sourceHeaders'].collect do |header|
@@ -174,12 +189,13 @@ class Morpheus::Cli::LibraryOptionListsCommand
           print reset,"#{option_type_list['requestScript']}","\n",reset
         end
       end
-      if options[:no_list_items] != true
-        list_items = option_type_list['listItems']
+      if options[:list_items]
+        print_h2 "List Items"
         if list_items && list_items.size > 0
-          print_h2 "List Items"
           print as_pretty_table(list_items, [:name, :value], options)
           print_results_pagination({size: list_items.size, total: list_items.size})
+        else
+          print cyan,"No list items found.",reset,"\n"
         end
       end
       print reset,"\n"
@@ -189,6 +205,42 @@ class Morpheus::Cli::LibraryOptionListsCommand
     end
   end
 
+  def list_items(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name]")
+      build_standard_get_options(opts, options)
+      opts.footer = "List items for an option list.\n" + 
+                    "[name] is required. This is the name or id of an option list."
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:1)
+    connect(options)
+    option_type_list = find_option_type_list_by_name_or_id(args[0])
+    return 1 if option_type_list.nil?
+
+    params.merge!(parse_list_options(options))
+    @option_type_lists_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @option_type_lists_interface.dry.list_items(option_type_list['id'], params)
+      return
+    end
+    json_response = @option_type_lists_interface.list_items(option_type_list['id'], params)
+    list_items = json_response['listItems']
+    render_response(json_response, options, "listItems") do
+      print_h2 "List Items"
+      if list_items && list_items.size > 0
+        print as_pretty_table(list_items, [:name, :value], options)
+        print_results_pagination({size: list_items.size, total: list_items.size})
+      else
+        print cyan,"No list items found.",reset,"\n"
+      end
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+
   def add(args)
     options = {}
     my_option_types = nil
@@ -373,7 +425,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
         {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'realTime', 'fieldLabel' => 'Real Time', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 7},
         {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'sourceMethod', 'fieldLabel' => 'Source Method', 'type' => 'select', 'selectOptions' => [{'name' => 'GET', 'value' => 'GET'}, {'name' => 'POST', 'value' => 'POST'}], 'defaultValue' => 'GET', 'required' => true, 'displayOrder' => 8},
         # sourceHeaders component (is done afterwards manually)
-        {'dependsOnCode' => 'optionTypeList.type:api', 'fieldName' => 'apiType', 'fieldLabel' => 'Option List', 'type' => 'select', 'optionSource' => 'apiOptionLists', 'required' => true, 'description' => 'The code of the api list to use, eg. clouds, servers, etc.', 'displayOrder' => 9},
+        {'dependsOnCode' => 'optionTypeList.type:api', 'fieldName' => 'apiType', 'fieldLabel' => 'Option List', 'type' => 'select', 'optionSource' => 'apiOptionLists', 'required' => true, 'description' => 'The code of the api option list to use, eg. clouds, environments, groups, instances, instance-wiki, networks, servicePlans, resourcePools, securityGroups, servers, server-wiki', 'displayOrder' => 9},
         {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'sourceUsername', 'fieldLabel' => 'Source Username', 'type' => 'text', 'description' => "An LDAP Username for use when type is 'ldap'.", 'displayOrder' => 10},
         {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'sourcePassword', 'fieldLabel' => 'Source Username', 'type' => 'text', 'description' => "An LDAP Password for use when type is 'ldap'.", 'displayOrder' => 11},
         {'dependsOnCode' => 'optionTypeList.type:ldap', 'fieldName' => 'ldapQuery', 'fieldLabel' => 'LDAP Query', 'type' => 'text', 'description' => "LDAP Queries are standard LDAP formatted queries where different objects can be searched. Dependent parameters can be loaded into the query using the <%=phrase%> syntax.", 'displayOrder' => 12},