morpheus-cli 5.5.1.4 → 5.5.2

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

@@ -8,7 +8,7 @@ class Morpheus::Cli::Hosts
   set_command_name :hosts
   set_command_description "View and manage hosts (servers)."
   register_subcommands :list, :count, :get, :view, :stats, :add, :update, :remove, :logs, :start, :stop, :resize, 
-                       :run_workflow, :make_managed, :upgrade_agent, :snapshots, :software, :software_sync,
+                       :run_workflow, :make_managed, :upgrade_agent, :snapshots, :software, :software_sync, :update_network_label,
                        {:'types' => :list_types},
                        {:exec => :execution_request},
                        :wiki, :update_wiki
@@ -109,11 +109,11 @@ class Morpheus::Cli::Hosts
       opts.on( '--tenant TENANT', "Tenant Name or ID" ) do |val|
         options[:account] = val
       end
-      opts.on('--labels label',String, "Filter by labels (keywords).") do |val|
-        val.split(",").each do |k|
-          options[:labels] ||= []
-          options[:labels] << k.strip
-        end
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
       end
       opts.on('--tags Name=Value',String, "Filter by tags.") do |val|
         val.split(",").each do |value_pair|
@@ -519,7 +519,7 @@ class Morpheus::Cli::Hosts
         "Name" => 'name',
         "Hostname" => 'hostname',
         "Description" => 'description',
-        "Labels" => lambda {|it| it['labels'] ? it['labels'].join(',') : '' },
+        "Labels" => lambda {|it| format_list(it['labels']) rescue '' },
         "Tags" => lambda {|it| tags ? format_metadata(tags) : '' },
         "Owner" => lambda {|it| it['owner'] ? it['owner']['username'] : '' },
         "Tenant" => lambda {|it| it['account'] ? it['account']['name'] : '' },
@@ -751,6 +751,16 @@ class Morpheus::Cli::Hosts
       opts.on("--security-groups LIST", Integer, "Security Groups, comma separated list of security group IDs") do |val|
         options[:security_groups] = val.split(",").collect {|s| s.strip }.select {|s| !s.to_s.empty? }
       end
+      opts.on('--tags LIST', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
+        options[:metadata] = val
+      end
+      opts.on('--metadata [LIST]', String, "Metadata tags in the format 'ping=pong,flash=bang'") do |val|
+        options[:metadata] = val
+      end
+      opts.add_hidden_option('--metadata')
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
+      end
       opts.on('--refresh [SECONDS]', String, "Refresh until status is running,failed. Default interval is #{default_refresh_interval} seconds.") do |val|
         options[:refresh_interval] = val.to_s.empty? ? default_refresh_interval : val.to_f
       end
@@ -933,7 +943,18 @@ class Morpheus::Cli::Hosts
             end
           end
         end
-    
+        
+        # Metadata Tags
+        if metadata_option_type
+          if options[:metadata]
+            metadata = parse_metadata(options[:metadata])
+            payload['tags'] = metadata if !metadata.empty?
+          else
+            metadata = prompt_metadata(options)
+            payload['tags'] = metadata if !metadata.empty?
+          end
+        end
+
         api_params = {}
         api_params['zoneId'] = cloud['id']
         api_params['poolId'] = payload['config']['resourcePool'] if (payload['config'] && payload['config']['resourcePool'])
@@ -988,8 +1009,8 @@ class Morpheus::Cli::Hosts
       opts.on('--power-schedule-type ID', String, "Power Schedule Type ID") do |val|
         params['powerScheduleType'] = val == "null" ? nil : val
       end
-      opts.on('--labels [LIST]', String, "Labels (keywords) in the format 'foo, bar'") do |val|
-        params['labels'] = val.to_s.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        params['labels'] = parse_labels(val)
       end
       opts.on('--tags LIST', String, "Tags in the format 'name:value, name:value'. This will add and remove tags.") do |val|
         options[:tags] = val
@@ -1276,7 +1297,10 @@ class Morpheus::Cli::Hosts
       current_volumes = volumes_response['volumes'].sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }
 
       # prompt for volumes
