morpheus-cli 4.2.8 → 4.2.10

data/lib/morpheus/cli/invoices_command.rb

@@ -3,14 +3,18 @@ require 'date'
 
 class Morpheus::Cli::InvoicesCommand
   include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::ProvisioningHelper
+  include Morpheus::Cli::OptionSourceHelper
 
   set_command_name :'invoices'
 
-  register_subcommands :list, :get
+  register_subcommands :list, :get, :refresh,
+                       :list_line_items, :get_line_item
   
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
     @invoices_interface = @api_client.invoices
+    @invoice_line_items_interface = @api_client.invoice_line_items
   end
 
   def handle(args)
@@ -24,17 +28,17 @@ class Morpheus::Cli::InvoicesCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       opts.on('-a', '--all', "Display all costs, prices and raw data" ) do
-        options[:show_actual_costs] = true
-        options[:show_costs] = true
+        options[:show_estimates] = true
+        # options[:show_costs] = true
         options[:show_prices] = true
         options[:show_raw_data] = true
       end
-      opts.on('--actuals', '--actuals', "Display all actual costs: Compute, Memory, Storage, etc." ) do
-        options[:show_actual_costs] = true
-      end
-      opts.on('--costs', '--costs', "Display all costs: Compute, Memory, Storage, etc." ) do
-        options[:show_costs] = true
+      opts.on('--estimates', '--estimates', "Display all estimated costs, from usage info: Compute, Memory, Storage, etc." ) do
+        options[:show_estimates] = true
       end
+      # opts.on('--costs', '--costs', "Display all costs: Compute, Memory, Storage, etc." ) do
+      #   options[:show_costs] = true
+      # end
       opts.on('--prices', '--prices', "Display prices: Total, Compute, Memory, Storage, etc." ) do
         options[:show_prices] = true
       end
@@ -63,28 +67,32 @@ class Morpheus::Cli::InvoicesCommand
       end
       opts.add_hidden_option('--ref-id')
       opts.on('--group ID', String, "Filter by Group") do |val|
-        params['siteId'] ||= []
-        params['siteId'] << val
+        options[:groups] ||= []
+        options[:groups] << val
       end
-      opts.on('--cloud ID', String, "Filter by Cloud") do |val|
-        params['zoneId'] ||= []
-        params['zoneId'] << val
+      opts.on( '-c', '--cloud CLOUD', "Filter by Cloud" ) do |val|
+        options[:clouds] ||= []
+        options[:clouds] << val
       end
       opts.on('--instance ID', String, "Filter by Instance") do |val|
-        params['instanceId'] ||= []
-        params['instanceId'] << val
+        options[:instances] ||= []
+        options[:instances] << val
       end
       opts.on('--container ID', String, "Filter by Container") do |val|
         params['containerId'] ||= []
         params['containerId'] << val
       end
       opts.on('--server ID', String, "Filter by Server (Host)") do |val|
-        params['serverId'] ||= []
-        params['serverId'] << val
+        options[:servers] ||= []
+        options[:servers] << val
       end
       opts.on('--user ID', String, "Filter by User") do |val|
-        params['userId'] ||= []
-        params['userId'] << val
+        options[:users] ||= []
+        options[:users] << val
+      end
+      opts.on('--project PROJECT', String, "View invoices for a project.") do |val|
+        options[:projects] ||= []
+        options[:projects] << val
       end
       # opts.on('--cluster ID', String, "Filter by Cluster") do |val|
       #   params['clusterId'] ||= []
@@ -116,15 +124,45 @@ class Morpheus::Cli::InvoicesCommand
     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
     begin
+      # construct params
+      params.merge!(parse_list_options(options))
+      if options[:clouds]
+        cloud_ids = parse_cloud_id_list(options[:clouds])
+        return 1, "clouds not found for #{options[:clouds]}" if cloud_ids.nil?
+        params['zoneId'] = cloud_ids
+      end
+      if options[:groups]
+        group_ids = parse_group_id_list(options[:groups])
+        return 1, "groups not found for #{options[:groups]}" if group_ids.nil?
+        params['siteId'] = group_ids
+      end
+      if options[:instances]
+        instance_ids = parse_instance_id_list(options[:instances])
+        return 1, "instances not found for #{options[:instances]}" if instance_ids.nil?
+        params['instanceId'] = instance_ids
+      end
+      if options[:servers]
+        server_ids = parse_server_id_list(options[:servers])
+        return 1, "servers not found for #{options[:servers]}" if server_ids.nil?
+        params['serverId'] = server_ids
+      end
+      if options[:users]
+        user_ids = parse_user_id_list(options[:users])
+        return 1, "users not found for #{options[:users]}" if user_ids.nil?
+        params['userId'] = user_ids
+      end
+      if options[:projects]
+        project_ids = parse_project_id_list(options[:projects])
+        return 1, "projects not found for #{options[:projects]}" if project_ids.nil?
+        params['projectId'] = project_ids
+      end
       params['rawData'] = true if options[:show_raw_data]
       params['refId'] = ref_ids unless ref_ids.empty?
