hammer_cli_csv 2.0.0 → 2.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    N2ExODdkOTg4YzFhYmNhZjIyNDdkNTZjMjFjOGVjYjliOWM0OTA0Mw==
-  data.tar.gz: !binary |-
-    Njg1YmE0ZTMzMzE0NjlkM2E2NWMxMDI2N2QwM2Q5NDdmODViYzU2YQ==
+SHA1:
+  metadata.gz: e0f784cf2623ea6218aa82c967c03a4df23f5c79
+  data.tar.gz: 3ff43bcc04983f69ec6f72da581e8fbceb70feee
 SHA512:
-  metadata.gz: !binary |-
-    NzZlYzM4NWMxZGMzYzNlNzljYWZmNWQyZmE3NzQ2OWJjMWY0MjNjMGEzMzdi
-    NTVlM2NhZmM1ZjE4M2YzZWMxYzQ5M2E1OTZjMWRlNDE2MGUyYmE5YWU0NjYy
-    ODJmNDMyMWNiYzk4NTEzODk4MjkzMjZlNjE1MDNiOThhNDRkZGM=
-  data.tar.gz: !binary |-
-    ZDNhNzIwOWU1N2Y0NWVhYjI5Y2Y1MTgzMzY0NDM2MzZiNjVkNDY3MDk1YzQ1
-    OWE4MDY2YjkzOGJjYTZlOWNlM2U3ZTE5MzdlMWU2ZTY4YTk2ZWEwNWNjY2Y2
-    Mzc3MTMzZTEwNWU4NjcxMzBmOGJiMjA5M2VhYWYyNWRmY2RkNjA=
+  metadata.gz: c51c13c2d41f6c78f0ce02d68d921e10ae694617354fc3d80049404cdb9ef222fac36a00bd76ad7b06fc2649aa4b0065878bb0abfbf0522482d618539fe57e7a
+  data.tar.gz: 49761b76cf989b896339674f0046d676a06d74bf774c8a0d7c50192699d36ad565866137f6d3e603ddb42da5f0a8616ee65cae278c0b5c33ea1ad170e49c7e48

data/config/cli_config.yml

@@ -1,38 +1,23 @@
+# User interface related settings
 :ui:
-  :interactive: true
-  :per_page: 20
-  :history_file: './log/history'
+  :interactive: false
+  :history_file: 'log/history'
 
-:watch_plain: true # enable/disable color output of logger in Clamp commands
+:watch_plain: true
 
-:log_dir: './log'
+:reload_cache: false
+
+:log_dir: 'log'
 :log_level: 'error'
-:log_api_calls: false
-:log_size: 5 # MB
 
-:request_timeout: 120
+# Mark translated strings with X characters (for developers)
+#:mark_translated: false
 
 :foreman:
   :enable_module: true
-  :host:          'http://katello:3000'
-  :username:      'admin'
-  :password:      'changeme'
 
 :katello:
   :enable_module: true
 
 :csv:
   :enable_module: true
-  :host:          'http://katello:3000'
-  :username:      'admin'
-  :password:      'changeme'
-  :products_sync: false
-
-:gutterball:
-  :enable_module: true
-
-:foreman_remote_execution:
-  :enable_module: true
-
-:import:
-  :enable_module: true

data/lib/hammer_cli_csv/activation_keys.rb

@@ -1,9 +1,17 @@
 module HammerCLICsv
   class CsvCommand
     class ActivationKeysCommand < BaseCommand
+      include ::HammerCLICsv::Utils::Subscriptions
+
       command_name 'activation-keys'
       desc         _('import or export activation keys')
 
+      def self.supported?
+        true
+      end
+
+      option %w(--itemized-subscriptions), :flag, _('Export one subscription per row, only process update subscriptions on import')
+
       ORGANIZATION = 'Organization'
       DESCRIPTION = 'Description'
       LIMIT = 'Limit'