-      volumes = prompt_resize_volumes(current_volumes, service_plan, provision_type, options)
+      vol_options = options 
+      vol_options['siteId'] = group_id
+      vol_options['zoneId'] = cloud_id
+      volumes = prompt_resize_volumes(current_volumes, service_plan, provision_type, vol_options)
       if !volumes.empty?
         payload[:volumes] = volumes
       end
@@ -2219,6 +2243,79 @@ EOT
     end
     out
   end
+
+  def update_network_label(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[server] [options]")
+      opts.on('--network NETWORK', "Network Interface ID" ) do |val|
+        options[:network] = val
+      end
+      opts.on('--label LABEL', "label") do |val|
+        options[:label] = val
+      end
+      opts.footer = "Change the label of a Network Interface.\n" +
+                    "Editing an Interface will not apply changes to the physical hardware. The purpose is for a manual override or data correction (mostly for self managed or baremetal servers where cloud sync is not available)\n" +
+                    "[name or id] is required. The name or the id of the server.\n" +
+                    "[network] ID of the Network Interface. (optional).\n" +
+                    "[label] New Label name for the Network Interface (optional)"
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+    end
+    optparse.parse!(args)
+    if args.count != 1
+      puts_error  "#{Morpheus::Terminal.angry_prompt}wrong number of arguments. Expected 1 and received #{args.count} #{args.inspect}\n#{optparse}"
+      return 1
+    end
+    connect(options)
+
+    begin
+      host = find_host_by_name_or_id(args[0])
+      return 1 if host.nil?
+
+      network_id = options[:network]
+      if network_id != nil && network_id.to_i == 0
+        print_red_alert  "network must be an ID/integer above 0, not a name/string value."
+        network_id = nil
+      end
+
+
+      if !network_id
+        available_networks = get_available_networks(host)
+        network_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'network', 'fieldLabel' => 'Network', 'type' => 'select', 'selectOptions' => available_networks, 'required' => true, 'defaultValue' => available_networks[0], 'description' => "The networks available for relabeling"}], options[:options])
+        network_id = network_prompt['network']
+      end
+
+      label = options[:label]
+      while label.nil? do
+        label_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'label', 'fieldLabel' => 'Label', 'type' => 'text', 'required' => true}], options[:options])
+        label = label_prompt['label']
+      end
+      payload = { "name" => label }
+      if options[:dry_run]
+        print_dry_run @servers_interface.dry.update_network_label(network_id, host["id"], payload)
+        return
+      end
+      json_response = @servers_interface.update_network_label(network_id, host["id"], payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Updated label for host #{host['name']} network #{network_id} to #{label}"
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def get_available_networks(host)
+    results = @options_interface.options_for_source('availableNetworksForHost',{serverId: host['id'].to_i})
+    available_networks = results['data'].collect {|it|
+      {"id" => it["value"], "name" => it["name"], "value" => it["value"]}
+    }
+    return available_networks
+  end
   
 
    def make_managed_option_types(connected=true)

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

@@ -23,6 +23,7 @@ class Morpheus::Cli::Instances
                        :console, :status_check, {:containers => :list_containers}, 
                        :scaling, {:'scaling-update' => :scaling_update},
                        :wiki, :update_wiki,
+                       :update_network_label,
                        {:exec => :execution_request},
                        :deploys,
                        :refresh, :prepare_apply, :apply, :state
@@ -121,11 +122,11 @@ class Morpheus::Cli::Instances
       opts.on( '--plan-code CODE', String, "Filter by Plan code(s)" ) do |val|
         params['planCode'] = parse_id_list(val)
       end
-      opts.on('--labels label',String, "Filter by labels (keywords).") do |val|
-        val.split(",").each do |k|
-          options[:labels] ||= []
-          options[:labels] << k.strip
-        end
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
       end
       opts.on('--tags Name=Value',String, "Filter by tags (metadata name value pairs).") do |val|
         val.split(",").each do |value_pair|
@@ -182,7 +183,6 @@ class Morpheus::Cli::Instances
 
     params['showDeleted'] = true if options[:showDeleted]
     params['deleted'] = true if options[:deleted]
-    params['labels'] = options[:labels] if options[:labels]
     if options[:tags]
       options[:tags].each do |k,v|
         params['tags.' + k] = v
@@ -257,6 +257,7 @@ class Morpheus::Cli::Instances
           row = {
             id: instance['id'],
             name: instance['name'],
+            labels: format_list(instance['labels'], '', 3),
             connection: format_instance_connection_string(instance),
             environment: instance['instanceContext'],
             user: (instance['owner'] ? (instance['owner']['username'] || instance['owner']['id']) : (instance['createdBy'].is_a?(Hash) ? instance['createdBy']['username'] : instance['createdBy'])),
@@ -275,16 +276,16 @@ class Morpheus::Cli::Instances
           }
           row
         }
