hammer_cli_csv 0.0.4 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmZkZjQ0Zjg5NmI0MDZkNzExZTI5ZGM1MWE2NzA2MjAzMGZiMWRlYw==
+    NWRiMTE4MzU5Y2ZmMTI3NDM2MGQ4OWZhNWM5M2RiODIyYmI4OWMyOQ==
   data.tar.gz: !binary |-
-    MWYyZWY2MWQxNTMwNWM0ODBkN2I3Y2Q0ZmQzNmJmZTRiZTgwZTEwMw==
+    ZDc0MTdjMjliZDk4NTMyODZhNmFkYjhjN2M1NmM2OGY4NTlkMDczNw==
 SHA512:
   metadata.gz: !binary |-
-    ZGQxN2E3Mjg4MzRiN2Y2Y2VhNGY3NDhjZDI3YTkwMjU3MGUxMzQ2ODBkNmE4
-    YjFjNTUwMWI4NmIyNmFiMzE0NjdjYjVhZmM3NTE1MWZlNDMxNzYzNjZlYmJh
-    MzI0YWJlMDE5MTViOTEyOTIxOGI3NDAzMDQ1ZjI5OGJmODA4M2U=
+    YzIzNzhkYjE5OWJmZjQyNGRkZDJhNTExY2I0YWYxMWE5NWI2YWIxODA1MjIx
+    ODkwNDNiYWM5NjczZjY3NTlmMzlhNTJkN2ExOTllNmQ3Y2MxNWY0OWVmYTE4
+    ZTY3YWEwOGFkNmYzMjJlNTMyYjFiZjI0NGY2ZDk4YjA1NTQ3YzQ=
   data.tar.gz: !binary |-
-    NzIzZGE4OTg1NmE1ZDc0NjFiYjgzZjExZmQ1ODdkZmM2YmJlNGRhMmExODQ4
-    MWNhYWQ3MGI3NzIzMzQzZmVkYWM1ODAxYWZiODI3ZDAyNThlNWY4MDNhYmJl
-    OGZhNjQzMzU2ZDZjY2I2MTRiNWQxOWNiYmRjOTU3ZWNmZjU2Yzk=
+    ZWM4ODcwZTdmOGE2OTVkYTgyOWYxMzAxODI3ZmRjYTVjZmFmMGFjYzg4OWUw
+    ZWI4YmMzYmRhNTg1MDI1OWVkOTcwMTk4YjVkM2Y5N2NkOWUzNWY1MTRjMzlk
+    NDBmMmUxNGFlMTVjY2ViMDA5OTgxNTEyY2RkNzVhMzg1YjIzNDY=

data/lib/hammer_cli_csv/base.rb

@@ -56,19 +56,19 @@ module HammerCLICsv
 
       @server_status = check_server_status
 
-      unless @server_status['release'] == 'Headpin'
+      if @server_status['release'] == 'Headpin'
+        @headpin = HeadpinApi.new({
+                                    :server => server,
+                                    :username => username,
+                                    :password => password
+                                  })
+      else
         @api = ApipieBindings::API.new({
                                          :uri => server,
                                          :username => username,
                                          :password => password,
                                          :api_version => 2
                                        })
-      else
-        @headpin = HeadpinApi.new({
-                                    :server => server,
-                                    :username => username,
-                                    :password => password
-                                  })
       end
 
       option_csv_export? ? export : import
@@ -81,9 +81,10 @@ module HammerCLICsv
       password = option_password || HammerCLI::Settings.get(:csv, :password)
       url = "#{server}/api/status"
       uri = URI(url)