@@ -13,46 +21,71 @@ module HammerCLICsv
       SERVICELEVEL = "Service Level"
       RELEASEVER = "Release Version"
       AUTOATTACH = "Auto-Attach"
-      SUBSCRIPTIONS = 'Subscriptions'
-
-      def export
-        CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => false}) do |csv|
-          csv << [NAME, ORGANIZATION, DESCRIPTION, LIMIT, ENVIRONMENT, CONTENTVIEW,
-                  HOSTCOLLECTIONS, AUTOATTACH, SERVICELEVEL, RELEASEVER, SUBSCRIPTIONS]
-          @api.resource(:organizations).call(:index, {
-              :per_page => 999999
-          })['results'].each do |organization|
-            next if option_organization && organization['name'] != option_organization
-
-            @api.resource(:activation_keys).call(:index, {
-                'per_page' => 999999,
-                'organization_id' => organization['id']
-            })['results'].each do |activationkey|
-              name = namify(activationkey['name'])
-              count = 1
-              description = activationkey['description']
-              limit = activationkey['unlimited_content_hosts'] ? 'Unlimited' : activationkey['max_content_hosts']
-              environment = activationkey['environment']['label']
-              contentview = activationkey['content_view']['name']
-              hostcollections = export_column(activationkey, 'host_collections', 'name')
-              autoattach = activationkey['auto_attach'] ? 'Yes' : 'No'
-              servicelevel = activationkey['service_level']
-              releasever = activationkey['release_version']
-              subscriptions = CSV.generate do |column|
-                column << @api.resource(:subscriptions).call(:index, {
-                              'organization_id' => organization['id'],
-                              'activation_key_id' => activationkey['id']
-                          })['results'].collect do |subscription|
-                  amount = subscription['amount'] == 0 ? 'Automatic' : subscription['amount']
-                  sku = subscription['product_id'].match(/\A[0-9]/) ? 'Custom' : subscription['product_id']
-                  "#{amount}|#{sku}|#{subscription['product_name']}"
-                end
-              end
-              subscriptions.delete!("\n")
-              csv << [name, count, organization['name'], description, limit, environment, contentview,
-                      hostcollections, servicelevel, releasever, autoattach, subscriptions]
+
+      def export(csv)
+        if option_itemized_subscriptions?
+          export_itemized_subscriptions csv
+        else
+          export_all csv
+        end
+      end
+
+      def export_itemized_subscriptions(csv)
+        csv << shared_headers + [Utils::Subscriptions::SUBS_NAME, Utils::Subscriptions::SUBS_TYPE,
+                                 Utils::Subscriptions::SUBS_QUANTITY, Utils::Subscriptions::SUBS_SKU,
+                                 Utils::Subscriptions::SUBS_CONTRACT, Utils::Subscriptions::SUBS_ACCOUNT,
+                                 Utils::Subscriptions::SUBS_START, Utils::Subscriptions::SUBS_END]
+        iterate_activationkeys(csv) do |activationkey|
+          columns = shared_columns(activationkey)
+          @api.resource(:subscriptions).call(:index, {
+              'organization_id' => activationkey['organization']['id'],
+              'activation_key_id' => activationkey['id']
+          })['results'].collect do |subscription|
+            subscription_type = subscription['product_id'].to_i == 0 ? 'Red Hat' : 'Custom'
+            subscription_type += ' Guest' if subscription['type'] == 'STACK_DERIVED'
+            subscription_type += ' Temporary' if subscription['type'] == 'UNMAPPED_GUEST'
+            amount = (subscription['quantity_attached'].nil? || subscription['quantity_attached'] < 1) ? 'Automatic' : subscription['quantity_attached']
+            csv << columns +
+              [subscription['product_name'], subscription_type, amount,
+               subscription['product_id'], subscription['contract_number'], subscription['account_number'],
+               DateTime.parse(subscription['start_date']),
+               DateTime.parse(subscription['end_date'])]
+          end
+        end
+      end
+
+      def export_all(csv)
+        csv << shared_headers + [SUBSCRIPTIONS]
+        iterate_activationkeys(csv) do |activationkey|
+          subscriptions = CSV.generate do |column|
+            column << @api.resource(:subscriptions).call(:index, {
+                          'organization_id' => activationkey['organization']['id'],
+                          'activation_key_id' => activationkey['id']
+                      })['results'].collect do |subscription|
+              amount = (subscription['quantity_attached'].nil? || subscription['quantity_attached'] < 1) ? 'Automatic' : subscription['quantity_attached']
+              "#{amount}"\
+              "|#{subscription['product_id']}"\
+              "|#{subscription['product_name']}"\
+              "|#{subscription['contract_number']}|#{subscription['account_number']}"
             end
           end
