hammer_cli_csv 2.1.1 → 2.1.2

data/test/fixtures/vcr_cassettes/setup/setup_subscriptions/setup.yml

@@ -272,7 +272,7 @@ http_interactions:
       message: 'OK '
     headers:
       Date:
-      - Fri, 30 Sep 2016 15:40:11 GMT
+      - Wed, 12 Oct 2016 14:11:27 GMT
       Server:
       - WEBrick/1.3.1 (Ruby/2.2.4/2015-12-16)
       Foreman-Version:
@@ -288,9 +288,9 @@ http_interactions:
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 6495c008-c2e6-4030-99ca-f874d5abdce7
+      - c6e1fafa-59cb-487a-a21b-7a49f8f95d99
       X-Runtime:
-      - '0.063115'
+      - '0.081399'
       Content-Security-Policy:
       - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:;
         img-src ''self'' data: *.gravatar.com; script-src ''unsafe-eval'' ''unsafe-inline''
@@ -314,12 +314,12 @@ http_interactions:
       Content-Length:
       - '81'
       Set-Cookie:
-      - _session_id=e0bb9e4d97611f5612401cee55ba54b0; path=/; HttpOnly
+      - _session_id=85e1f5067933b4f510394dc7c372c0f5; path=/; HttpOnly
     body:
       encoding: UTF-8
       string: '{"result":"ok","status":200,"version":"1.14.0-develop","api_version":2}'
     http_version: 
-  recorded_at: Fri, 30 Sep 2016 15:40:12 GMT
+  recorded_at: Wed, 12 Oct 2016 14:11:27 GMT
 - request:
     method: get
     uri: https://admin:changeme@katello.example.com:50218/api/v2/plugins
@@ -339,7 +339,7 @@ http_interactions:
       message: 'OK '
     headers:
       Date:
-      - Fri, 30 Sep 2016 15:40:11 GMT
+      - Wed, 12 Oct 2016 14:11:27 GMT
       Server:
       - WEBrick/1.3.1 (Ruby/2.2.4/2015-12-16)
       Foreman-Version:
@@ -355,9 +355,9 @@ http_interactions:
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 68ed4e1f-8060-425b-ba07-722a30ab686a
+      - acb3bea2-835a-41ea-8933-0b14612c4d80
       X-Runtime:
-      - '0.067810'
+      - '0.069202'
       Content-Security-Policy:
       - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:;
         img-src ''self'' data: *.gravatar.com; script-src ''unsafe-eval'' ''unsafe-inline''
@@ -381,7 +381,7 @@ http_interactions:
       Content-Length:
       - '565'
       Set-Cookie:
-      - _session_id=ea8cf838ed73f23e356c7035169bced5; path=/; HttpOnly
+      - _session_id=a52067d8fa99314ec313bf9da9d6f92e; path=/; HttpOnly
     body:
       encoding: ASCII-8BIT
       string: !binary |-
@@ -411,7 +411,7 @@ http_interactions:
         ZW1lbnQgcGx1Z2luIGZvciBGb3JlbWFuIiwidXJsIjoiaHR0cDovL3d3dy5r
         YXRlbGxvLm9yZyIsInZlcnNpb24iOiIzLjMuMCJ9XQp9Cg==
     http_version: 
-  recorded_at: Fri, 30 Sep 2016 15:40:12 GMT
+  recorded_at: Wed, 12 Oct 2016 14:11:27 GMT
 - request:
     method: get
     uri: https://admin:changeme@katello.example.com:50218/katello/api/organizations?per_page=999999
@@ -437,7 +437,7 @@ http_interactions:
       message: 'OK '
     headers:
       Date:
-      - Fri, 30 Sep 2016 15:40:11 GMT
+      - Wed, 12 Oct 2016 14:11:27 GMT
       Server:
       - WEBrick/1.3.1 (Ruby/2.2.4/2015-12-16)
       Foreman-Version:
@@ -453,9 +453,9 @@ http_interactions:
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 10301bde-4924-4486-b8ef-930c05f14c6d
+      - e85cdf29-fd82-448c-85e2-943de8b223de
       X-Runtime:
-      - '0.083312'
+      - '0.080751'
       Content-Security-Policy:
       - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:;
         img-src ''self'' data: *.gravatar.com; script-src ''unsafe-eval'' ''unsafe-inline''
@@ -479,7 +479,7 @@ http_interactions:
       Content-Length:
       - '563'
       Set-Cookie:
-      - _session_id=9abf44b82978e6b79fd2bf9d480281f6; path=/; HttpOnly
+      - _session_id=032164fd9e82e0623fba39f40546e088; path=/; HttpOnly
     body:
       encoding: ASCII-8BIT
       string: |
@@ -496,7 +496,7 @@ http_interactions:
           "results": [{"label":"Default_Organization","created_at":"2016-09-30 14:47:05 UTC","updated_at":"2016-09-30 14:47:05 UTC","id":1,"name":"Default Organization","title":"Default Organization","description":null},{"label":"testcorp","created_at":"2016-09-30 15:10:48 UTC","updated_at":"2016-09-30 15:10:48 UTC","id":8,"name":"Test Corporation","title":"Test Corporation","description":"Testing today for a better tomorrow"}]
         }
     http_version: 
-  recorded_at: Fri, 30 Sep 2016 15:40:12 GMT
+  recorded_at: Wed, 12 Oct 2016 14:11:27 GMT
 - request:
     method: get
     uri: https://admin:changeme@katello.example.com:50218/katello/api/organizations/8
@@ -522,7 +522,7 @@ http_interactions:
       message: 'OK '
     headers:
       Date:
-      - Fri, 30 Sep 2016 15:40:11 GMT
+      - Wed, 12 Oct 2016 14:11:28 GMT
       Server:
       - WEBrick/1.3.1 (Ruby/2.2.4/2015-12-16)
       Foreman-Version:
@@ -538,9 +538,9 @@ http_interactions:
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - f54f61f3-a8c7-426d-b261-f2250e2f66b8
+      - 3d423272-f038-444c-acd3-7eaf10e740a4
       X-Runtime:
-      - '0.369487'
+      - '1.389512'
       Content-Security-Policy:
       - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:;
         img-src ''self'' data: *.gravatar.com; script-src ''unsafe-eval'' ''unsafe-inline''
@@ -564,7 +564,7 @@ http_interactions:
       Content-Length:
       - '21677'
       Set-Cookie:
-      - _session_id=63752383ed17bdcf6fcdfa7f765afbb1; path=/; HttpOnly
+      - _session_id=aa6a40b82e4e2612bd822ebf13189d9a; path=/; HttpOnly
     body:
       encoding: ASCII-8BIT
       string: '{"label":"testcorp","owner_details":{"parentOwner":null,"id":"ff808081577b8f0201577ba5d9850003","key":"testcorp","displayName":"Test
@@ -699,7 +699,7 @@ http_interactions:
         global default","template_kind_id":2,"template_kind_name":"PXEGrub"},{"id":1,"name":"PXELinux
         global default","template_kind_id":1,"template_kind_name":"PXELinux"}],"domains":[{"id":1,"name":"test.com"}],"realms":[],"environments":[],"hostgroups":[],"locations":[],"parameters":[],"default_content_view_id":2,"library_id":2}'
     http_version: 
-  recorded_at: Fri, 30 Sep 2016 15:40:12 GMT
+  recorded_at: Wed, 12 Oct 2016 14:11:28 GMT
 - request:
     method: get
     uri: https://admin:changeme@katello.example.com:50218/katello/api/organizations/8/subscriptions?per_page=999999
@@ -725,7 +725,7 @@ http_interactions:
       message: 'OK '
     headers:
       Date:
-      - Fri, 30 Sep 2016 15:40:13 GMT
+      - Wed, 12 Oct 2016 14:11:31 GMT
       Server:
       - WEBrick/1.3.1 (Ruby/2.2.4/2015-12-16)
       Foreman-Version:
@@ -741,9 +741,9 @@ http_interactions:
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 3476277f-000d-4cde-9981-628275b2687e
+      - d2eaa71b-8ebb-4e6f-baf5-21739c184c44
       X-Runtime:
-      - '1.649381'
+      - '2.139245'
       Content-Security-Policy:
       - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:;
         img-src ''self'' data: *.gravatar.com; script-src ''unsafe-eval'' ''unsafe-inline''
@@ -767,11 +767,11 @@ http_interactions:
       Content-Length:
       - '1972'
       Set-Cookie:
-      - _session_id=49589b6d1414c6d82bfabe4682045e60; path=/; HttpOnly
+      - _session_id=ec89f290defceb9c9c6f6c59bf413f77; path=/; HttpOnly
     body:
       encoding: ASCII-8BIT
       string: |
         {"organization":{},"total":3,"subtotal":3,"page":1,"per_page":"999999","error":null,"search":null,"sort":{"by":null,"order":null},"results":[{"id":1,"cp_id":"ff808081577bae9001577bb702c100da","subscription_id":1,"name":"Red Hat Enterprise Linux for Virtual Datacenters, Premium","start_date":"2016-06-20T04:00:00.000+0000","end_date":"2017-06-20T03:59:59.000+0000","available":1,"quantity":1,"consumed":0,"account_number":5700573,"contract_number":10999116,"support_level":"Premium","product_id":"RH00001","sockets":2,"cores":null,"ram":null,"instance_multiplier":1,"stacking_id":0,"multi_entitlement":true,"type":"NORMAL","product_name":"Red Hat Enterprise Linux for Virtual Datacenters, Premium","unmapped_guest":false,"virt_only":false},{"id":4,"cp_id":"ff808081577bae9001577bb703900138","subscription_id":2,"name":"Red Hat Enterprise Linux for Virtual Datacenters, Standard","start_date":"2016-06-20T04:00:00.000+0000","end_date":"2017-06-20T03:59:59.000+0000","available":1,"quantity":1,"consumed":0,"account_number":5700573,"contract_number":10999110,"support_level":"Standard","product_id":"RH00002","sockets":2,"cores":null,"ram":null,"instance_multiplier":1,"stacking_id":0,"multi_entitlement":true,"type":"NORMAL","product_name":"Red Hat Enterprise Linux for Virtual Datacenters, Standard","unmapped_guest":false,"virt_only":false},{"id":2,"cp_id":"ff808081577bae9001577bb70420018a","subscription_id":3,"name":"Red Hat Enterprise Linux Server, Standard (Physical or Virtual Nodes)","start_date":"2016-06-20T04:00:00.000+0000","end_date":"2017-06-20T03:59:59.000+0000","available":200,"quantity":200,"consumed":0,"account_number":5700573,"contract_number":10999113,"support_level":"Standard","product_id":"RH00004","sockets":2,"cores":null,"ram":null,"instance_multiplier":1,"stacking_id":0,"multi_entitlement":true,"type":"NORMAL","product_name":"Red Hat Enterprise Linux Server, Standard (Physical or Virtual Nodes)","unmapped_guest":false,"virt_only":false}]}
     http_version: 
-  recorded_at: Fri, 30 Sep 2016 15:40:14 GMT
+  recorded_at: Wed, 12 Oct 2016 14:11:30 GMT
 recorded_with: VCR 3.0.3

data/test/resources/content_hosts_test.rb

@@ -122,5 +122,43 @@ HELP
 
       stop_vcr
     end