-      params.merge!(parse_list_options(options))
       @invoices_interface.setopts(options)
       if options[:dry_run]
         print_dry_run @invoices_interface.dry.list(params)
@@ -136,12 +174,6 @@ class Morpheus::Cli::InvoicesCommand
       invoices = json_response['invoices']
       title = "Morpheus Invoices"
       subtitles = []
-      if params['status']
-        subtitles << "Status: #{params['status']}"
-      end
-      if params['alarmStatus'] == 'acknowledged'
-        subtitles << "(Acknowledged)"
-      end
       if params['startDate']
         subtitles << "Start Date: #{params['startDate']}"
       end
@@ -155,11 +187,17 @@ class Morpheus::Cli::InvoicesCommand
       else
         # current_date = Time.now
         # current_period = "#{current_date.year}#{current_date.month.to_s.rjust(2, '0')}"
+        show_projects = invoices.find {|it| it['project'] } || (params['projectId'] || params['projectName'] || params['projectTag'])
         columns = [
           {"INVOICE ID" => lambda {|it| it['id'] } },
           {"TYPE" => lambda {|it| format_invoice_ref_type(it) } },
           {"REF ID" => lambda {|it| it['refId'] } },
-          {"REF NAME" => lambda {|it| it['refName'] } },
+          {"REF NAME" => lambda {|it| it['refName'] } }
+        ] + (show_projects ? [
+          {"PROJECT ID" => lambda {|it| it['project'] ? it['project']['id'] : '' } },
+          {"PROJECT NAME" => lambda {|it| it['project'] ? it['project']['name'] : '' } },
+          {"PROJECT TAGS" => lambda {|it| it['project'] ? truncate_string(format_metadata(it['project']['tags']), 50) : '' } }
+        ] : []) + [
           #{"INTERVAL" => lambda {|it| it['interval'] } },
           {"CLOUD" => lambda {|it| it['cloud'] ? it['cloud']['name'] : '' } },
           {"ACCOUNT" => lambda {|it| it['account'] ? it['account']['name'] : '' } },
@@ -176,35 +214,16 @@ class Morpheus::Cli::InvoicesCommand
             else
               format_money(it['totalCost'])
             end
-          } },
-          {"ACTUAL MTD" => lambda {|it| format_money(it['actualRunningCost']) } },
-          {"ACTUAL TOTAL" => lambda {|it| 
-            if it['runningMultiplier'] && it['runningMultiplier'].to_i != 1 && it['actualTotalCost'].to_f > 0
-              format_money(it['actualTotalCost']) + " (Projected)"
-            else
-              format_money(it['actualTotalCost'])
-            end
           } }
         ]
-        if options[:show_costs]
-          columns += [
-            {"COMPUTE" => lambda {|it| format_money(it['computeCost']) } },
-            # {"MEMORY" => lambda {|it| format_money(it['memoryCost']) } },
-            {"STORAGE" => lambda {|it| format_money(it['storageCost']) } },
-            {"NETWORK" => lambda {|it| format_money(it['networkCost']) } },
-            {"OTHER" => lambda {|it| format_money(it['extraCost']) } },
-          ]
-        end
-        if options[:show_actual_costs]
-          columns += [
-            {"ACTUAL COMPUTE" => lambda {|it| format_money(it['actualComputeCost']) } },
-            # {"ACTUAL MEMORY" => lambda {|it| format_money(it['actualMemoryCost']) } },
-            {"ACTUAL STORAGE" => lambda {|it| format_money(it['actualStorageCost']) } },
-            {"ACTUAL NETWORK" => lambda {|it| format_money(it['actualNetworkCost']) } },
-            {"ACTUAL OTHER" => lambda {|it| format_money(it['actualExtraCost']) } },
-          ]
-        end
-
+        
+        columns += [
+          {"COMPUTE" => lambda {|it| format_money(it['computeCost']) } },
+          # {"MEMORY" => lambda {|it| format_money(it['memoryCost']) } },
+          {"STORAGE" => lambda {|it| format_money(it['storageCost']) } },
+          {"NETWORK" => lambda {|it| format_money(it['networkCost']) } },
+          {"OTHER" => lambda {|it| format_money(it['extraCost']) } },
+        ]
         if options[:show_prices]
           columns += [
             {"COMPUTE PRICE" => lambda {|it| format_money(it['computePrice']) } },
@@ -222,7 +241,23 @@ class Morpheus::Cli::InvoicesCommand
             } }
           ]
         end