+          subscriptions.delete!("\n")
+          csv << shared_columns(activationkey) + [subscriptions]
+        end
+      end
+
+      def iterate_activationkeys(csv)
+        @api.resource(:organizations).call(:index, {
+            :per_page => 999999
+        })['results'].each do |organization|
+          next if option_organization && organization['name'] != option_organization
+
+          @api.resource(:activation_keys).call(:index, {
+              'per_page' => 999999,
+              'organization_id' => organization['id']
+          })['results'].each do |activationkey|
+            yield activationkey
+          end
         end
       end
 
@@ -60,55 +93,64 @@ module HammerCLICsv
         @existing = {}
 
         thread_import do |line|
-          create_activationkeys_from_csv(line)
+          create_from_csv(line)
         end
       end
 
-      def create_activationkeys_from_csv(line)
+      def create_from_csv(line)
         return if option_organization && line[ORGANIZATION] != option_organization
 
-        if !@existing[line[ORGANIZATION]]
-          @existing[line[ORGANIZATION]] = {}
-          @api.resource(:activation_keys).call(:index, {
-              'per_page' => 999999,
-              'organization_id' => foreman_organization(:name => line[ORGANIZATION])
-          })['results'].each do |activationkey|
-            @existing[line[ORGANIZATION]][activationkey['name']] = activationkey['id'] if activationkey
-          end
-        end
+        update_existing(line)
 
         count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
 
-          params = {
-                     'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
-                     'name' => name,
-                     'environment_id' => lifecycle_environment(line[ORGANIZATION],
-                                                               :name => line[ENVIRONMENT]),
-                     'content_view_id' => katello_contentview(line[ORGANIZATION],
-                                                              :name => line[CONTENTVIEW]),
-                     'description' => line[DESCRIPTION],
-                     'unlimited_content_hosts' => (line[LIMIT] == 'Unlimited') ? true : false,
-                     'max_content_hosts' => (line[LIMIT] == 'Unlimited') ? nil : line[LIMIT].to_i
-                   }
-          params['auto_attach'] = (line[AUTOATTACH] == 'Yes' ? true : false) if params['auto_attach']
-          params['service_level'] = line[SERVICELEVEL].nil? || line[SERVICELEVEL].empty? ? nil : line[SERVICELEVEL]
-          params['release_version'] = line[RELEASEVER].nil? || line[RELEASEVER].empty? ? nil : line[RELEASEVER]
-          if !@existing[line[ORGANIZATION]].include? name
-            print _("Creating activation key '%{name}'...") % {:name => name} if option_verbose?
-            activationkey = @api.resource(:activation_keys).call(:create, params)
-            @existing[line[ORGANIZATION]][activationkey['name']] = activationkey['id']
+          if option_itemized_subscriptions?
+            update_itemized_subscriptions(name, line)
           else
-            print _("Updating activation key '%{name}'...") % {:name => name} if option_verbose?
-            params['id'] = @existing[line[ORGANIZATION]][name]
-            activationkey = @api.resource(:activation_keys).call(:update, params)
+            update_or_create(name, line)
           end