-        columns = [:id, {:name => {:max_width => 50}}, :group, :cloud, 
-            :type, :version, :environment, 
+        columns = [:id, {:name => {:max_width => 50}}, :labels, :group, :cloud, 
+            :type, :version, :environment, :plan,
             {:created => {:display_name => "CREATED"}}, 
             # {:tenant => {:display_name => "TENANT"}}, 
             {:user => {:display_name => "OWNER", :max_width => 20}}, 
-            :plan,
             :nodes, {:connection => {:max_width => 30}}, :status, :cpu, :memory, :storage]
         # custom pretty table columns ... this is handled in as_pretty_table now(), 
         # todo: remove all these.. and try to always pass rows as the json data itself..
         if options[:details] != true
+          columns.delete(:labels)
           columns.delete(:plan)
         end
         print cyan
@@ -404,7 +405,7 @@ class Morpheus::Cli::Instances
       end
       opts.add_hidden_option('--metadata')
       opts.on('--labels LIST', String, "Labels (keywords) in the format 'foo, bar'") do |val|
-        options[:labels] = val.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
+        options[:labels] = parse_labels(val)
       end
       opts.on("--copies NUMBER", Integer, "Number of copies to provision") do |val|
         options[:copies] = val.to_i
@@ -608,7 +609,7 @@ class Morpheus::Cli::Instances
         options[:group] = val
       end
       opts.on('--labels [LIST]', String, "Labels (keywords) in the format 'foo, bar'") do |val|
-        params['labels'] = val.to_s.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
+        params['labels'] = parse_labels(val)
       end
       opts.on('--tags LIST', String, "Tags in the format 'name:value, name:value'. This will add and remove tags.") do |val|
         options[:tags] = val
@@ -902,6 +903,74 @@ class Morpheus::Cli::Instances
     end
   end
 
+  def update_network_label(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[instance] [options]")
+      opts.on('--network NETWORK', "Network Interface ID" ) do |val|
+        options[:network] = val
+      end
+      opts.on('--label LABEL', "label") do |val|
+        options[:label] = val
+      end
+       opts.footer = "Change the label of a Network Interface.\n" +
+                    "Editing an Interface will not apply changes to the physical hardware. The purpose is for a manual override or data correction (mostly for self managed or baremetal servers where cloud sync is not available)\n" +
+                    "[name or id] is required. The name or the id of the instance.\n" +
+                    "[network] ID of the Network Interface. (optional).\n" +
+                    "[label] New Label name for the Network Interface (optional)"
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+    end
+    optparse.parse!(args)
+    if args.count != 1
+      puts_error  "#{Morpheus::Terminal.angry_prompt}wrong number of arguments. Expected 1 and received #{args.count} #{args.inspect}\n#{optparse}"
+      return 1
+    end
+    connect(options)
+
+    begin
+      instance = find_instance_by_name_or_id(args[0])
+      return 1 if instance.nil?
+
+      network_id = options[:network]
+      if network_id != nil && network_id.to_i == 0
+        print_red_alert  "network must be an ID/integer above 0, not a name/string value."
+        network_id = nil
+      end
+
+      if !network_id
+        available_networks = get_available_networks(instance)
+        network_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'network', 'fieldLabel' => 'Network', 'type' => 'select', 'selectOptions' => available_networks, 'required' => true, 'defaultValue' => available_networks[0], 'description' => "The networks available for relabeling"}], options[:options])
+        network_id = network_prompt['network']
+      end
+
+
+
+      label = options[:label]
+      while label.nil? do
+        label_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'label', 'fieldLabel' => 'Label', 'type' => 'text', 'required' => true}], options[:options])
+        label = label_prompt['label']
+      end
+      payload = { "name" => label }
+      if options[:dry_run]
+        print_dry_run @instances_interface.dry.update_network_label(network_id, instance["id"], payload)
+        return
+      end
+      json_response = @instances_interface.update_network_label(network_id, instance["id"], payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Updated label for instance #{instance['name']} network #{network_id} to #{label}"
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+
+
   def status_check(args)
     out = ""
     options = {}
@@ -1725,7 +1794,7 @@ class Morpheus::Cli::Instances
       end
       opts.add_hidden_option('--metadata')
       opts.on('--labels LIST', String, "Labels (keywords) in the format 'foo, bar'") do |val|
-        options[:labels] = val.split(',').collect {|it| it.to_s.strip }.compact.uniq.join(',')
+        options[:labels] = parse_labels(val)
       end
       # opts.on("--copies NUMBER", Integer, "Number of copies to provision") do |val|
       #   options[:copies] = val.to_i
@@ -2697,13 +2766,19 @@ class Morpheus::Cli::Instances
       cloud_id = instance['cloud']['id']
       layout_id = instance['layout']['id']
       plan_id = instance['plan']['id']
+      resource_pool_id = instance['config']['resourcePoolId'] if instance['config']
       current_plan_name = instance['plan']['name']
+      current_interfaces = get_instance_interfaces(instance)
+      if current_interfaces != false 
+        payload['networkInterfaces'] = current_interfaces
+      end
+      
 
       # need to GET provision type for some settings...
       provision_type = @provision_types_interface.get(instance['layout']['provisionTypeId'])['provisionType']
 
       # prompt for service plan
-      service_plans_json = @instances_interface.service_plans({zoneId: cloud_id, siteId: group_id, layoutId: layout_id})
+      service_plans_json = @instances_interface.service_plans({zoneId: cloud_id, siteId: group_id, layoutId: layout_id, resourcePoolId: resource_pool_id})
       service_plans = service_plans_json["plans"]
       service_plans_dropdown = service_plans.collect {|sp| {'name' => sp["name"], 'value' => sp["id"]} } # already sorted
       service_plans_dropdown.each do |plan|
@@ -2723,7 +2798,10 @@ class Morpheus::Cli::Instances
       current_volumes = volumes_response['volumes'].sort {|x,y| x['displayOrder'] <=> y['displayOrder'] }
 
       # prompt for volumes
-      volumes = prompt_resize_volumes(current_volumes, service_plan, provision_type, options)
+      vol_options = options 
+      vol_options['siteId'] = group_id
+      vol_options['zoneId'] = cloud_id
+      volumes = prompt_resize_volumes(current_volumes, service_plan, provision_type, vol_options)
       if !volumes.empty?
         payload["volumes"] = volumes
       end
@@ -5184,4 +5262,27 @@ private
     }
   end
 