-
+        if options[:show_estimates]
+          columns += [
+            {"MTD EST." => lambda {|it| format_money(it['estimatedRunningCost']) } },
+            {"TOTAL EST." => lambda {|it| 
+              if it['runningMultiplier'] && it['runningMultiplier'].to_i != 1 && it['estimatedTotalCost'].to_f > 0
+                format_money(it['estimatedTotalCost']) + " (Projected)"
+              else
+                format_money(it['estimatedTotalCost'])
+              end
+            } },
+            {"COMPUTE EST." => lambda {|it| format_money(it['estimatedComputeCost']) } },
+            # {"MEMORY  EST." => lambda {|it| format_money(it['estimatedMemoryCost']) } },
+            {"STORAGE EST." => lambda {|it| format_money(it['estimatedStorageCost']) } },
+            {"NETWORK EST." => lambda {|it| format_money(it['estimatedNetworkCost']) } },
+            {"OTHER EST." => lambda {|it| format_money(it['estimatedExtraCost']) } },
+          ]
+        end
         if options[:show_raw_data]
           columns += [{"RAW DATA" => lambda {|it| truncate_string(it['rawData'].to_s, 10) } }]
         end
@@ -240,17 +275,30 @@ class Morpheus::Cli::InvoicesCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[id]")
+      opts.on('-a', '--all', "Display all costs, prices and raw data" ) do
+        options[:show_estimates] = true
+        # options[:show_costs] = true
+        options[:show_prices] = true
+        options[:show_raw_data] = true
+      end
+      opts.on('--estimates', '--estimates', "Display all estimated costs, from usage info: Compute, Memory, Storage, etc." ) do
+        options[:show_estimates] = true
+      end
       opts.on('--raw-data', '--raw-data', "Display Raw Data, the cost data from the cloud provider's API.") do |val|
         options[:show_raw_data] = true
       end
+      opts.on('--no-line-items', '--no-line-items', "Do not display line items.") do |val|
+        options[:hide_line_items] = true
+      end
       build_standard_get_options(opts, options)
       opts.footer = "Get details about a specific invoice."
+      opts.footer = <<-EOT
+Get details about a specific invoice.
+[id] is required. This is the id of an invoice.
+EOT
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      return 1
-    end
+    verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
     id_list = parse_id_list(args)
     return run_command_for_each_arg(id_list) do |arg|
@@ -284,21 +332,31 @@ class Morpheus::Cli::InvoicesCommand
         "Ref ID" => lambda {|it| it['refId'] },
         "Ref Name" => lambda {|it| it['refName'] },
         "Plan" => lambda {|it| it['plan'] ? it['plan']['name'] : '' },
+        "Project ID" => lambda {|it| it['project'] ? it['project']['id'] : '' },
+        "Project Name" => lambda {|it| it['project'] ? it['project']['name'] : '' },
+        "Project Tags" => lambda {|it| it['project'] ? format_metadata(it['project']['tags']) : '' },
         "Power State" => lambda {|it| format_server_power_state(it) },
         "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
         "Active" => lambda {|it| format_boolean(it['active']) },
         "Period" => lambda {|it| format_invoice_period(it) },
+        "Estimate" => lambda {|it| format_boolean(it['estimate']) },
         #"Interval" => lambda {|it| it['interval'] },
         "Start" => lambda {|it| format_date(it['startDate']) },
         "End" => lambda {|it| it['endDate'] ? format_date(it['endDate']) : '' },
-        "Estimate" => lambda {|it| format_boolean(it['estimate']) },
+        "Ref Start" => lambda {|it| format_local_dt(it['refStart']) },
+        "Ref End" => lambda {|it| it['refEnd'] ? format_local_dt(it['refEnd']) : '' },
         "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
         "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
       }
       # remove columns that do not apply