+        end
+      end
 
-          update_subscriptions(activationkey, line)
-          update_groups(activationkey, line)
+      def update_itemized_subscriptions(name, line)
+        raise _("Activation key '%{name}' must already exist with --itemized_subscriptions") % {:name => name} unless @existing[line[ORGANIZATION]].include? name
 
-          puts _('done') if option_verbose?
+        print(_("Updating subscriptions for activation key '%{name}'...") % {:name => name}) if option_verbose?
+        activationkey = @api.resource(:activation_keys).call(:show, {:id => @existing[line[ORGANIZATION]][name]})
+        update_subscriptions(activationkey, line, false)
+        puts _('done') if option_verbose?
+      end
+
+      def update_or_create(name, line)
+        params = {
+                   'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
+                   'name' => name,
+                   'environment_id' => lifecycle_environment(line[ORGANIZATION],
+                                                             :name => line[ENVIRONMENT]),
+                   'content_view_id' => katello_contentview(line[ORGANIZATION],
+                                                            :name => line[CONTENTVIEW]),
+                   'description' => line[DESCRIPTION],
+                   'unlimited_content_hosts' => (line[LIMIT] == 'Unlimited') ? true : false,
+                   'max_content_hosts' => (line[LIMIT] == 'Unlimited') ? nil : line[LIMIT].to_i
+                 }
+        params['auto_attach'] = (line[AUTOATTACH] == 'Yes' ? true : false) if params['auto_attach']
+        params['service_level'] = line[SERVICELEVEL].nil? || line[SERVICELEVEL].empty? ? nil : line[SERVICELEVEL]
+        params['release_version'] = line[RELEASEVER].nil? || line[RELEASEVER].empty? ? nil : line[RELEASEVER]
+        if !@existing[line[ORGANIZATION]].include? name
+          print _("Creating activation key '%{name}'...") % {:name => name} if option_verbose?
+          activationkey = @api.resource(:activation_keys).call(:create, params)
+          @existing[line[ORGANIZATION]][activationkey['name']] = activationkey['id']
+        else
+          print _("Updating activation key '%{name}'...") % {:name => name} if option_verbose?
+          params['id'] = @existing[line[ORGANIZATION]][name]
+          activationkey = @api.resource(:activation_keys).call(:update, params)
         end
+
+        update_subscriptions(activationkey, line, true)
+        update_groups(activationkey, line)
+
+        puts _('done') if option_verbose?
       end
 
       def update_groups(activationkey, line)
@@ -123,38 +165,121 @@ module HammerCLICsv
         end
       end
 
-      def update_subscriptions(activationkey, line)
-        if line[SUBSCRIPTIONS] && line[SUBSCRIPTIONS] != ''
-          subscriptions = CSV.parse_line(line[SUBSCRIPTIONS], {:skip_blanks => true}).collect do |subscription_details|
-            (amount, sku, name) = subscription_details.split('|')
-            {
-              :id => katello_subscription(line[ORGANIZATION], :name => name),
-              :quantity => (amount.nil? || amount == 'Automatic') ? 0 : amount
-            }
+      def update_subscriptions(activationkey, line, remove_existing)
+        existing_subscriptions = @api.resource(:subscriptions).call(:index, {
+            'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
+            'per_page' => 999999,
+            'activation_key_id' => activationkey['id']
+        })['results']
+        if remove_existing && existing_subscriptions.length > 0
+          existing_subscriptions.map! do |existing_subscription|
+            {:id => existing_subscription['id'], :quantity => existing_subscription['quantity_consumed']}
           end
+          @api.resource(:activation_keys).call(:remove_subscriptions, {
+            'id' => activationkey['id'],
+            'subscriptions' => existing_subscriptions
+          })
+          existing_subscriptions = []
+        end
 
