hammer_cli_csv 1.0.1 → 1.0.2

data/lib/hammer_cli_csv/provisioning_templates.rb

@@ -1,22 +1,9 @@
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module HammerCLICsv
   class CsvCommand
     class ProvisioningTemplatesCommand < BaseCommand
       command_name 'provisioning-templates'
       desc         'import or export provisioning templates'
 
-      option %w(--organization), 'ORGANIZATION', 'Only process organization matching this name'
-
       ORGANIZATIONS = 'Organizations'
       LOCATIONS = 'Locations'
       OPERATINGSYSTEMS = 'Operating Systems'
@@ -25,8 +12,8 @@ module HammerCLICsv
       TEMPLATE = 'Template'
 
       def export
-        CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
-          csv << [NAME, COUNT, ORGANIZATIONS, LOCATIONS, OPERATINGSYSTEMS, ASSOCIATIONS, KIND, TEMPLATE]
+        CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
+          csv << [NAME, ORGANIZATIONS, LOCATIONS, OPERATINGSYSTEMS, ASSOCIATIONS, KIND, TEMPLATE]
           @api.resource(:config_templates).call(:index, {
               :per_page => 999999
           })['results'].each do |template_id|
@@ -34,7 +21,6 @@ module HammerCLICsv
             next if template['locked']
             next unless option_organization.nil? || template['organizations'].detect { |org| org['name'] == option_organization }
             name = template['name']
-            count = 1
             kind = template['snippet'] ? 'snippet' : template['template_kind_name']
             organizations = export_column(template, 'organizations', 'name')
             locations = export_column(template, 'locations', 'name')
@@ -43,7 +29,7 @@ module HammerCLICsv
             # http://projects.theforeman.org/issues/10293
             associations = export_associations(template)
             unless name == 'Boot disk iPXE - generic host' || name == 'Boot disk iPXE - host'
-              csv << [name, count, organizations, locations, operatingsystems, associations, kind, template['template']]
+              csv << [name, organizations, locations, operatingsystems, associations, kind, template['template']]
             end
           end
         end
@@ -78,7 +64,7 @@ module HammerCLICsv
           foreman_operatingsystem(:name => operatingsystem)
         end
 
-        line[COUNT].to_i.times do |number|
+        count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
           if !@existing.include? name
             print _("Creating provisioning template '%{name}'...") % {:name => name } if option_verbose?

data/lib/hammer_cli_csv/puppet_environments.rb

@@ -1,30 +1,3 @@
-# Copyright 2013-2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-#
-# -= Environments CSV =-
-#
-# Columns
-#   Name
-#     - Environment name
-#     - May contain '%d' which will be replaced with current iteration number of Count
-#     - eg. "os%d" -> "os1"
-#   Count
-#     - Number of times to iterate on this line of the CSV file
-#
-
-require 'hammer_cli'
-require 'json'
-require 'csv'
-
 module HammerCLICsv
   class CsvCommand
     class PuppetEnvironmentsCommand < BaseCommand
@@ -32,15 +5,17 @@ module HammerCLICsv
       desc         'import or export puppet environments'
 
       ORGANIZATIONS = 'Organizations'
+      LOCATIONS = 'Locations'
 
       def export
-        CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
-          csv << [NAME, COUNT, ORGANIZATIONS]
+        CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
+          csv << [NAME, ORGANIZATIONS, LOCATIONS]
           @api.resource(:environments).call(:index, {:per_page => 999999})['results'].each do |environment|
+            environment = @api.resource(:environments).call(:show, {:id => environment['id']})
             name = environment['name']
-            count = 1
-            csv << [name, count]
-            raise 'TODO: organizations'
+            organizations = export_column(environment, 'organizations', 'name')
+            locations = export_column(environment, 'locations', 'name')
+            csv << [name, organizations, locations]
           end
         end
       end
@@ -57,45 +32,47 @@ module HammerCLICsv
       end
 
       def create_environments_from_csv(line)
-        line[COUNT].to_i.times do |number|
+        organizations = collect_column(line[ORGANIZATIONS]) do |organization|
+          foreman_organization(:name => organization)
+        end
+        locations = collect_column(line[LOCATIONS]) do |location|
+          foreman_location(:name => location)
+        end
+
+        count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
           if !@existing.include? name
             print "Creating environment '#{name}'..." if option_verbose?
             id = @api.resource(:environments).call(:create, {
                                              'environment' => {
-                                               'name' => name
+                                               'name' => name,
+                                               'organization_ids' => organizations
                                              }
                                            })['id']
           else
             print "Updating environment '#{name}'..." if option_verbose?
-            id = @api.resource(:environments).call(:update, {
-                                             'id' => @existing[name],
-                                             'environment' => {
-                                               'name' => name
-                                             }
-                                           })['environment']['id']
-          end
 