-      if !invoice['plan']
+      if invoice['plan'].nil?
         description_cols.delete("Plan")
       end
+      if invoice['project'].nil?
+        description_cols.delete("Project ID")
+        description_cols.delete("Project Name")
+        description_cols.delete("Project Tags")
+      end
       if !['ComputeServer','Instance','Container'].include?(invoice['refType'])
         description_cols.delete("Power State")
       end
@@ -337,10 +395,15 @@ class Morpheus::Cli::InvoicesCommand
       print "\n"
       # print_h2 "Costs"
       cost_rows = [
-        {label: 'Usage 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: 'Usage 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: 'Actual Cost'.upcase, compute: invoice['actualComputeCost'], memory: invoice['actualMemoryCost'], storage: invoice['actualStorageCost'], network: invoice['actualNetworkCost'], license: invoice['actualLicenseCost'], extra: invoice['actualExtraCost'], running: invoice['actualRunningCost'], total: invoice['actualTotalCost']},
+        {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']},
       ]
+      if options[:show_estimates]
+        cost_rows += [
+          {label: 'Estimated 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: 'Estimated Price'.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
       cost_columns = {
         "" => lambda {|it| it[:label] },
         "Compute".upcase => lambda {|it| format_money(it[:compute]) },
@@ -375,6 +438,38 @@ class Morpheus::Cli::InvoicesCommand
         puts invoice['rawData']
       end
       
+      # Line Items
+      line_items = invoice['lineItems']
+      if line_items && line_items.size > 0 && options[:hide_line_items] != true
+
+        line_items_columns = [
+          {"INVOICE ID" => lambda {|it| it['invoiceId'] } },
+          {"TYPE" => lambda {|it| format_invoice_ref_type(it) } },
+          {"REF ID" => lambda {|it| it['refId'] } },
+          {"REF NAME" => lambda {|it| it['refName'] } },
+          #{"REF CATEGORY" => lambda {|it| it['refCategory'] } },
+          {"START" => lambda {|it| format_date(it['startDate']) } },
+          {"END" => lambda {|it| it['endDate'] ? format_date(it['endDate']) : '' } },
+          {"USAGE TYPE" => lambda {|it| it['usageType'] } },
+          {"USAGE CATEGORY" => lambda {|it| it['usageCategory'] } },
+          {"USAGE" => lambda {|it| it['itemUsage'] } },
+          {"RATE" => lambda {|it| it['itemRate'] } },
+          {"COST" => lambda {|it| format_money(it['itemCost']) } },
+          {"PRICE" => lambda {|it| format_money(it['itemPrice']) } },
+          {"TAX" => lambda {|it| format_money(it['itemTax']) } },
+          # {"TERM" => lambda {|it| it['itemTerm'] } },
+          "CREATED" => lambda {|it| format_local_dt(it['dateCreated']) },
+          "UPDATED" => lambda {|it| format_local_dt(it['lastUpdated']) }
+        ]
+
+        if options[:show_raw_data]
+          columns += [{"RAW DATA" => lambda {|it| truncate_string(it['rawData'].to_s, 10) } }]
+        end
+
+        print_h2 "Line Items"
+        print as_pretty_table(line_items, line_items_columns, options)
+        print_results_pagination({total: line_items.size, size: line_items.size})
+      end
 
       print reset,"\n"
       return 0
@@ -384,6 +479,347 @@ class Morpheus::Cli::InvoicesCommand
     end
   end
 
+  def refresh(args)
+    options = {}
+    params = {}
+    payload = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[--daily] [--costing] [--current] [-c CLOUD]")
+      opts.on( '--daily', "Refresh Daily Invoices" ) do
+        payload[:daily] = true
+      end
+      opts.on( '--costing', "Refresh Costing Data" ) do
+        payload[:costing] = true
+      end
+      opts.on( '--current', "Collect the most up to date costing data." ) do
+        payload[:current] = true
+      end
+      opts.on( '--date DATE', String, "Date to collect costing for. By default the cost data is collected for the end of the previous period." ) do |val|
+        payload[:date] = val.to_s
+      end
+      opts.on( '-c', '--cloud CLOUD', "Specify cloud(s) to refresh costing for." ) do |val|
+        payload[:clouds] ||= []
+        payload[:clouds] << val
+      end
+      opts.on( '--all', "Refresh costing for all clouds." ) do
+        payload[:all] = true
+      end
+      # opts.on( '-f', '--force', "Force Refresh" ) do
+      #   query_params[:force] = 'true'
+      # end
+      build_standard_update_options(opts, options, [:query, :auto_confirm])
+      opts.footer = <<-EOT
+Refresh invoices.
+By default, nothing is changed.
+Include --daily to regenerate invoice records.
+Include --costing to refresh actual costing data.
+Include --current to refresh costing data for the actual current time.
+To get the latest invoice costing data, include --daily --costing --current --all 
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:0)
+    connect(options)
+    params.merge!(parse_query_options(options))
+    if options[:payload]
+      payload = options[:payload]
+    end
+    payload.deep_merge!(parse_passed_options(options))
+    # --clouds
+    if payload[:clouds]
+      payload[:clouds] = parse_id_list(payload[:clouds]).collect {|cloud_id|
+        if cloud_id.to_s =~ /\A\d{1,}\Z/
+          cloud_id
+        else
+          cloud = find_cloud_option(cloud_id)
+          return 1 if cloud.nil?
+          cloud['id']
+        end
+      }
+    end
+    # are you sure?
+    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to refresh invoices?")
+      return 9, "aborted command"
+    end
+    # ok, make the request
+    @invoices_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @invoices_interface.dry.refresh(params, payload)
+      return
+    end
+    json_response = @invoices_interface.refresh(params, payload)
+    # render the result
+    render_result = render_with_format(json_response, options)
+    return 0 if render_result
+    # print output
+    print_green_success(json_response['msg'] || "Refreshing invoices")
+    return 0
+  end
+
+  def list_line_items(args)
+    options = {}
+    params = {}
+    ref_ids = []
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage()
+      opts.on('-a', '--all', "Display all costs, prices and raw data" ) do
+        options[:show_actual_costs] = true
+        options[:show_costs] = true
+        options[:show_prices] = true
+        options[:show_raw_data] = true
+      end
+      # opts.on('--actuals', '--actuals', "Display all actual costs: Compute, Memory, Storage, etc." ) do
+      #   options[:show_actual_costs] = true
+      # end
+      # opts.on('--costs', '--costs', "Display all costs: Compute, Memory, Storage, etc." ) do
+      #   options[:show_costs] = true
+      # end
+      # opts.on('--prices', '--prices', "Display prices: Total, Compute, Memory, Storage, etc." ) do
+      #   options[:show_prices] = true
+      # end
+      opts.on('--type TYPE', String, "Filter by Ref Type eg. ComputeSite (Group), ComputeZone (Cloud), ComputeServer (Host), Instance, Container, User") do |val|
+        if val.to_s.downcase == 'cloud' || val.to_s.downcase == 'zone'
+          params['refType'] = 'ComputeZone'
+        elsif val.to_s.downcase == 'instance'
+          params['refType'] = 'Instance'
+        elsif val.to_s.downcase == 'server' || val.to_s.downcase == 'host'
+          params['refType'] = 'ComputeServer'
+        elsif val.to_s.downcase == 'cluster'
+          params['refType'] = 'ComputeServerGroup'
+        elsif val.to_s.downcase == 'group'
+          params['refType'] = 'ComputeSite'
+        elsif val.to_s.downcase == 'user'
+          params['refType'] = 'User'
+        else
+          params['refType'] = val
+        end
+      end
+      opts.on('--id ID', String, "Filter by Ref ID") do |val|
+        ref_ids << val
+      end
+      opts.on('--ref-id ID', String, "Filter by Ref ID") do |val|
+        ref_ids << val
+      end
+      opts.add_hidden_option('--ref-id')
+      opts.on('--group ID', String, "Filter by Group") do |val|
+        options[:groups] ||= []
+        options[:groups] << val
+      end
+      opts.on( '-c', '--cloud CLOUD', "Filter by Cloud" ) do |val|
+        options[:clouds] ||= []
+        options[:clouds] << val
+      end
+      opts.on('--instance ID', String, "Filter by Instance") do |val|
+        options[:instances] ||= []
+        options[:instances] << val
+      end
+      opts.on('--container ID', String, "Filter by Container") do |val|
+        params['containerId'] ||= []
+        params['containerId'] << val
+      end
+      opts.on('--server ID', String, "Filter by Server (Host)") do |val|
+        options[:servers] ||= []
+        options[:servers] << val
+      end
+      opts.on('--user ID', String, "Filter by User") do |val|
+        options[:users] ||= []
+        options[:users] << val
+      end
+      opts.on('--project PROJECT', String, "View invoices for a project.") do |val|
+        options[:projects] ||= []
+        options[:projects] << val
+      end
+      # opts.on('--cluster ID', String, "Filter by Cluster") do |val|
+      #   params['clusterId'] ||= []
+      #   params['clusterId'] << val
+      # end
+      opts.on('--start DATE', String, "Start date in the format YYYY-MM-DD.") do |val|
+        params['startDate'] = val #parse_time(val).utc.iso8601
+      end
+      opts.on('--end DATE', String, "End date in the format YYYY-MM-DD. Default is now.") do |val|
+        params['endDate'] = val #parse_time(val).utc.iso8601
+      end
+      opts.on('--period PERIOD', String, "Period in the format YYYYMM. This can be used instead of start/end.") do |val|
+        params['period'] = parse_period(val)
+      end
+      opts.on('--active [true|false]',String, "Filter by active.") do |val|
+        params['active'] = (val.to_s != 'false' && val.to_s != 'off')
+      end
+      opts.on('--estimate [true|false]',String, "Filter by estimate.") do |val|
+        params['estimate'] = (val.to_s != 'false' && val.to_s != 'off')
+      end
+      opts.on('--tenant ID', String, "View invoice line items for a tenant. Default is your own account.") do |val|
+        params['accountId'] = val
+      end
+      opts.on('--raw-data', '--raw-data', "Display Raw Data, the cost data from the cloud provider's API.") do |val|
+        options[:show_raw_data] = true
+      end
+      build_standard_list_options(opts, options)
+      opts.footer = "List invoice line items."
+    end
+    optparse.parse!(args)
+    connect(options)
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
+    end
+    
+    # construct params
+    params.merge!(parse_list_options(options))
+    if options[:clouds]
+      cloud_ids = parse_cloud_id_list(options[:clouds])
+      return 1, "clouds not found for #{options[:clouds]}" if cloud_ids.nil?
+      params['zoneId'] = cloud_ids
+    end
+    if options[:groups]
+      group_ids = parse_group_id_list(options[:groups])
+      return 1, "groups not found for #{options[:groups]}" if group_ids.nil?
+      params['siteId'] = group_ids
+    end
+    if options[:instances]
+      instance_ids = parse_instance_id_list(options[:instances])
+      return 1, "instances not found for #{options[:instances]}" if instance_ids.nil?
+      params['instanceId'] = instance_ids
+    end
+    if options[:servers]
+      server_ids = parse_server_id_list(options[:servers])
+      return 1, "servers not found for #{options[:servers]}" if server_ids.nil?
+      params['serverId'] = server_ids
+    end
+    if options[:users]
+      user_ids = parse_user_id_list(options[:users])
+      return 1, "users not found for #{options[:users]}" if user_ids.nil?
+      params['userId'] = user_ids
+    end
+    if options[:projects]
+      project_ids = parse_project_id_list(options[:projects])
+      return 1, "projects not found for #{options[:projects]}" if project_ids.nil?
+      params['projectId'] = project_ids
+    end
+    params['rawData'] = true if options[:show_raw_data]
+    params['refId'] = ref_ids unless ref_ids.empty?
+    @invoice_line_items_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @invoice_line_items_interface.dry.list(params)
+      return
+    end
+    json_response = @invoice_line_items_interface.list(params)
+    line_items = json_response['lineItems']
+    render_response(json_response, options, 'lineItems') do
+      title = "Morpheus Line Items"
+      subtitles = []
+      if params['startDate']
+        subtitles << "Start Date: #{params['startDate']}"
+      end
+      if params['endDate']
+        subtitles << "End Date: #{params['endDate']}"
+      end
+      subtitles += parse_list_subtitles(options)
+      print_h1 title, subtitles
+      if line_items.empty?
+        print yellow,"No line items found.",reset,"\n"
+      else
+        # current_date = Time.now
+        # current_period = "#{current_date.year}#{current_date.month.to_s.rjust(2, '0')}"
+        columns = [
+          {"INVOICE ID" => lambda {|it| it['invoiceId'] } },
+          {"TYPE" => lambda {|it| format_invoice_ref_type(it) } },
+          {"REF ID" => lambda {|it| it['refId'] } },
+          {"REF NAME" => lambda {|it| it['refName'] } },
+          #{"REF CATEGORY" => lambda {|it| it['refCategory'] } },
+          {"START" => lambda {|it| format_date(it['startDate']) } },
+          {"END" => lambda {|it| it['endDate'] ? format_date(it['endDate']) : '' } },
+          {"USAGE TYPE" => lambda {|it| it['usageType'] } },
+          {"USAGE CATEGORY" => lambda {|it| it['usageCategory'] } },
+          {"USAGE" => lambda {|it| it['itemUsage'] } },
+          {"RATE" => lambda {|it| it['itemRate'] } },
+          {"COST" => lambda {|it| format_money(it['itemCost']) } },
+          {"PRICE" => lambda {|it| format_money(it['itemPrice']) } },
+          {"TAX" => lambda {|it| format_money(it['itemTax']) } },
+          # {"TERM" => lambda {|it| it['itemTerm'] } },
+          "CREATED" => lambda {|it| format_local_dt(it['dateCreated']) },
+          "UPDATED" => lambda {|it| format_local_dt(it['lastUpdated']) }
+        ]
+
+        if options[:show_raw_data]
+          columns += [{"RAW DATA" => lambda {|it| truncate_string(it['rawData'].to_s, 10) } }]
+        end
+        print as_pretty_table(line_items, columns, options)
+        print_results_pagination(json_response, {:label => "line item", :n_label => "line items"})
+      end
+      print reset,"\n"
+    end
+    if line_items.empty?
+      return 1, "no line items found"
+    else
+      return 0, nil
+    end
+  end
+  
+  def get_line_item(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[id]")
+      opts.on('--raw-data', '--raw-data', "Display Raw Data, the cost data from the cloud provider's API.") do |val|
+        options[:show_raw_data] = true
+      end
+      build_standard_get_options(opts, options)
+      opts.footer = "Get details about a specific invoice line item."
+      opts.footer = <<-EOT
+Get details about a specific invoice line item.
+[id] is required. This is the id of an invoice line item.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, min:1)
+    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_line_item(id, options)
+    params = {}
+    if options[:show_raw_data]
+      params['rawData'] = true
+    end
+    @invoice_line_items_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @invoice_line_items_interface.dry.get(id, params)
+      return
+    end
+    json_response = @invoice_line_items_interface.get(id, params)
+    line_item = json_response['lineItem']
+    render_response(json_response, options, 'lineItem') do
+      print_h1 "Line Item Details"
+      print cyan
+      description_cols = {
+        "ID" => lambda {|it| it['id'] },
+        "Invoice ID" => lambda {|it| it['invoiceId'] },
+        "Type" => lambda {|it| format_invoice_ref_type(it) },
+        "Ref ID" => lambda {|it| it['refId'] },
+        "Ref Name" => lambda {|it| it['refName'] },
+        "Start" => lambda {|it| format_date(it['startDate']) },
+        "End" => lambda {|it| it['endDate'] ? format_date(it['endDate']) : '' },
+        "Usage Type" => lambda {|it| it['usageType'] },
+        "Usage Category" => lambda {|it| it['usageCategory'] },
+        "Item Usage" => lambda {|it| it['itemUsage'] },
+        "Item Rate" => lambda {|it| it['itemRate'] },
+        "Item Cost" => lambda {|it| format_money(it['itemCost']) },
+        "Item Price" => lambda {|it| format_money(it['itemrPrice']) },
+        "Item Tax" => lambda {|it| format_money(it['itemTax']) },
+        "Item Term" => lambda {|it| it['itemTerm'] },
+        #"Tax Type" => lambda {|it| it['taxType'] },
+        "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+        "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+      }
+      print_description_list(description_cols, line_item, options)
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+
   private
 
   # def find_invoice_by_name_or_id(val)
@@ -426,10 +862,8 @@ class Morpheus::Cli::InvoicesCommand
   def format_invoice_ref_type(it)
     if it['refType'] == 'ComputeZone'
       "Cloud"
-    elsif it['refType'] == 'Instance'
-      "Instance"
-    elsif it['refType'] == 'ComputeServer'
-      "Host"
+    # elsif it['refType'] == 'ComputeServer'
+    #   "Host"
     elsif it['refType'] == 'ComputeServerGroup'
       "Cluster"
     elsif it['refType'] == 'ComputeSite'