-          existing_subscriptions = @api.resource(:subscriptions).call(:index, {
-              'organization_id' => foreman_organization(:name => line[ORGANIZATION]),
-              'per_page' => 999999,
-              'activation_key_id' => activationkey['id']
-          })['results']
-          if existing_subscriptions.length > 0
-            @api.resource(:activation_keys).call(:remove_subscriptions, {
-              'id' => activationkey['id'],
-              'subscriptions' => existing_subscriptions
-            })
+        if line[Utils::Subscriptions::SUBS_NAME].nil? && line[Utils::Subscriptions::SUBS_SKU].nil?
+          all_in_one_subscription(activationkey, existing_subscriptions, line)
+        else
+          single_subscription(activationkey, existing_subscriptions, line)
+        end
+      end
+
+      def single_subscription(activationkey, existing_subscriptions, line)
+        already_attached = false
+        if line[Utils::Subscriptions::SUBS_SKU]
+          already_attached = existing_subscriptions.detect do |subscription|
+            line[Utils::Subscriptions::SUBS_SKU] == subscription['product_id']
+          end
+        elsif line[Utils::Subscriptions::SUBS_NAME]
+          already_attached = existing_subscriptions.detect do |subscription|
+            line[Utils::Subscriptions::SUBS_NAME] == subscription['name']
           end
+        end
+        if already_attached
+          print _(" '%{name}' already attached...") % {:name => already_attached['name']}
+          return
+        end
 
-          @api.resource(:activation_keys).call(:add_subscriptions, {
-              'id' => activationkey['id'],
-              'subscriptions' => subscriptions
-          })
+        available_subscriptions = @api.resource(:subscriptions).call(:index, {
+                                                                       'organization_id' => activationkey['organization']['id'],
+                                                                       'activation_key_id' => activationkey['id'],
+                                                                       'available_for' => 'activation_key'
+                                                                     })['results']
+
+        matches = matches_by_sku_and_name([], line, available_subscriptions)
+        matches = matches_by_type(matches, line)
+        matches = matches_by_account(matches, line)
+        matches = matches_by_contract(matches, line)
+        matches = matches_by_quantity(matches, line)
+
+        raise _("No matching subscriptions") if matches.empty?
+
+        match = matches[0]
+        print _(" attaching '%{name}'...") % {:name => match['name']} if option_verbose?
+
+        @api.resource(:activation_keys).call(:add_subscriptions, {
+            'id' => activationkey['id'],
+            'subscriptions' => [match]
+        })
+      end
+
+      def all_in_one_subscription(activationkey, existing_subscriptions, line)
+        return if line[SUBSCRIPTIONS].nil? || line[SUBSCRIPTIONS].empty?
+
+        subscriptions = CSV.parse_line(line[SUBSCRIPTIONS], {:skip_blanks => true}).collect do |details|
+          (amount, sku, name, contract, account) = split_subscription_details(details)
+          {
+            :id => get_subscription(line[ORGANIZATION], :name => name),
+            :quantity => (amount.nil? || amount == 'Automatic') ? 0 : amount.to_i
+          }
         end
+
+        @api.resource(:activation_keys).call(:add_subscriptions, {
+                                               'id' => activationkey['id'],
+                                               'subscriptions' => subscriptions
+                                             })
       end
 
       def usage_limit(limit)
         Integer(limit) rescue -1
       end
