morpheus-cli 5.3.0 → 5.3.1.1

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_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)

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)

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)

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)

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)

data/lib/morpheus/cli/library_option_lists_command.rb

@@ -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)

data/lib/morpheus/cli/library_option_types_command.rb

@@ -17,10 +17,10 @@ class Morpheus::Cli::LibraryOptionTypesCommand
 
   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)

data/lib/morpheus/cli/library_upgrades_command.rb

@@ -18,12 +18,12 @@ class Morpheus::Cli::LibraryUpgradesCommand
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @library_container_upgrades_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).library_container_upgrades
-    @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_upgrades_interface = @api_client.library_container_upgrades
+    @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)

data/lib/morpheus/cli/license.rb

@@ -20,8 +20,8 @@ class Morpheus::Cli::License
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @api_client = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url)		
-    @license_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).license
+    @api_client = @api_client		
+    @license_interface = @api_client.license
   end
 
   def handle(args)

data/lib/morpheus/cli/load_balancers.rb

@@ -16,7 +16,7 @@ class Morpheus::Cli::LoadBalancers
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
-    @load_balancers_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).load_balancers
+    @load_balancers_interface = @api_client.load_balancers
   end
 
 

data/lib/morpheus/cli/login.rb

@@ -36,6 +36,13 @@ class Morpheus::Cli::Login
       opts.on( '-p', '--password PASSWORD', "Password" ) do |val|
         password = val
       end
+      opts.on( '--password-file FILE', String, "Password File, read a file containing the password." ) do |val|
+        password_file = File.expand_path(val)
+        if !File.exists?(password_file) || !File.file?(password_file) # check readable too
+          raise ::OptionParser::InvalidOption.new("File not found: #{password_file}")
+        end
+        password = File.read(password_file) #.to_s.split("\n").first.strip
+      end
       opts.on( '-t', '--test', "Test credentials only, does not update stored credentials for the appliance." ) do
         options[:test_only] = true
       end
@@ -70,7 +77,9 @@ EOT
     # connect(options)
     @api_client = establish_remote_appliance_connection(options.merge({:no_prompt => true, :skip_verify_access_token => true, :skip_login => true}))
     
-    if @remote_appliance[:authenticated]
+    if options[:test_only]
+      puts "Testing credentials, your current session will not be modified."
+    elsif @remote_appliance[:authenticated]
       puts "You will be automatically logged out of your current session as '#{@remote_appliance[:username]}'"
     end
 

data/lib/morpheus/cli/mixins/option_source_helper.rb

@@ -178,7 +178,7 @@ module Morpheus::Cli::OptionSourceHelper
   # todo: some other common ones, accounts (tenants), etc.
   # todo: a generic set of parse and find methods like 
   # like this:
-  def parse_option_source_id_list(option_source, id_list, api_params={}, refresh=false)
+  def parse_option_source_id_list(option_source, id_list, api_params={}, refresh=false, allow_any_id=false)
     option_source_label = option_source.to_s # .capitalize
     option_data = load_option_source_data(option_source, api_params, refresh)
     found_ids = []
@@ -189,9 +189,8 @@ module Morpheus::Cli::OptionSourceHelper
         # never match blank nil or empty strings
         print_red_alert "#{option_source_label} cannot be not found by with a blank id!"
         return nil
-      # elsif record_id.to_s =~ /\A\d{1,}\Z/
-      #   # always allow any ID for now..
-      #   found_ids << record_id
+      elsif allow_any_id && record_id.to_s =~ /\A\d{1,}\Z/
+        found_ids << record_id.to_i
       else
         # search with in a presedence by value, then name, then id (usually same as value)
         # exact match on value first.
@@ -228,28 +227,28 @@ module Morpheus::Cli::OptionSourceHelper
     return found_ids
   end
 
-  def parse_cloud_id_list(id_list, api_params={}, refresh=false)
-    parse_option_source_id_list('clouds', id_list, api_params, refresh)
+  def parse_cloud_id_list(id_list, api_params={}, refresh=false, allow_any_id=false)
+    parse_option_source_id_list('clouds', id_list, api_params, refresh, allow_any_id)
   end
 
-  def parse_group_id_list(id_list, api_params={}, refresh=false)
-    parse_option_source_id_list('groups', id_list, api_params, refresh)
+  def parse_group_id_list(id_list, api_params={}, refresh=false, allow_any_id=false)
+    parse_option_source_id_list('groups', id_list, api_params, refresh, allow_any_id)
   end
 
-  def parse_user_id_list(id_list, api_params={}, refresh=false)
-    parse_option_source_id_list('users', id_list, api_params, refresh)
+  def parse_user_id_list(id_list, api_params={}, refresh=false, allow_any_id=false)
+    parse_option_source_id_list('users', id_list, api_params, refresh, allow_any_id)
   end
 
-  def parse_tenant_id_list(id_list, api_params={}, refresh=false)
-    parse_option_source_id_list('allTenants', id_list, api_params, refresh)
+  def parse_tenant_id_list(id_list, api_params={}, refresh=false, allow_any_id=false)
+    parse_option_source_id_list('allTenants', id_list, api_params, refresh, allow_any_id)
   end
 
-  # def parse_blueprints_id_list(id_list)
-  #   parse_option_source_id_list('blueprints', id_list, api_params, refresh)
+  # def parse_blueprints_id_list(id_list, api_params={}, refresh=false, allow_any_id=false)
+  #   parse_option_source_id_list('blueprints', id_list, api_params, refresh, allow_any_id)
   # end
 
-  def parse_project_id_list(id_list, api_params={}, refresh=false)
-    parse_option_source_id_list('projects', id_list, api_params, refresh)
+  def parse_project_id_list(id_list, api_params={}, refresh=false, allow_any_id=false)
+    parse_option_source_id_list('projects', id_list, api_params, refresh, allow_any_id)
   end
 
 end