-          # Update associated resources
-          # TODO: Bug #4738: organization json does not include puppet environments
-          #       http://projects.theforeman.org/issues/4738#change-15319
-          #       Update below to match style of domains
-          organization_ids = CSV.parse_line(line[ORGANIZATIONS]).collect do |organization|
-            foreman_organization(:name => organization)
-          end
-          organization_ids += @api.resource(:environments).call(:show, {'id' => id})['organizations'].collect do |organization|
-            organization['id']
-          end
-          organization_ids.uniq!
+            environment = @api.resource(:environments).call(:show, {'id' => @existing[name]})
+            environment['organizations'].collect do |organization|
+              organizations << organization['id']
+            end
+            organizations.uniq!
+            environment['locations'].collect do |location|
+              locations << location['id']
+            end
+            locations.uniq!
 
-          @api.resource(:environments).call(:update, {
-                                              'id' => id,
-                                              'environment' => {
-                                                'organization_ids' => organization_ids
-                                              }
-                                            })
+            @api.resource(:environments).call(:update, {
+                                         'id' => @existing[name],
+                                         'environment' => {
+                                           'name' => name,
+                                           'organization_ids' => organizations,
+                                           'location_ids' => locations
+                                         }
+                                       })
+          end
 
-          print "done\n" if option_verbose?
+          puts "done" if option_verbose?
         end
       rescue RuntimeError => e
         raise "#{e}\n       #{line}"

data/lib/hammer_cli_csv/puppet_facts.rb

@@ -1,82 +1,60 @@
-# Copyright 2013-2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-#
-# -= Puppet Facts CSV =-
-#
-# Columns
-#   Name
-#     - Host name
-#     - May contain '%d' which will be replaced with current iteration number of Count
-#     - eg. "os%d" -> "os1"
-#   Count
-#     - Number of times to iterate on this line of the CSV file
-#   <Fact Key names>
-#     - May contain '%d' which will be replaced with current iteration number of Count
-#
-
-require 'hammer_cli'
-require 'json'
-require 'csv'
-
 module HammerCLICsv
   class CsvCommand
     class PuppetFactsCommand < BaseCommand
       command_name 'puppet-facts'
       desc         'import or export puppet facts'
 
+      ORGANIZATION = 'Organization'
+      FACTS = 'Puppet Facts'
+
+      SEPARATOR = ' = '
+
       def export
-        CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
-          headers = [NAME, COUNT]
-          # Extracted facts are always based upon the first host found, otherwise this would be an intensive
-          # method to gather all the possible column names
-          any_host = @api.resource(:hosts).call(:index, {:per_page => 1})['results'][0]
-          headers += @api.resource(:puppetfactss).call(:index, {
-                                                         'host_id' => any_host['name'],
-                                                         'per_page' => 999999
-                                                       })['results'][any_host['name']].keys
-          csv << headers
+        CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => true}) do |csv|
+          csv << [NAME, ORGANIZATION, FACTS]
 
-          @api.resource(:hosts).call(:index, {:per_page => 999999})['results'].each do |host|
-            line = [host['name'], 1]
-            facts = @api.resource(:puppetfactss).call(:index, {'host_id' => host['name'], 'per_page' => 999999})[host['name']]
+          search_options = {:per_page => 999999}
+          search_options['search'] = "organization=\"#{option_organization}\"" if option_organization
+          @api.resource(:hosts).call(:index, search_options)['results'].each do |host|
+            facts = @api.resource(:fact_values).call(:index, {
+                                                               'search' => "host = #{host['name']}",
+                                                               'per_page' => 999999
+                                                             })['results']
+            facts = @api.resource(:fact_values).call(:index, {
+                                                               'search' => "host = #{host['name']}",
+                                                               'per_page' => 999999
+                                                             })['results'][host['name']]
             facts ||= {}
-            headers[2..-1].each do |fact_name|
-              line << facts[fact_name] || ''
+
+            values = CSV.generate do |column|
+              column << facts.collect do |fact_name, fact_value|
+                "#{fact_name}#{SEPARATOR}#{fact_value}"
+              end
             end
-            csv << line
+            values.delete!("\n")
+
+            csv << [host['name'], host['organization_name'], values]
           end
         end
       end
 
       def import
-        @headers = nil
-
         thread_import(true) do |line|
           create_puppetfacts_from_csv(line)
         end
       end
 
       def create_puppetfacts_from_csv(line)
-        if @headers.nil?
-          @headers = line
-          return
-        end
+        return if option_organization && line[ORGANIZATION] != option_organization
 
-        line[COUNT].to_i.times do |number|
+        count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
           print "Updating puppetfacts '#{name}'..." if option_verbose?
-          facts = line.to_hash
-          facts.delete(NAME)
-          facts.delete(COUNT)
+          facts = {}
+          collect_column(line[FACTS]) do |fact|
+            (fact_name, fact_value) = fact.split(SEPARATOR)
+            facts[fact_name] = fact_value
+          end
 
           # Namify the values if the host name was namified
           if name != line[NAME]
@@ -86,9 +64,9 @@ module HammerCLICsv
           end
 
           @api.resource(:hosts).call(:facts, {
-                              'name' => name,
-                              'facts' => facts
-                            })
+                                               'name' => name,
+                                               'facts' => facts
+                                             })
           print "done\n" if option_verbose?
         end
       rescue RuntimeError => e

data/lib/hammer_cli_csv/puppet_reports.rb