+
+      def shared_headers
+        [NAME, ORGANIZATION, DESCRIPTION, LIMIT, ENVIRONMENT, CONTENTVIEW,
+         HOSTCOLLECTIONS, AUTOATTACH, SERVICELEVEL, RELEASEVER]
+      end
+
+      def shared_columns(activationkey)
+        name = namify(activationkey['name'])
+        organization = activationkey['organization']['name']
+        description = activationkey['description']
+        limit = activationkey['unlimited_content_hosts'] ? 'Unlimited' : activationkey['max_content_hosts']
+        environment = activationkey['environment'].nil? ? nil : activationkey['environment']['label']
+        contentview = activationkey['content_view'].nil? ? nil : activationkey['content_view']['name']
+        hostcollections = export_column(activationkey, 'host_collections', 'name')
+        autoattach = activationkey['auto_attach'] ? 'Yes' : 'No'
+        servicelevel = activationkey['service_level']
+        releasever = activationkey['release_version']
+        [name, organization, description, limit, environment, contentview, hostcollections,
+         autoattach, servicelevel, releasever]
+      end
+
+      def update_existing(line)
+        if !@existing[line[ORGANIZATION]]
+          @existing[line[ORGANIZATION]] = {}
+          @api.resource(:activation_keys).call(:index, {
+              'per_page' => 999999,
+              'organization_id' => foreman_organization(:name => line[ORGANIZATION])
+          })['results'].each do |activationkey|
+            @existing[line[ORGANIZATION]][activationkey['name']] = activationkey['id'] if activationkey
+          end
+        end
+      end
     end
   end
 end

data/lib/hammer_cli_csv/architectures.rb

@@ -6,15 +6,13 @@ module HammerCLICsv
 
       OPERATINGSYSTEMS = 'Operating Systems'
 
-      def export
-        CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
-          csv << [NAME, OPERATINGSYSTEMS]
-          @api.resource(:architectures).call(:index, {:per_page => 999999})['results'].each do |architecture|
-            architecture = @api.resource(:architectures).call(:show, {:id => architecture['id']})
-            name = architecture['name']
-            operatingsystems = export_column(architecture, 'operatingsystems', 'title')
-            csv << [name, operatingsystems]
-          end
+      def export(csv)
+        csv << [NAME, OPERATINGSYSTEMS]
+        @api.resource(:architectures).call(:index, {:per_page => 999999})['results'].each do |architecture|
+          architecture = @api.resource(:architectures).call(:show, {:id => architecture['id']})
+          name = architecture['name']
+          operatingsystems = export_column(architecture, 'operatingsystems', 'title')
+          csv << [name, operatingsystems]
         end
       end
 
@@ -56,8 +54,6 @@ module HammerCLICsv
           end
           print "done\n" if option_verbose?
         end
-      rescue RuntimeError => e
-        raise "#{e}\n       #{line}"
       end
     end
   end

data/lib/hammer_cli_csv/base.rb

@@ -12,9 +12,11 @@ module HammerCLICsv
     option %w(--threads), 'THREAD_COUNT', 'Number of threads to hammer with',
            :default => 1, :hidden => true
     option %w(--export), :flag, 'Export current data instead of importing'
-    option %w(--file), 'FILE_NAME', 'CSV file (default to /dev/stdout with --csv-export, otherwise required)'
-    option %w(--prefix), 'PREFIX', 'Prefix for all name columns'
+    option %w(--file), 'FILE_NAME', 'CSV file (default to /dev/stdout with --export, otherwise required)'
+    option %w(--prefix), 'PREFIX', 'Prefix for all name columns',
+           :hidden => true
     option %w(--organization), 'ORGANIZATION', _('Only process organization matching this name')
+    option %w(--continue-on-error), :flag, _('Continue processing even if individual resource error')
 
     option %w(--csv-file), 'FILE_NAME', 'Option --csv-file is deprecated. Use --file',
            :deprecated => "Use --file", :hidden => true,
@@ -23,10 +25,22 @@ module HammerCLICsv
            :deprecated => "Use --export", :hidden => true,
            :attribute_name => :option_export
 
-
     NAME = 'Name'
     COUNT = 'Count'
 
+    def self.supported?
+      false
+    end
+
+    def supported?
+      self.class.supported?
+    end
+
+    def help
+      print_message _('**** This command is unsupported and is provided as tech preview. ****') unless supported?
+      super
+    end
+
     def execute
       @server = (HammerCLI::Settings.settings[:_params] &&
                  HammerCLI::Settings.settings[:_params][:host]) ||