+  def get_available_networks(instance)
+    results = @options_interface.options_for_source('availableNetworksForInstance',{instanceId: instance['id'].to_i})
+    available_networks = results['data'].collect {|it|
+      {"id" => it["value"], "name" => it["name"], "value" => it["value"]}
+    }
+    return available_networks
+  end
+
+  def get_instance_interfaces(instance)
+    begin
+      servers = instance['servers']
+      interfaces = []
+      servers.each do |server|
+        details = @servers_interface.get(server.to_i)['server']
+        details['interfaces'].each do |inter|
+          interfaces.push(inter)
+        end
+      end
+      return interfaces
+    rescue
+      return false 
+    end
+  end
 end

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

@@ -8,6 +8,7 @@ class Morpheus::Cli::IntegrationsCommand
 
   register_subcommands :list, :get, :add, :update, :remove, :refresh
   register_subcommands :list_objects, :get_object, :add_object, :remove_object
+  register_subcommands :list_inventory, :get_inventory, :update_inventory
   register_subcommands :list_types, :get_type
 
   def connect(opts)
@@ -936,6 +937,170 @@ EOT
     return 0, nil
   end
 
+  def list_inventory(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[integration] [search]")
+      build_standard_list_options(opts, options)
+      opts.footer = <<-EOT
+List integration inventory.
+[integration] is required. This is the name or id of an integration.
+Only certain types of integrations support this operation, such as Ansible Tower.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, min:1)
+    connect(options)
+
+    integration = find_integration_by_name_or_id(args[0])
+    return 1, "integration not found for #{args[0]}" if integration.nil?
+
+    if args.count > 1
+      options[:phrase] = args[1..-1].join(" ")
+    end
+    params.merge!(parse_list_options(options))
+    @integrations_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @integrations_interface.dry.list_inventory(integration['id'], params)
+      return 0, nil
+    end
+    json_response = @integrations_interface.list_inventory(integration['id'], params)
+    render_response(json_response, options, integration_inventory_list_key) do
+      integration_inventory = json_response[integration_inventory_list_key]
+      print_h1 "Integration Inventory [#{integration['name']}]", parse_list_subtitles(options), options
+      if integration_inventory.empty?
+        print cyan,"No inventory found.",reset,"\n"
+      else
+        list_columns = {
+          "ID" => 'id',
+          "Name" => 'name',
+          "Description" => 'description',
+          "Tenant Default" => lambda {|it| (format_list(it['tenants'].collect {|t| t['name'] }) rescue "") },
+        }
+        print as_pretty_table(integration_inventory, list_columns.upcase_keys!, options)
+        print_results_pagination(json_response)
+      end
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+
+  def get_inventory(args)
+    params = {}
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[integration] [inventory]")
+      build_standard_get_options(opts, options)
+      opts.footer = <<-EOT
+Get details about a specific integration inventory item.
+[integration] is required. This is the name or id of an integration.
+[inventory] is required. This is the name or id of an integration inventory item.
+Only certain types of integrations support this operation, such as Ansible Tower.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, min:2)
+    connect(options)
+    integration = find_integration_by_name_or_id(args[0])
+    return 1, "integration not found for #{args[0]}" if integration.nil?
+    params.merge!(parse_query_options(options))
+    id_list = parse_id_list(args[1..-1])
+    return run_command_for_each_arg(id_list) do |arg|
+      _get_inventory(integration, arg, params, options)
+    end
+  end
+
+  def _get_inventory(integration, id, params, options)
+    integration_object = nil
+    if id.to_s !~ /\A\d{1,}\Z/
+      integration_inventory = find_integration_inventory_by_name_or_id(integration['id'], id)
+      return 1, "integration inventory not found for #{id}" if integration_inventory.nil?
+      id = integration_inventory['id']
+    end
+    @integrations_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @integrations_interface.dry.get_inventory(integration['id'], id, params)
+      return
+    end
+    json_response = @integrations_interface.get_inventory(integration['id'], id, params)
+    integration_inventory = json_response[integration_inventory_object_key]
+    render_response(json_response, options, integration_inventory_object_key) do
+      print_h1 "Integration Inventory Details", [], options
+      print cyan
+      show_columns = {
+        "ID" => 'id',
+        "Name" => 'name',
+        "Description" => 'description',
+        "Tenant Default" => lambda {|it| (format_list(it['tenants'].collect {|t| t['name'] }) rescue "") },
+      }
+      print_description_list(show_columns, integration_inventory, options)
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+
+  def update_inventory(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[integration] [inventory] [options]")
+      opts.on('--tenants [LIST]', String, "Tenant Default, comma separated list of account IDs") do |val|
+        options[:tenants] = parse_array(val)
+      end
+      build_standard_update_options(opts, options)
+      opts.footer = <<-EOT
+Update an integration inventory item.
+[integration] is required. This is the name or id of an integration.
+[inventory] is required. This is the name or id of an integration inventory item.
+Only certain types of integrations support this operation, such as Ansible Tower.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, count:2)
+    connect(options)
+    integration = find_integration_by_name_or_id(args[0])
+    return 1, "integration not found for #{args[0]}" if integration.nil?
+    integration_inventory = find_integration_inventory_by_name_or_id(integration['id'], args[1])
+    return 1, "integration inventory not found for #{args[1]}" if integration_inventory.nil?
+    # construct payload
+    object_key = integration_inventory_object_key
+    payload = build_payload(options, object_key)
+    if options[:tenants]
+      #params['tenants'] = options[:tenants]
+      params['tenants'] = options[:tenants].collect do |val|
+        if val.to_s =~ /\A\d{1,}\Z/
+          val.to_i
+        else
+          # todo: use /api/options/allTenants to avoid permission errors here..
+          record = find_by_name_or_id(:account, val)
+          if record.nil?
+            exit 1 #return 1, "Tenant not found by '#{val}'"
+          else 
+            record['id']
+          end
+        end
+      end
+    end
+    payload.deep_merge!({object_key => params})
+    if payload.empty? || payload[object_key].empty?
+      raise_command_error "Specify at least one option to update.\n#{optparse}"
+    end
+    # make request
+    @integrations_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @integrations_interface.dry.update_inventory(integration['id'], integration_inventory['id'], payload)
+      return
+    end
+    json_response = @integrations_interface.update_inventory(integration['id'], integration_inventory['id'], payload)
+    integration_inventory = json_response[object_key]
+    render_response(json_response, options, object_key) do
+      print_green_success "Updated integration inventory #{integration_inventory['name']}"
+      # return _get_inventory(integration, integration_inventory["id"], {}, options)
+    end
+    return 0, nil
+  end
+
   private
 
   def format_integration_type(integration)
