morpheus-cli 5.3.2 → 5.3.3

data/lib/morpheus/cli/invoices_command.rb

@@ -222,52 +222,52 @@ 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 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]}) } },
+          {"COMPUTE PRICE" => lambda {|it| format_money(it['computePrice'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) } },
+          {"MEMORY PRICE" => lambda {|it| format_money(it['memoryPrice'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) } },
+          {"STORAGE PRICE" => lambda {|it| format_money(it['storagePrice'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) } },
+          {"NETWORK PRICE" => lambda {|it| format_money(it['networkPrice'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) } },
+          {"EXTRA PRICE" => lambda {|it| format_money(it['extraPrice'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) } },
+          {"MTD PRICE" => lambda {|it| format_money(it['runningPrice'], it['currency'] || '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)" : "")
+            format_money(it['totalPrice'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) + ((it['totalCost'].to_f > 0 && it['totalCost'] != it['runningCost']) ? " (Projected)" : "")
           } }
         ]
         
         if options[:show_costs] && json_response['masterAccount'] != false
           columns += [
-          {"COMPUTE COST" => lambda {|it| format_money(it['computeCost'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"COMPUTE COST" => lambda {|it| format_money(it['computeCost'], it['currency'] || '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]}) } },
+          {"STORAGE COST" => lambda {|it| format_money(it['storageCost'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) } },
+          {"NETWORK COST" => lambda {|it| format_money(it['networkCost'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) } },
+          {"EXTRA COST" => lambda {|it| format_money(it['extraCost'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) } },
+          {"MTD COST" => lambda {|it| format_money(it['runningCost'], it['currency'] || '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)" : "")
+            format_money(it['totalCost'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) + ((it['totalCost'].to_f > 0 && it['totalCost'] != it['runningCost']) ? " (Projected)" : "")
           } }
         ]
         end
         if options[:show_estimates]
           columns += [
-            {"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 COMPUTE PRICE" => lambda {|it| format_money(it['estimatedComputePrice'], it['estimatedCurrency'] || 'USD', {sigdig:options[:sigdig]}) } },
+            {"METERED MEMORY PRICE" => lambda {|it| format_money(it['estimatedMemoryPrice'], it['estimatedCurrency'] || 'USD', {sigdig:options[:sigdig]}) } },
+            {"METERED STORAGE PRICE" => lambda {|it| format_money(it['estimatedStoragePrice'], it['estimatedCurrency'] || 'USD', {sigdig:options[:sigdig]}) } },
+            {"METERED NETWORK PRICE" => lambda {|it| format_money(it['estimatedNetworkPrice'], it['estimatedCurrency'] || 'USD', {sigdig:options[:sigdig]}) } },
+            {"METERED EXTRA PRICE" => lambda {|it| format_money(it['estimatedExtraPrice'], it['estimatedCurrency'] || 'USD', {sigdig:options[:sigdig]}) } },
+            {"METERED MTD PRICE" => lambda {|it| format_money(it['estimatedRunningPrice'], it['estimatedCurrency'] || '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)" : "")
+              format_money(it['estimatedTotalPrice'], it['estimatedCurrency'] || '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 COMPUTE COST" => lambda {|it| format_money(it['estimatedComputeCost'], it['estimatedCurrency'] || 'USD', {sigdig:options[:sigdig]}) } },
+              {"METERED MEMORY COST" => lambda {|it| format_money(it['estimatedMemoryCost'], it['estimatedCurrency'] || 'USD', {sigdig:options[:sigdig]}) } },
+              {"METERED STORAGE COST" => lambda {|it| format_money(it['estimatedStorageCost'], it['estimatedCurrency'] || 'USD', {sigdig:options[:sigdig]}) } },
+              {"METERED NETWORK COST" => lambda {|it| format_money(it['estimatedNetworkCost'], it['estimatedCurrency'] || 'USD', {sigdig:options[:sigdig]}) } },
+              {"METERED EXTRA COST" => lambda {|it| format_money(it['estimatedExtraCost'], it['estimatedCurrency'] || 'USD', {sigdig:options[:sigdig]}) } },
+              {"METERED MTD COST" => lambda {|it| format_money(it['estimatedRunningCost'], it['estimatedCurrency'] || '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)" : "")
+                format_money(it['estimatedTotalCost'], it['estimatedCurrency'] || 'USD', {sigdig:options[:sigdig]}) + ((it['estimatedTotalCost'].to_f > 0 && it['estimatedTotalCost'] != it['estimatedRunningCost']) ? " (Projected)" : "")
               } },
             ]
           end
@@ -306,36 +306,37 @@ class Morpheus::Cli::InvoicesCommand
 
           if invoice_totals
             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: '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'], currency: invoice['currency']},
             ]
             if options[:show_costs]
               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: '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'], currency: invoice['currency']}
               ]
             end
             if options[:show_estimates]
               cost_rows += [
-                {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'], currency: invoice['estimatedCurrency']}
               ]
               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']}
+                  {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'], currency: invoice['estimatedCurrency']}
                 ]
               end
             end
             cost_columns = {
               "" => lambda {|it| it[:label] },
-              "Compute".upcase => lambda {|it| format_money(it[:compute], 'usd', {sigdig:options[:sigdig]}) },
-              "Memory".upcase => lambda {|it| format_money(it[:memory], 'usd', {sigdig:options[:sigdig]}) },
-              "Storage".upcase => lambda {|it| format_money(it[:storage], 'usd', {sigdig:options[:sigdig]}) },
-              "Network".upcase => lambda {|it| format_money(it[:network], 'usd', {sigdig:options[:sigdig]}) },
-              "License".upcase => lambda {|it| format_money(it[:license], 'usd', {sigdig:options[:sigdig]}) },
-              "Extra".upcase => lambda {|it| format_money(it[:extra], 'usd', {sigdig:options[:sigdig]}) },
-              "MTD".upcase => lambda {|it| format_money(it[:running], 'usd', {sigdig:options[:sigdig]}) },
-              "Total".upcase => lambda {|it| 
-                format_money(it[:total], 'usd', {sigdig:options[:sigdig]}) + ((it[:total].to_f > 0 && it[:total] != it[:running]) ? " (Projected)" : "")
+              "Compute" => lambda {|it| format_money(it[:compute], it[:currency] || it[:currency] || 'USD', {sigdig:options[:sigdig]}) },
+              "Memory" => lambda {|it| format_money(it[:memory], it[:currency] || 'USD', {sigdig:options[:sigdig]}) },
+              "Storage" => lambda {|it| format_money(it[:storage], it[:currency] || 'USD', {sigdig:options[:sigdig]}) },
+              "Network" => lambda {|it| format_money(it[:network], it[:currency] || 'USD', {sigdig:options[:sigdig]}) },
+              "License" => lambda {|it| format_money(it[:license], it[:currency] || 'USD', {sigdig:options[:sigdig]}) },
+              "Extra" => lambda {|it| format_money(it[:extra], it[:currency] || 'USD', {sigdig:options[:sigdig]}) },
+              "MTD" => lambda {|it| format_money(it[:running], it[:currency] || 'USD', {sigdig:options[:sigdig]}) },
+              "Total" => lambda {|it| 
+                format_money(it[:total], it[:currency] || 'USD', {sigdig:options[:sigdig]}) + ((it[:total].to_f > 0 && it[:total] != it[:running]) ? " (Projected)" : "")
               },
-            }
+              "Currency" => lambda {|it| it[:currency] },
+            }.upcase_keys!
             # remove columns that rarely have data...
             if cost_rows.sum { |it| it[:memory].to_f } == 0
               cost_columns.delete("Memory".upcase)
@@ -433,6 +434,10 @@ EOT
         "End" => lambda {|it| format_date(it['endDate']) },
         "Ref Start" => lambda {|it| format_dt(it['refStart']) },
         "Ref End" => lambda {|it| format_dt(it['refEnd']) },
+        "Currency" => lambda {|it| (it['estimate'] ? it['estimatedCurrency'] : it['currency']) || 'USD' },
+        "Conversion Rate" => lambda {|it| (it['estimate'] ? it['estimatedConversionRate'] : it['conversionRate']) },
+        # "Estimated Currency" => lambda {|it| it['estimatedCurrency'] },
+        # "Estimated Conversion Rate" => lambda {|it| it['estimatedConversionRate'] },
         "Items" => lambda {|it| (it['lineItemCount'] ? it['lineItemCount'] : it['lineItems'].size) rescue '' },
         "Tags" => lambda {|it| (it['metadata'] || it['tags']) ? (it['metadata'] || it['tags']).collect {|m| "#{m['name']}: #{m['value']}" }.join(', ') : '' },
         "Project ID" => lambda {|it| it['project'] ? it['project']['id'] : '' },
@@ -457,39 +462,13 @@ EOT
       if !['ComputeServer','Instance','Container'].include?(invoice['refType'])
         description_cols.delete("Power State")
       end
+      # if invoice['currency'].nil? || invoice['currency'] == 'USD'
+      #   description_cols.delete("Currency")
+      # end
+      # if invoice['actualConversionRate'].nil? || invoice['actualConversionRate'] == 1
+      #   description_cols.delete("Conversion Rate")
+      # end
       print_description_list(description_cols, invoice)
-=begin
-      print_h2 "Costs"
-      cost_columns = {
-        "Compute" => lambda {|it| format_money(it['computeCost'], 'usd', {sigdig:options[:sigdig]}) },
-        "Memory" => lambda {|it| format_money(it['memoryCost'], 'usd', {sigdig:options[:sigdig]}) },
-        "Storage" => lambda {|it| format_money(it['storageCost'], 'usd', {sigdig:options[:sigdig]}) },
-        "Network" => lambda {|it| format_money(it['networkCost'], 'usd', {sigdig:options[:sigdig]}) },
-        "License" => lambda {|it| format_money(it['licenseCost'], 'usd', {sigdig:options[:sigdig]}) },
-        "Extra" => lambda {|it| format_money(it['extraCost'], 'usd', {sigdig:options[:sigdig]}) },
-        "Running" => lambda {|it| format_money(it['runningCost'], 'usd', {sigdig:options[:sigdig]}) },
-        "Total Cost" => lambda {|it| format_money(it['totalCost'], 'usd', {sigdig:options[:sigdig]}) },
-      }
-      print as_pretty_table([invoice], cost_columns, options)
-
-      print_h2 "Prices"
-      price_columns = {
-        "Compute" => lambda {|it| format_money(it['computePrice'], 'usd', {sigdig:options[:sigdig]}) },
-        "Memory" => lambda {|it| format_money(it['memoryPrice'], 'usd', {sigdig:options[:sigdig]}) },
-        "Storage" => lambda {|it| format_money(it['storagePrice'], 'usd', {sigdig:options[:sigdig]}) },
-        "Network" => lambda {|it| format_money(it['networkPrice'], 'usd', {sigdig:options[:sigdig]}) },
-        "License" => lambda {|it| format_money(it['licensePrice'], 'usd', {sigdig:options[:sigdig]}) },
-        "Extra" => lambda {|it| format_money(it['extraPrice'], 'usd', {sigdig:options[:sigdig]}) },
-        "Running" => lambda {|it| format_money(it['runningPrice'], 'usd', {sigdig:options[:sigdig]}) },
-        "Total Price" => lambda {|it| format_money(it['totalPrice'], 'usd', {sigdig:options[:sigdig]}) },
-      }
-      print as_pretty_table([invoice], price_columns, options)
-=end
-      
-      # current_date = Time.now
-      # current_period = "#{current_date.year}#{current_date.month.to_s.rjust(2, '0')}"
-
-      
 
       # Line Items
       line_items = invoice['lineItems']
@@ -507,9 +486,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]}) } },
-          {"PRICE" => lambda {|it| format_money(it['itemPrice'], 'usd', {sigdig:options[:sigdig]}) } },
-          #{"TAX" => lambda {|it| format_money(it['itemTax'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"COST" => lambda {|it| format_money(it['itemCost'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) } },
+          {"PRICE" => lambda {|it| format_money(it['itemPrice'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) } },
+          #{"TAX" => lambda {|it| format_money(it['itemTax'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) } },
           # {"TERM" => lambda {|it| it['itemTerm'] } },
           {"ITEM ID" => lambda {|it| truncate_string_right(it['itemId'], 65) } },
           {"ITEM NAME" => lambda {|it| it['itemName'] } },
@@ -529,36 +508,37 @@ EOT
       print_h2 "Invoice Totals"
 
       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: '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'], currency: invoice['currency']},
       ]
       if options[:show_costs] # && json_response['masterAccount'] != false
         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: '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'], currency: invoice['currency']},
         ]
       end
       if options[:show_estimates]
         cost_rows += [
-          {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'], currency: invoice['estimatedCurrency']}
         ]
         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']},
+            {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'], currency: invoice['estimatedCurrency']},
           ]
         end
       end
       cost_columns = {
         "" => lambda {|it| it[:label] },
-        "Compute".upcase => lambda {|it| format_money(it[:compute], 'usd', {sigdig:options[:sigdig]}) },
-        "Memory".upcase => lambda {|it| format_money(it[:memory], 'usd', {sigdig:options[:sigdig]}) },
-        "Storage".upcase => lambda {|it| format_money(it[:storage], 'usd', {sigdig:options[:sigdig]}) },
-        "Network".upcase => lambda {|it| format_money(it[:network], 'usd', {sigdig:options[:sigdig]}) },
-        "License".upcase => lambda {|it| format_money(it[:license], 'usd', {sigdig:options[:sigdig]}) },
-        "Extra".upcase => lambda {|it| format_money(it[:extra], 'usd', {sigdig:options[:sigdig]}) },
-        "MTD" => lambda {|it| format_money(it[:running], 'usd', {sigdig:options[:sigdig]}) },
-        "Total".upcase => lambda {|it| 
-          format_money(it[:total], 'usd', {sigdig:options[:sigdig]}) + ((it[:total].to_f > 0 && it[:total] != it[:running]) ? " (Projected)" : "")
+        "Compute" => lambda {|it| format_money(it[:compute], it[:currency] || 'USD', {sigdig:options[:sigdig]}) },
+        "Memory" => lambda {|it| format_money(it[:memory], it[:currency] || 'USD', {sigdig:options[:sigdig]}) },
+        "Storage" => lambda {|it| format_money(it[:storage], it[:currency] || 'USD', {sigdig:options[:sigdig]}) },
+        "Network" => lambda {|it| format_money(it[:network], it[:currency] || 'USD', {sigdig:options[:sigdig]}) },
+        "License" => lambda {|it| format_money(it[:license], it[:currency] || 'USD', {sigdig:options[:sigdig]}) },
+        "Extra" => lambda {|it| format_money(it[:extra], it[:currency] || 'USD', {sigdig:options[:sigdig]}) },
+        "MTD" => lambda {|it| format_money(it[:running], it[:currency] || 'USD', {sigdig:options[:sigdig]}) },
+        "Total" => lambda {|it| 
+          format_money(it[:total], it[:currency] || 'USD', {sigdig:options[:sigdig]}) + ((it[:total].to_f > 0 && it[:total] != it[:running]) ? " (Projected)" : "")
         },
-      }
+        "Currency" => lambda {|it| it[:currency] },
+      }.upcase_keys!
       # remove columns that rarely have data...
       if cost_rows.sum { |it| it[:memory].to_f } == 0
         cost_columns.delete("Memory".upcase)
@@ -888,10 +868,10 @@ EOT
           {"USAGE" => lambda {|it| it['itemUsage'] } },
           {"RATE" => lambda {|it| it['itemRate'] } },
           {"UNIT" => lambda {|it| it['rateUnit'] } },
-          {"PRICE" => lambda {|it| format_money(it['itemPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+          {"PRICE" => lambda {|it| format_money(it['itemPrice'], it['currency'] || '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]}) } },
+          {"COST" => lambda {|it| format_money(it['itemCost'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) } },
+          {"TAX" => lambda {|it| format_money(it['itemTax'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) } },
         ] : []) + [
           {"ITEM ID" => lambda {|it| truncate_string_right(it['itemId'], 65) } },
           {"ITEM NAME" => lambda {|it| it['itemName'] } },
@@ -923,10 +903,10 @@ EOT
             invoice_totals_columns = [
               {"Items" => lambda {|it| format_number(json_response['meta']['total']) rescue '' } },
               #{"Usage" => lambda {|it| it['itemUsage'] } },
-              {"Price" => lambda {|it| format_money(it['itemPrice'], 'usd', {sigdig:options[:sigdig]}) } },
+              {"Price" => lambda {|it| format_money(it['itemPrice'], it['currency'] || '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]}) } },
+              {"Cost" => lambda {|it| format_money(it['itemCost'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) } },
+              #{"Tax" => lambda {|it| format_money(it['itemTax'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) } },
           
             ] : [])
             print_description_list(invoice_totals_columns, line_item_totals)
@@ -993,9 +973,9 @@ EOT
         "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'], 'usd', {sigdig:options[:sigdig]}) },
-        "Item Price" => lambda {|it| format_money(it['itemPrice'], 'usd', {sigdig:options[:sigdig]}) },
-        #"Item Tax" => lambda {|it| format_money(it['itemTax'], 'usd', {sigdig:options[:sigdig]}) },
+        "Item Cost" => lambda {|it| format_money(it['itemCost'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) },
+        "Item Price" => lambda {|it| format_money(it['itemPrice'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) },
+        #"Item Tax" => lambda {|it| format_money(it['itemTax'], it['currency'] || 'USD', {sigdig:options[:sigdig]}) },
         #"Tax Type" => lambda {|it| it['taxType'] },
         "Item Term" => lambda {|it| it['itemTerm'] },
         "Item ID" => lambda {|it| it['itemId'] },

data/lib/morpheus/cli/library_cluster_layouts_command.rb

@@ -161,6 +161,7 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
         "Workflow" => lambda {|it| it['taskSets'] && it['taskSets'].count > 0 ? it['taskSets'][0]['name'] : nil},
         "Description" => lambda {|it| it['description']},
         "Horizontal Scaling" => lambda {|it| format_boolean(it['hasAutoScale'])},
+        "Install Docker" => lambda {|it| it['installContainerRuntime'].nil? ? nil : format_boolean(it['installContainerRuntime'])},
       }
 
       print_description_list(description_cols, layout)
@@ -248,6 +249,13 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
       opts.on('-s', '--auto-scale [on|off]', String, "Can be used to enable / disable horizontal scaling. Default is on") do |val|
         params['hasAutoScale'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
+      opts.on('--install-docker [on|off]', String, "Install Docker container runtime. Default is off.") do |val|
+        params['installContainerRuntime'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
+      opts.on('--install-container-runtime [on|off]', String, "Install Docker container runtime. Default is off.") do |val|
+        params['installContainerRuntime'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
+      opts.add_hidden_option('--install-container-runtime')
       opts.on('--evars-json JSON', String, 'Environment variables JSON: {"name":"Foo", "value":"Bar", "masked":true, "export":true}' ) do |val|
         begin
           evars = JSON.parse(val.to_s)
@@ -374,6 +382,11 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
           params['hasAutoScale'] = Morpheus::Cli::OptionTypes.confirm("Enable scaling?", {:default => false}) == true
         end
 
+        # install docker
+        if params['installContainerRuntime'].nil?
+          params['installContainerRuntime'] = Morpheus::Cli::OptionTypes.confirm("Install Docker?", {:default => false}) == true
+        end
+        
         # evars?
         if params['environmentVariables'].nil?
           evars = []
@@ -506,6 +519,13 @@ class Morpheus::Cli::LibraryClusterLayoutsCommand
       opts.on('-s', '--auto-scale [on|off]', String, "Can be used to enable / disable horizontal scaling. Default is on") do |val|
         params['hasAutoScale'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
+      opts.on('--install-docker [on|off]', String, "Install Docker container runtime. Default is off.") do |val|
+        params['installContainerRuntime'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
+      opts.on('--install-container-runtime [on|off]', String, "Install Docker container runtime. Default is off.") do |val|
+        params['installContainerRuntime'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
+      opts.add_hidden_option('--install-container-runtime')
       opts.on('--evars-json JSON', String, 'Environment variables JSON: {"name":"Foo", "value":"Bar", "masked":true, "export":true}' ) do |val|
         begin
           evars = JSON.parse(val.to_s)

data/lib/morpheus/cli/load_balancer_types.rb

@@ -0,0 +1,37 @@
+# require 'yaml'
+require 'io/console'
+require 'rest_client'
+require 'optparse'
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::LoadBalancerTypes
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+  include Morpheus::Cli::LoadBalancersHelper
+
+  set_command_name :'load-balancer-types'
+  register_subcommands :list, :get
+
+  # register_interfaces :load_balancer_types
+
+  protected
+
+  def load_balancer_type_column_definitions
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Code" => 'code'
+    }
+  end
+
+  def load_balancer_type_list_column_definitions
+    load_balancer_type_column_definitions
+  end
+
+  # overridden to support name or code
+  def find_load_balancer_type_by_name_or_id(name)
+    load_balancer_type_for_name_or_id(name)
+  end
+
+end
+

data/lib/morpheus/cli/load_balancers.rb

@@ -1,161 +1,106 @@
 # require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::LoadBalancers
   include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::RestCommand
+  include Morpheus::Cli::LoadBalancersHelper
 
-  register_subcommands :list, :get, :add, :update, :remove, {:types => :lb_types}
-  alias_subcommand :details, :get
-
-  def initialize() 
-    # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
-  end
-
-  def connect(opts)
-    @api_client = establish_remote_appliance_connection(opts)
-    @load_balancers_interface = @api_client.load_balancers
-  end
+  set_command_name :'load-balancers'
+  register_subcommands :list, :get, :add, :update, :remove
 
+  # deprecated the `load-balancers types` command in 5.3.2, it moved to `load-balancer-types list`
+  register_subcommands :types
+  set_subcommands_hidden :types
 
-  def handle(args)
-    handle_subcommand(args)
-  end
+  # RestCommand settings
+  register_interfaces :load_balancers, :load_balancer_types
+  set_rest_has_type true
+  # set_rest_type :load_balancer_types
 
-  def list(args)
-    options = {}
-    optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :json, :csv, :yaml, :fields, :dry_run, :remote])
-    end
-    optparse.parse!(args)
-    connect(options)
-    begin
-      params = {}
-      [:phrase, :offset, :max, :sort, :direction].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
-      @load_balancers_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @load_balancers_interface.dry.list(params)
-        return
-      end
-      json_response = @load_balancers_interface.list(params)
-      if options[:json]
-        puts as_json(json_response, options, "loadBalancers")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv(json_response["loadBalancers"], options)
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "loadBalancers")
-        return 0
-      else
-        lbs = json_response['loadBalancers']
-        print_h1 "Morpheus Load Balancers"
-        if lbs.empty?
-          print cyan,"No load balancers found.",reset,"\n"
-        else
-          columns = [
-            {"ID" => 'id'},
-            {"Name" => 'name'},
-            {"Type" => lambda {|it| it['type'] ? it['type']['name'] : '' } },
-            {"Cloud" => lambda {|it| it['cloud'] ? it['cloud']['name'] : '' } },
-            {"Host" => lambda {|it| it['host'] } },
-          ]
-          print as_pretty_table(lbs, columns, options)
-        end
-        print reset,"\n"
-        return 0
+  def render_response_for_get(json_response, options)
+    render_response(json_response, options, rest_object_key) do
+      record = json_response[rest_object_key]
+      print_h1 rest_label, [], options
+      print cyan
+      print_description_list(rest_column_definitions, record, options)
+      # show LB Ports
+      ports = record['ports']
+      if ports && ports.size > 0
+        print_h2 "LB Ports", options
+        columns = [
+          {"ID" => 'id'},
+          {"Name" => 'name'},
+          #{"Description" => 'description'},
+          {"Port" => lambda {|it| it['port'] } },
+          {"Protocol" => lambda {|it| it['proxyProtocol'] } },
+          {"SSL" => lambda {|it| it['sslEnabled'] ? "Yes (#{it['sslCert'] ? it['sslCert']['name'] : 'none'})" : "No" } },
+        ]
+        print as_pretty_table(ports, columns, options)
       end
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
+      print reset,"\n"
     end
   end
 
-  def get(args)
+=begin
+
+# now using RestCommand
+
+  def add(args)
+    lb_type_name = nil
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :csv, :yaml, :fields, :dry_run, :remote])
+      opts.banner = subcommand_usage("[name] -t LB_TYPE")
+      opts.on( '-t', '--type CODE', "Load Balancer Type" ) do |val|
+        lb_type_name = val
+      end
+      #build_option_type_options(opts, options, add_load_balancer_option_types)
+      build_standard_add_options(opts, options)
     end
     optparse.parse!(args)
-    if args.count < 1
+    lb_name = args[0]
+    # verify_args!(args:args, optparse:optparse, min:0, max: 1)
+    verify_args!(args:args, optparse:optparse, min:1, max: 1)
+    if lb_type_name.nil?
+      raise_command_error "Load Balancer Type is required.\n#{optparse}"
       puts optparse
       exit 1
     end
-    lb_name = args[0]
     connect(options)
-    begin
-      @load_balancers_interface.setopts(options)
-      if options[:dry_run]
-        if lb_name.to_s =~ /\A\d{1,}\Z/
-          print_dry_run @load_balancers_interface.dry.get(lb_name.to_i)
-        else
-          print_dry_run @load_balancers_interface.dry.list({name:lb_name})
-        end
-        return
-      end
-      lb = find_lb_by_name_or_id(lb_name)
-      exit 1 if lb.nil?
-      # refetch
-      json_response = @load_balancers_interface.get(lb['id'])
-      lb_type = load_balancer_type_for_name_or_id(lb['type']['code'])
-      #puts "LB TYPE: #{lb_type}"
-      if options[:json]
-        puts JSON.pretty_generate({loadBalancer: lb})
-        puts as_json(json_response, options, "loadBalancer")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv(json_response["loadBalancer"], options)
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "loadBalancer")
-        return 0
-      else
-        print_h1 "Load Balancer Details"
-        description_cols = {
-          "ID" => 'id',
-          "Name" => 'name',
-          "Description" => 'description',
-          "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
-          "Cloud" => lambda {|it| it['cloud'] ? it['cloud']['name'] : '' },
-          "Visibility" => 'visibility',
-          "IP" => 'ip',
-          "Host" => 'host',
-          "Port" => 'port',
-          "Username" => 'username',
-          # "SSL Enabled" => lambda {|it| format_boolean it['sslEnabled'] },
-          # "SSL Cert" => lambda {|it| it['sslCert'] ? it['sslCert']['name'] : '' },
-          # "SSL" => lambda {|it| it['sslEnabled'] ? "Yes (#{it['sslCert'] ? it['sslCert']['name'] : 'none'})" : "No" },
-          "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
-          "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
-        }
-        print_description_list(description_cols, lb)
-
-
-        if lb['ports'] && lb['ports'].size > 0
-          print_h2 "LB Ports"
-          columns = [
-            {"ID" => 'id'},
-            {"Name" => 'name'},
-            #{"Description" => 'description'},
-            {"Port" => lambda {|it| it['port'] } },
-            {"Protocol" => lambda {|it| it['proxyProtocol'] } },
-            {"SSL" => lambda {|it| it['sslEnabled'] ? "Yes (#{it['sslCert'] ? it['sslCert']['name'] : 'none'})" : "No" } },
-          ]
-          print as_pretty_table(lb['ports'], columns, options)
-        end
-        print reset,"\n"
-        return 0
-      end
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
+    lb_type = load_balancer_type_for_name_or_id(lb_type_name)
+    if lb_type.nil?
+      print_red_alert "LB Type #{lb_type_name} not found!"
       exit 1
     end
+    passed_options = parse_passed_options(options)
+    payload = {}
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({load_balancer_object_key => passed_options})
+    else
+      load_balancer_payload = {'name' => lb_name, 'type' => {'code' =>  lb_type['code'], 'id' => lb_type['id']}}
+      load_balancer_payload.deep_merge!({load_balancer_object_key => passed_options})
+      # options by type
+      my_option_types = lb_type['optionTypes']
+      if my_option_types && !my_option_types.empty?
+        v_prompt = Morpheus::Cli::OptionTypes.prompt(my_option_types, options[:options], @api_client, options[:params])
+        v_prompt.deep_compact!
+        load_balancer_payload.deep_merge!(v_prompt)
+      end
+      payload[load_balancer_object_key] = load_balancer_payload
+    end
+    @load_balancers_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @load_balancers_interface.dry.create(payload)
+      return
+    end      
+    json_response = @load_balancers_interface.create(payload)
+    render_response(json_response, options, load_balancer_object_key) do
+      load_balancer = json_response[load_balancer_object_key]
+      print_green_success "Added load balancer #{load_balancer['name']}"
+      return _get(load_balancer["id"], {}, options)
+    end
+    return 0, nil
   end
 
   def update(args)
@@ -163,8 +108,8 @@ class Morpheus::Cli::LoadBalancers
     options = {}
     account_name = nil
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name] [options]")
-      build_common_options(opts, options, [:options, :json, :dry_run, :remote])
+      opts.banner = subcommand_usage("[lb] [options]")
+      build_standard_update_options(opts, options)
     end
     optparse.parse!(args)
     if args.count < 1
@@ -172,141 +117,47 @@ class Morpheus::Cli::LoadBalancers
       exit 1
     end
     connect(options)
-    begin
-
-      lb = find_lb_by_name_or_id(lb_name)
-      exit 1 if lb.nil?
-      lb_type = load_balancer_type_for_name_or_id(lb['type']['code'])
-
-      #params = Morpheus::Cli::OptionTypes.prompt(add_load_balancer_option_types, options[:options], @api_client, options[:params]) # options[:params] is mysterious
-      params = options[:options] || {}
-
-      if params.empty?
-        puts optparse
-        option_lines = update_task_option_types(lb_type).collect {|it| "\t-O #{it['fieldContext'] ? (it['fieldContext'] + '.') : ''}#{it['fieldName']}=\"value\"" }.join("\n")
-        puts "\nAvailable Options:\n#{option_lines}\n\n"
-        exit 1
-      end
 
-      # todo: fix this...
-      #puts "parsed params is : #{params.inspect}"
-      lb_keys = ['name']
-      changes_payload = (params.select {|k,v| task_keys.include?(k) })
-      task_payload = task
-      if changes_payload
-        task_payload.merge!(changes_payload)
-      end
-      puts params
-      if params['taskOptions']
-        task_payload['taskOptions'].merge!(params['taskOptions'])
-      end
-      payload = {task: task_payload}
-      @load_balancers_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @load_balancers_interface.dry.update(task['id'], payload)
-        return
+    passed_options = parse_passed_options(options)
+    payload = nil
+    if options[:payload]
+      payload = options[:payload]
+      payload.deep_merge!({load_balancer_object_key => passed_options}) unless passed_options.empty?
+    else
+      load_balancer_payload = passed_options
+      if tenants_list
+        load_balancer_payload['accounts'] = tenants_list
       end
-      response = @load_balancers_interface.update(task['id'], payload)
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        if !response['success']
-          exit 1
-        end
+      # metadata tags
+      if options[:tags]
+        load_balancer_payload['tags'] = parse_metadata(options[:tags])
       else
-        print "\n", cyan, "Task #{response['task']['name']} updated", reset, "\n\n"
+        # tags = prompt_metadata(options)
+        # payload[load_balancer_object_key]['tags'] = tags of tags
       end
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
-    end
-  end
-
-
-  def lb_types(args)
-    options = {}
-    optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:json, :dry_run, :remote])
-    end
-    optparse.parse!(args)
-    connect(options)
-    begin
-      @load_balancers_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @load_balancers_interface.dry.load_balancer_types()
-        return
+      # metadata tags
+      if options[:add_tags]
+        load_balancer_payload['addTags'] = parse_metadata(options[:add_tags])
       end
-      json_response = @load_balancers_interface.load_balancer_types()
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-      else
-        lb_types = json_response['loadBalancerTypes']
-        print_h1 "Morpheus Load Balancer Types"
-        if lb_types.nil? || lb_types.empty?
-          print cyan,"No load balancer types found.",reset,"\n"
-        else
-          print cyan
-          lb_table_data = lb_types.collect do |lb_type|
-            {name: lb_type['name'], id: lb_type['id'], code: lb_type['code']}
-          end
-          print as_pretty_table(lb_table_data, [:id, :name, :code], options)
-        end
-
-        print reset,"\n"
+      if options[:remove_tags]
+        load_balancer_payload['removeTags'] = parse_metadata(options[:remove_tags])
       end
-          rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
-    end
-  end
-
-  # JD: This is broken.. copied from tasks? should optionTypes exist?
-  def add(args)
-    lb_type_name = nil
-    options = {}
-    optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name] -t LB_TYPE")
-      opts.on( '-t', '--type LB_TYPE', "Load Balancer Type" ) do |val|
-        lb_type_name = val
+      if load_balancer_payload.empty?
+        raise_command_error "Specify at least one option to update.\n#{optparse}"
       end
-      build_common_options(opts, options, [:options, :json, :dry_run, :remote])
-    end
-    optparse.parse!(args)
-    lb_name = args[0]
-    if args.count < 1
-      puts optparse
-      exit 1
+      payload = {'virtualImage' => load_balancer_payload}
     end
-    if lb_type_name.nil?
-      puts optparse
-      exit 1
+    @load_balancers_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @load_balancers_interface.dry.update(load_balancer['id'], payload)
+      return
     end
-    connect(options)
-    begin
-      lb_type = load_balancer_type_for_name_or_id(lb_type_name)
-      if lb_type.nil?
-        print_red_alert "LB Type #{lb_type_name} not found!"
-        exit 1
-      end
-
-      payload = {loadBalancer: {name: lb_name, type: {code: lb_type['code'], id: lb_type['id']}}}
-      # todo: The options available here are specific by type...
-      #input_options = Morpheus::Cli::OptionTypes.prompt(lb_type['optionTypes'],options[:options],@api_client, options[:params])
-      @load_balancers_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @load_balancers_interface.dry.create(payload)
-        return
-      end      
-      json_response = @load_balancers_interface.create(payload)
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-      else
-        print "\n", cyan, "LB #{json_response['loadBalancer']['name']} created successfully", reset, "\n\n"
-      end
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+    json_response = @load_balancers_interface.update(load_balancer['id'], payload)
+    render_response(json_response, options, 'virtualImage') do
+      print_green_success "Updated virtual image #{load_balancer['name']}"
+      _get(load_balancer["id"], {}, options)
     end
+    return 0, nil
   end
 
   def remove(args)
@@ -323,7 +174,7 @@ class Morpheus::Cli::LoadBalancers
     end
     connect(options)
     begin
-      lb = find_lb_by_name_or_id(lb_name)
+      lb = find_load_balancer_by_name_or_id(lb_name)
       exit 1 if lb.nil?
       unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the load balancer #{lb['name']}?")
         exit
@@ -344,67 +195,51 @@ class Morpheus::Cli::LoadBalancers
       exit 1
     end
   end
+=end
 
-
-  private
-
-  def find_lb_by_name_or_id(val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return find_lb_by_id(val)
-    else
-      return find_lb_by_name(val)
-    end
+  # deprecated, to be removed in the future.
+  def types(args)
+    print_error yellow,"[DEPRECATED] The command `load-balancers types` is deprecated and replaced by `load-balancer-types list`.",reset,"\n"
+    my_terminal.execute("load-balancer-types list #{args.join(' ')}")
   end
 
-  def find_lb_by_id(id)
-    begin
-      json_response = @load_balancers_interface.get(id.to_i)
-      return json_response['loadBalancer']
-    rescue RestClient::Exception => e
-      if e.response && e.response.code == 404
-        print_red_alert "Load Balancer not found by id #{id}"
-      else
-        raise e
-      end
-    end
-  end
+  protected
 
-  def find_lb_by_name(name)
-    lbs = @load_balancers_interface.list({name: name.to_s})['loadBalancers']
-    if lbs.empty?
-      print_red_alert "Load Balancer not found by name #{name}"
-      return nil
-    elsif lbs.size > 1
-      print_red_alert "#{lbs.size} load balancers found by name #{name}"
-      #print_lbs_table(lbs, {color: red})
-      print reset,"\n\n"
-      return nil
-    else
-      return lbs[0]
-    end
+  def load_balancer_list_column_definitions()
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
+      "Cloud" => lambda {|it| it['cloud'] ? it['cloud']['name'] : '' },
+      "Host" => lambda {|it| it['host'] }
+    }
   end
 
-  def get_available_load_balancer_types(refresh=false)
-    if !@available_load_balancer_types || refresh
-      @available_load_balancer_types = @load_balancers_interface.load_balancer_types['loadBalancerTypes']
-    end
-    return @available_load_balancer_types
+  def load_balancer_column_definitions()
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Description" => 'description',
+      "Type" => lambda {|it| it['type'] ? it['type']['name'] : '' },
+      "Cloud" => lambda {|it| it['cloud'] ? it['cloud']['name'] : '' },
+      "Visibility" => 'visibility',
+      "IP" => 'ip',
+      "Host" => 'host',
+      "Port" => 'port',
+      "Username" => 'username',
+      # "SSL Enabled" => lambda {|it| format_boolean it['sslEnabled'] },
+      # "SSL Cert" => lambda {|it| it['sslCert'] ? it['sslCert']['name'] : '' },
+      # "SSL" => lambda {|it| it['sslEnabled'] ? "Yes (#{it['sslCert'] ? it['sslCert']['name'] : 'none'})" : "No" },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
+    }
   end
 
-  def load_balancer_type_for_name_or_id(val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return load_balancer_type_for_id(val)
-    else
-      return load_balancer_type_for_name(val)
-    end
+  # overridden to work with name or code
+  def find_load_balancer_type_by_name_or_id(name)
+    load_balancer_type_for_name_or_id(name)
   end
 
-  def load_balancer_type_for_id(id)
-    return get_available_load_balancer_types().find { |z| z['id'].to_i == id.to_i}
-  end
 
-  def load_balancer_type_for_name(name)
-    return get_available_load_balancer_types().find { |z| z['name'].downcase == name.downcase || z['code'].downcase == name.downcase}
-  end
 
 end