@@ -61,7 +75,19 @@ module HammerCLICsv
                                        })
       end
 
-      option_export? ? export : import
+      if option_export?
+        if option_file
+          CSV.open(option_file, 'wb', {:force_quotes => false}) do |csv|
+            export csv
+          end
+        else
+          CSV do |csv|
+            export csv
+          end
+        end
+      else
+        import
+      end
       HammerCLI::EX_OK
     end
 
@@ -129,8 +155,12 @@ module HammerCLICsv
           lines = csv[start_index...finish_index].clone
           splits << Thread.new do
             lines.each do |line|
-              if line[name_column || NAME][0] != '#'
+              next if line[name_column || NAME][0] == '#'
+              begin
                 yield line
+              rescue RuntimeError => e
+                message = "#{e}\n#{line}"
+                option_continue_on_error? ? $stderr.puts("Error: #{message}") : raise(message)
               end
             end
           end
@@ -484,6 +514,38 @@ module HammerCLICsv
       result
     end
 
+    def foreman_medium(options = {})
+      @media ||= {}
+
+      if options[:name]
+        return nil if options[:name].nil? || options[:name].empty?
+        options[:id] = @media[options[:name]]
+        if !options[:id]
+          ptable = @api.resource(:media).call(:index, {
+                                                  :per_page => 999999,
+                                                  'search' => "name=\"#{options[:name]}\""
+                                                })['results']
+          raise "Partition table '#{options[:name]}' not found" if !ptable || ptable.empty?
+          options[:id] = ptable[0]['id']
+          @media[options[:name]] = options[:id]
+        end
+        result = options[:id]
+      elsif options[:id]
+        return nil if options[:id].nil?
+        options[:name] = @media.key(options[:id])
+        if !options[:name]
+          ptable = @api.resource(:media).call(:show, {'id' => options[:id]})
+          options[:name] = ptable['name']
+          @media[options[:name]] = options[:id]
+        end
+        result = options[:name]
+      elsif !options[:name] && !options[:id]
+        result = ''
+      end
+
+      result
+    end
+
     def foreman_host(options = {})
       @query_hosts ||= {}
 
@@ -737,42 +799,6 @@ module HammerCLICsv
       result
     end
 
-    def katello_subscription(organization, options = {})
-      @subscriptions ||= {}
-      @subscriptions[organization] ||= {}
-
-      if options[:name]
-        return nil if options[:name].nil? || options[:name].empty?
-        options[:id] = @subscriptions[organization][options[:name]]
-        if !options[:id]
-          results = @api.resource(:subscriptions).call(:index, {
-              :per_page => 999999,
-              'organization_id' => foreman_organization(:name => organization),
-              'search' => "name = \"#{options[:name]}\""
-          })
-          raise "No subscriptions match '#{options[:name]}'" if results['subtotal'] == 0
-          raise "Too many subscriptions match '#{options[:name]}'" if results['subtotal'] > 1
-          subscription = results['results'][0]
-          @subscriptions[organization][options[:name]] = subscription['id']
-          options[:id] = @subscriptions[organization][options[:name]]
-          raise "Subscription '#{options[:name]}' not found" if !options[:id]
-        end
-        result = options[:id]
-      else
-        return nil if options[:id].nil?
-        options[:name] = @subscriptions.key(options[:id])
-        if !options[:name]
-          subscription = @api.resource(:subscriptions).call(:show, {'id' => options[:id]})
-          raise "Subscription '#{options[:name]}' not found" if !subscription || subscription.empty?
-          options[:name] = subscription['name']
-          @subscriptions[options[:name]] = options[:id]
-        end
-        result = options[:name]
-      end
-
-      result
-    end
-
     def katello_hostcollection(organization, options = {})
       @hostcollections ||= {}
       @hostcollections[organization] ||= {}