@@ -1,36 +1,3 @@
-# Copyright 2013-2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-#
-# -= Systems CSV =-
-#
-# Columns
-#   Name
-#     - System name
-#     - May contain '%d' which will be replaced with current iteration number of Count
-#     - eg. "os%d" -> "os1"
-#   Count
-#     - Number of times to iterate on this line of the CSV file
-#   MAC Address
-#     - MAC address
-#     - May contain '%d' which will be replaced with current iteration number of Count
-#     - eg. "FF:FF:FF:FF:FF:%02x" -> "FF:FF:FF:FF:FF:0A"
-#     - Warning: be sure to keep count below 255 or MAC hex will exceed limit
-#
-
-require 'hammer_cli'
-require 'json'
-require 'csv'
-require 'uri'
-
 module HammerCLICsv
   class CsvCommand
     class PuppetReportsCommand < BaseCommand
@@ -53,8 +20,8 @@ module HammerCLICsv
       SUBSCRIPTIONS = 'Subscriptions'
 
       def export
-        CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => false}) do |csv|
-          csv << [NAME, COUNT, ORGANIZATION, ENVIRONMENT, CONTENTVIEW, SYSTEMGROUPS, VIRTUAL, HOST,
+        CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => false}) do |csv|
+          csv << [NAME, ORGANIZATION, ENVIRONMENT, CONTENTVIEW, SYSTEMGROUPS, VIRTUAL, HOST,
                   OPERATINGSYSTEM, ARCHITECTURE, SOCKETS, RAM, CORES, SLA, PRODUCTS, SUBSCRIPTIONS]
           @api.resource(:organizations).call(:index, {
               :per_page => 999999
@@ -69,7 +36,6 @@ module HammerCLICsv
               })
 
               name = system['name']
-              count = 1
               organization_label = organization['label']
               environment = system['environment']['label']
               contentview = system['content_view']['name']
@@ -102,7 +68,7 @@ module HammerCLICsv
                 end
               end
               subscriptions.delete!("\n")
-              csv << [name, count, organization_label, environment, contentview, hostcollections, virtual, host,
+              csv << [name, organization_label, environment, contentview, hostcollections, virtual, host,
                       operatingsystem, architecture, sockets, ram, cores, sla, products, subscriptions]
             end
           end
@@ -138,7 +104,7 @@ module HammerCLICsv
           end
         end
 
-        line[COUNT].to_i.times do |number|
+        count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
 
           # TODO: w/ @daviddavis p-r

data/lib/hammer_cli_csv/reports.rb

@@ -1,14 +1,3 @@
-# Copyright 2013-2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module HammerCLICsv
   class CsvCommand
     class ReportsCommand < BaseCommand
@@ -25,12 +14,12 @@ module HammerCLICsv
       METRICS = 'Metrics'
 
       def export
-        CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => false}) do |csv|
-          csv << [NAME, COUNT]
+        CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => false}) do |csv|
+          csv << [NAME]
           @api.resource(:reports).call(:index, {
               'per_page' => 999999
           })['results'].each do |report|
-            csv << [report['host_name'], 1, report['metrics'].to_json]
+            csv << [report['host_name'], report['metrics'].to_json]
           end
         end
 
@@ -51,7 +40,7 @@ module HammerCLICsv
       end
 
       def create_reports_from_csv(line)
-        line[COUNT].to_i.times do |number|
+        count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
 
           if !@existing_reports[name]

data/lib/hammer_cli_csv/roles.rb

@@ -1,14 +1,3 @@
-# Copyright 2013-2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module HammerCLICsv
   class CsvCommand
     class RolesCommand < BaseCommand
@@ -22,8 +11,8 @@ module HammerCLICsv
       LOCATIONS = 'Locations'
 
       def export
-        CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => false}) do |csv|
-          csv << [NAME, COUNT, RESOURCE, SEARCH, PERMISSIONS, ORGANIZATIONS, LOCATIONS]
+        CSV.open(option_file || '/dev/stdout', 'wb', {:force_quotes => false}) do |csv|
+          csv << [NAME, RESOURCE, SEARCH, PERMISSIONS, ORGANIZATIONS, LOCATIONS]
           @api.resource(:roles).call(:index, {'per_page' => 999999})['results'].each do |role|
             @api.resource(:filters).call(:index, {
                 'per_page' => 999999,
@@ -34,7 +23,7 @@ module HammerCLICsv
               permissions = export_column(filter, 'permissions', 'name')
               organizations = export_column(filter, 'organizations', 'name')
               locations = export_column(filter, 'locations', 'name')
-              csv << [role['name'], 1, filter['resource_type'], filter['search'] || '', permissions, organizations, locations]
+              csv << [role['name'], filter['resource_type'], filter['search'] || '', permissions, organizations, locations]
             end
           end
         end
@@ -70,7 +59,7 @@ module HammerCLICsv
           foreman_location(:name => location)
         end
 
-        line[COUNT].to_i.times do |number|
+        count(line[COUNT]).times do |number|
           name = namify(line[NAME], number)
           search = line[SEARCH] ? namify(line[SEARCH], number) : nil