+
+    def test_import_search
+      start_vcr
+      set_user 'admin'
+
+      file = Tempfile.new('content_hosts_test')
+      # rubocop:disable LineLength
+      file.write("Name,Count,Organization,Environment,Content View,Host Collections,Virtual,Host,OS,Arch,Sockets,RAM,Cores,SLA,Products,Subscriptions\n")
+      file.write("testaaa%d,2,Test Corporation,Library,Default Organization View,,No,,RHEL 6.4,x86_64,2,4 GB,4,Standard,\"69|Red Hat Enterprise Linux Server\",\n")
+      file.write("testbbb%d,3,Test Corporation,Library,Default Organization View,,No,,RHEL 6.4,x86_64,4,16 GB,8,Premium,\"69|Red Hat Enterprise Linux Server\",\n")
+      # rubocop:enable LineLength
+      file.rewind
+
+      stdout,stderr = capture {
+        hammer.run(%W{--reload-cache csv content-hosts --verbose --file #{file.path}})
+      }
+      assert_equal '', stderr
+
+      file = Tempfile.new('content_hosts_test')
+      # rubocop:disable LineLength
+      file.write("Search,Organization,Environment,Content View,Host Collections,Virtual,Host,OS,Arch,Sockets,RAM,Cores,SLA,Products,Subscriptions\n")
+      file.write("name ~ testaaa,Test Corporation,Library,Default Organization View,,No,,RHEL 6.4,x86_64,2,4 GB,4,Standard,\"69|Red Hat Enterprise Linux Server\",\"\"\"2|RH00004|Red Hat Enterprise Linux Server, Standard (Physical or Virtual Nodes)|10999113|5700573\"\"\"\n")
+      # rubocop:enable LineLength
+      file.rewind
+
+      stdout,stderr = capture {
+        hammer.run(%W{--reload-cache csv content-hosts --verbose --file #{file.path}})
+      }
+      assert_equal '', stderr
+      assert_equal "Updating content host 'testaaa0'...done\nUpdating content host 'testaaa1'...done\n", stdout
+
+
+      %w{testaaa0 testaaa1 testbbb0 testbbb1 testbbb2}.each do |hostname|
+        host_delete(hostname)
+      end
+
+      stop_vcr
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_csv
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Thomas McKay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_katello
@@ -91,6 +91,13 @@ files:
 - lib/hammer_cli_csv/utils/config.rb
 - lib/hammer_cli_csv/utils/subscriptions.rb
 - lib/hammer_cli_csv/version.rb
+- locale/Makefile
+- locale/README.md
+- locale/en/LC_MESSAGES/hammer-cli-csv.mo
+- locale/en/hammer-cli-csv.edit.po
+- locale/en/hammer-cli-csv.po
+- locale/en/hammer-cli-csv.po.time_stamp
+- locale/hammer-cli-csv.pot
 - test/apipie_resource_mock.rb
 - test/config.template.yml
 - test/content_views_test.rb
@@ -132,6 +139,7 @@ files:
 - test/fixtures/vcr_cassettes/resources/content_hosts/create_and_update.yml
 - test/fixtures/vcr_cassettes/resources/content_hosts/export.yml
 - test/fixtures/vcr_cassettes/resources/content_hosts/export_subscriptions.yml
+- test/fixtures/vcr_cassettes/resources/content_hosts/import_search.yml
 - test/fixtures/vcr_cassettes/resources/content_hosts/import_single_line.yml
 - test/fixtures/vcr_cassettes/resources/settings/update_settings.yml
 - test/fixtures/vcr_cassettes/resources/settings/update_settings_continue.yml
@@ -237,6 +245,7 @@ test_files:
 - test/fixtures/vcr_cassettes/resources/content_hosts/create_and_update.yml
 - test/fixtures/vcr_cassettes/resources/content_hosts/export.yml
 - test/fixtures/vcr_cassettes/resources/content_hosts/export_subscriptions.yml
+- test/fixtures/vcr_cassettes/resources/content_hosts/import_search.yml
 - test/fixtures/vcr_cassettes/resources/content_hosts/import_single_line.yml
 - test/fixtures/vcr_cassettes/resources/settings/update_settings.yml
 - test/fixtures/vcr_cassettes/resources/settings/update_settings_continue.yml