@@ -999,7 +1164,7 @@ EOT
       return json_response[integration_object_key]
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404
-        print_red_alert "integration not found by id '#{id}'"
+        print_red_alert "Integration not found by id '#{id}'"
       else
         raise e
       end
@@ -1010,7 +1175,7 @@ EOT
     json_response = @integrations_interface.list({name: name.to_s})
     integrations = json_response[integration_list_key]
     if integrations.empty?
-      print_red_alert "integration not found by name '#{name}'"
+      print_red_alert "Integration not found by name '#{name}'"
       return nil
     elsif integrations.size > 1
       print_red_alert "#{integrations.size} integrations found by name '#{name}'"
@@ -1075,7 +1240,7 @@ EOT
       return json_response[integration_object_key]
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404
-        print_red_alert "integration not found by id '#{id}'"
+        print_red_alert "Integration not found by id '#{id}'"
       else
         raise e
       end
@@ -1086,7 +1251,7 @@ EOT
     json_response = @integration_types_interface.list(params.merge({name: name.to_s}))
     integration_types = json_response[integration_type_list_key]
     if integration_types.empty?
-      print_red_alert "integration type not found by name '#{name}'"
+      print_red_alert "Integration type not found by name '#{name}'"
       return nil
     elsif integration_types.size > 1
       print_red_alert "#{integration_types.size} integration types found by name '#{name}'"