-      server_status = Net::HTTP.start(uri.host, uri.port,
-                               :use_ssl => uri.scheme == 'https',
-                               :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
+      nethttp = Net::HTTP.new(uri.host, uri.port)
+      nethttp.use_ssl = uri.scheme == 'https'
+      nethttp.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      server_status = nethttp.start do |http|
         request = Net::HTTP::Get.new uri.request_uri
         request.basic_auth(username, password)
         response = http.request(request)

data/lib/hammer_cli_csv/content_hosts.rb

@@ -58,7 +58,7 @@ module HammerCLICsv
         CSV.open(option_csv_file || '/dev/stdout', 'wb', {:force_quotes => false}) do |csv|
           csv << [NAME, COUNT, ORGANIZATION, ENVIRONMENT, CONTENTVIEW, HOSTCOLLECTIONS, VIRTUAL, HOST,
                   OPERATINGSYSTEM, ARCHITECTURE, SOCKETS, RAM, CORES, SLA, PRODUCTS, SUBSCRIPTIONS]
-          if option_sam?
+          if @server_status['release'] == 'Headpin'
             export_sam csv
           else
             export_foretello csv
@@ -68,51 +68,19 @@ module HammerCLICsv
 
       def export_sam(csv)
         guests_host = {}
+        system_ids = []
 
-        server = option_server || HammerCLI::Settings.get(:csv, :host)
-        username = option_username || HammerCLI::Settings.get(:csv, :username)
-        password = option_password || HammerCLI::Settings.get(:csv, :password)
-        url = "#{server}/api/systems?organization_id=satellite-1"
-        uri = URI(url)
-        system_ids = Net::HTTP.start(uri.host, uri.port,
-                                     :use_ssl => uri.scheme == 'https',
-                                     :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
-          request = Net::HTTP::Get.new uri.request_uri
-          request.basic_auth(username, password)
-          response = http.request(request)
-
-          JSON.parse(response.body).collect do |system|
+        @headpin.get(:organizations).each do |organization|
+          #url = "#{server}/api/systems?organization_id=satellite-1"
+          system_ids = @headpin.get("organizations/#{organization['label']}/systems").collect do |system|
             system['guests'].each { |guest| guests_host[guest['uuid']] = system['name'] }
             system['uuid']
           end
         end
 
-        #system_ids = ['327bf5cc-5498-4927-aa27-39b1503edf58', 'eeb6de95-afaf-4b14-9f92-e845ff269ccb']
-
         system_ids.each do |system_id|
-          url = "#{server}/api/systems/#{system_id}"
-          uri = URI(url)
-          system = Net::HTTP.start(uri.host, uri.port,
-                                  :use_ssl => uri.scheme == 'https',
-                                  :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
-            request = Net::HTTP::Get.new uri.request_uri
-            request.basic_auth(username, password)
-            response = http.request(request)
-
-            JSON.parse(response.body)
-          end
-
-          url = "#{server}/api/systems/#{system_id}/subscriptions"
-          uri = URI(url)
-          system_subscriptions = Net::HTTP.start(uri.host, uri.port,
-                                                 :use_ssl => uri.scheme == 'https',
-                                                 :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
-            request = Net::HTTP::Get.new uri.request_uri
-            request.basic_auth(username, password)
-            response = http.request(request)
-
-            JSON.parse(response.body)['entitlements']
-          end
+          system = @headpin.get("systems/#{system_id}")
+          system_subscriptions = @headpin.get("systems/#{system_id}/subscriptions")['entitlements']
 
           name = system['name']
           count = 1

data/lib/hammer_cli_csv/headpin_api.rb

@@ -22,14 +22,16 @@ module HammerCLICsv
     def get(name)
       url = "#{@server}/api/#{name}"
       uri = URI(url)
-      Net::HTTP.start(uri.host, uri.port,
-                      :use_ssl => uri.scheme == 'https',
-                      :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
+      nethttp = Net::HTTP.new(uri.host, uri.port)
+      nethttp.use_ssl = uri.scheme == 'https'
+      nethttp.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      results = nethttp.start do |http|
         request = Net::HTTP::Get.new uri.request_uri
         request.basic_auth(@username, @password)
         response = http.request(request)
-        return JSON.parse(response.body)
+        JSON.parse(response.body)
       end
+      results
     end
 
     def environment(id)

data/lib/hammer_cli_csv/version.rb

@@ -11,6 +11,6 @@
 
 module HammerCLICsv
   def self.version
-    @version ||= Gem::Version.new('0.0.4')
+    @version ||= Gem::Version.new('0.0.6')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_csv
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Tom McKay