@@ -1196,4 +1361,50 @@ EOT
     end
   end
 
+  def integration_inventory_object_key
+    'inventory'
+  end
+
+  def integration_inventory_list_key
+    'inventory'
+  end
+
+  def find_integration_inventory_by_name_or_id(integration_id, val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_integration_inventory_by_id(integration_id, val)
+    else
+      return find_integration_inventory_by_name(integration_id, val)
+    end
+  end
+
+  def find_integration_inventory_by_id(integration_id, id)
+    begin
+      json_response = @integrations_interface.get_inventory(integration_id, id.to_i)
+      return json_response[integration_inventory_object_key]
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Inventory not found by id '#{id}'"
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_integration_inventory_by_name(integration_id, name)
+    json_response = @integrations_interface.list_inventory(integration_id, {name: name.to_s})
+    integration_inventory = json_response[integration_inventory_list_key]
+    if integration_inventory.empty?
+      print_red_alert "Inventory not found by name '#{name}'"
+      return nil
+    elsif integration_inventory.size > 1
+      print_red_alert "#{integration_inventory.size} inventory found by name '#{name}'"
+      puts_error as_pretty_table(integration_inventory, [:id, :name], {color:red})
+      print_red_alert "Try using ID instead"
+      print reset,"\n"
+      return nil
+    else
+      return integration_inventory[0]
+    end
+  end
+
 end