RubyGems - zenoss_client - Versions diffs - 0.9.1 → 0.10.0 - Mend

zenoss_client 0.9.1 → 0.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

checksums.yaml +5 -5
data/.travis.yml +7 -8
data/README.rdoc +0 -0
data/VERSION +1 -1
data/lib/zenoss/jsonapi/device_router.rb +17 -0
data/test/fixtures/vcr_cassettes/6_2_1_initial_connection.yml +103 -16
data/test/fixtures/vcr_cassettes/6_2_1_test_0012_remodels_a_device.yml +99 -0
data/test/zenoss_client_test.rb +9 -0
data/zenoss_client.gemspec +3 -3
metadata +17 -106

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c50bb43ef8360b1861920b2db604b4620f67379d
-  data.tar.gz: d788721031d0bb940b2f4546b3c988ff599b7a91
+SHA256:
+  metadata.gz: c64cb525b567ce659a11d844a5b2d5d4e5212bdc799d320fa3134e3e3beee4d1
+  data.tar.gz: 1a3de47b44a7b48662d2b8135179f158d1d7fe06d204e587a063af2dcc7ef6e0
 SHA512:
-  metadata.gz: c8cbf8ca1804409707f13efc42daf0c09514274ea54b56b964203f902309c3244b915518fbb37ec73c75bbad6751700413464f767600bb99178e621365a90b40
-  data.tar.gz: 9489a2223bbbdee4f4202b66cd9f026388ea197953ca3b6bf84494715f7d7602470a1794269d178ce3875417f8c8c0b2b1f31b598eebce5ea3fcc644c3d90d80
+  metadata.gz: c8d2eeb2cdb2bd4db0e82b9888f6cc1d3d1c766f046bb87e4f6d7d5abc1297594136c1420cf438873b16ad3ee19e5cbf40367c1d9c869e9af76a0ebd44b0038f
+  data.tar.gz: 4f64c02de20bd54c98215cb93d0302f55d8b7f85e94ca65c676eb4ab240a7c935d2925ec0f93ce9904b3865959b1f9b7a67a26ac1f249fb2aec7e24cd69b9748

data/.travis.yml CHANGED

@@ -1,15 +1,14 @@
 language: ruby
 script: bundle exec rake test
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.0.0-p648
   - 2.1.10
-  - 2.2.8
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
-  - ruby-head
-  - jruby-head
+  - 2.2.10
+  - 2.3.8
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 install:
   - gem install bundler -v 1.17.3

data/README.rdoc ADDED

File without changes

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 0.9.1
1	+ 0.10.0

data/lib/zenoss/jsonapi/device_router.rb CHANGED

@@ -72,6 +72,23 @@ module Zenoss
         end
       end
+      # @param [String] uid required; device id in Zenoss
+      # @param [String] plugins takes a string.  A plugin respresents a Modeler
+      # plugin such as cisco.snmp.Interfaces
+      # @param [Boolean] background whether to schedule a job in background
+      def remodel(uid, plugins = nil, background = false)
+        if @zenoss_version && @zenoss_version > '6'
+          data = {}
+          data[:deviceUid] = uid
+          data[:collectPlugins] = plugins || ''
+          data[:background] = background
+          json_request('DeviceRouter', 'remodel', [data])
+        else
+          raise ZenossError, 'remodel method on DeviceRouter is only allowed '\
+                             'for version 6 and above'
+        end
+      end
       # =============== Non-API Helper methods ===============
       # This method will allow you to search for devices by name. If you put a partial name

data/test/fixtures/vcr_cassettes/6_2_1_initial_connection.yml CHANGED

@@ -12,7 +12,7 @@ http_interactions:
       Accept:
       - "*/*"
       Date:
-      - Mon, 25 Feb 2019 23:20:05 GMT
+      - Wed, 15 Apr 2020 20:38:47 GMT
       Content-Type:
       - application/x-www-form-urlencoded
       Cookie: ''
@@ -26,7 +26,7 @@ http_interactions:
       Content-Type:
       - text/plain; charset=utf-8
       Date:
-      - Mon, 25 Feb 2019 23:20:06 GMT
+      - Wed, 15 Apr 2020 20:38:50 GMT
       Location:
       - "/zport/dmd?submitted=true"
       Server: ''
@@ -41,7 +41,7 @@ http_interactions:
       encoding: UTF-8
       string: "/zport/dmd?submitted=true"
     http_version:
-  recorded_at: Mon, 25 Feb 2019 23:20:06 GMT
+  recorded_at: Wed, 15 Apr 2020 20:38:51 GMT
 - request:
     method: post
     uri: http://localhost:8080/zport/dmd//zport/dmd?submitted=true
@@ -54,7 +54,7 @@ http_interactions:
       Accept:
       - "*/*"
       Date:
-      - Mon, 25 Feb 2019 23:20:06 GMT
+      - Wed, 15 Apr 2020 20:38:51 GMT
       Content-Type:
       - application/x-www-form-urlencoded
       Cookie: ''
@@ -68,7 +68,7 @@ http_interactions:
       Content-Type:
       - text/html; charset=utf-8
       Date:
-      - Mon, 25 Feb 2019 23:20:07 GMT
+      - Wed, 15 Apr 2020 20:38:51 GMT
       Server: ''
       Set-Cookie: ''
       Strict-Transport-Security:
@@ -87,7 +87,7 @@ http_interactions:
       encoding: UTF-8
       string: "\\n\\n    <!DOCTYPE html>\\n<html>\\n"
     http_version:
-  recorded_at: Mon, 25 Feb 2019 23:20:07 GMT
+  recorded_at: Wed, 15 Apr 2020 20:38:52 GMT
 - request:
     method: post
     uri: http://localhost:8080/zport/dmd/zport/dmd/device_router
@@ -100,7 +100,7 @@ http_interactions:
       Accept:
       - "*/*"
       Date:
-      - Mon, 25 Feb 2019 23:20:07 GMT
+      - Wed, 15 Apr 2020 20:38:52 GMT
       Content-Type:
       - application/json; charset=utf-8
       Cookie: ''
@@ -112,7 +112,7 @@ http_interactions:
       Content-Type:
       - application/json
       Date:
-      - Mon, 25 Feb 2019 23:20:07 GMT
+      - Wed, 15 Apr 2020 20:38:54 GMT
       Server: ''
       Strict-Transport-Security:
       - max-age=31536000
@@ -123,23 +123,110 @@ http_interactions:
       X-Xss-Protection:
       - 1; mode=block
       Content-Length:
-      - '1063'
+      - '309'
       Set-Cookie: ''
     body:
       encoding: UTF-8
-      string: '{"uuid": "05f56525-8c70-487e-90ad-0b4480e3a9e5", "action": "DeviceRouter",
+      string: '{"uuid": "a34caf64-2209-480c-96ed-dd94117ef7ac", "action": "DeviceRouter",
+        "result": {"new_jobs": [{"uuid": "b0c01851-394f-49a1-8547-acd02633194e", "description":
+        "Create UnitTestDevice under /Devices/Server", "uid": "/zport/dmd/JobManager"}],
+        "success": true}, "tid": 1, "type": "rpc", "method": "addDevice"}'
+    http_version:
+  recorded_at: Wed, 15 Apr 2020 20:38:54 GMT
+- request:
+    method: post
+    uri: http://localhost:8080/zport/dmd/zport/dmd/device_router
+    body:
+      encoding: UTF-8
+      string: __ac_name=admin&__ac_password=zenoss&submitted=true&came_from=https%3A%2F%2Fhttp:://localhost:8080/zport/dmd%2Fzport%2Fdmd
+    headers:
+      User-Agent:
+      - HTTPClient/1.0 (2.8.3, ruby 2.3.3 (2016-11-21))
+      Accept:
+      - "*/*"
+      Date:
+      - Wed, 15 Apr 2020 20:38:54 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Cookie: ''
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      Date:
+      - Wed, 15 Apr 2020 20:38:54 GMT
+      Server: ''
+      Strict-Transport-Security:
+      - max-age=31536000
+      Vary:
+      - Accept-Encoding
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      Content-Length:
+      - '197'
+      Set-Cookie: ''
+    body:
+      encoding: UTF-8
+      string: '{"uuid": "48c067ba-5c1e-4d81-aac0-3c49aadba9fc", "action": "DeviceRouter",
+        "result": {"totalCount": 0, "hash": "0", "success": true, "devices": []},
+        "tid": 2, "type": "rpc", "method": "getDevices"}'
+    http_version:
+  recorded_at: Wed, 15 Apr 2020 20:38:54 GMT
+- request:
+    method: post
+    uri: http://localhost:8080/zport/dmd/zport/dmd/device_router
+    body:
+      encoding: UTF-8
+      string: __ac_name=admin&__ac_password=zenoss&submitted=true&came_from=https%3A%2F%2Fhttp:://localhost:8080/zport/dmd%2Fzport%2Fdmd
+    headers:
+      User-Agent:
+      - HTTPClient/1.0 (2.8.3, ruby 2.3.3 (2016-11-21))
+      Accept:
+      - "*/*"
+      Date:
+      - Wed, 15 Apr 2020 20:39:09 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Cookie: ''
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      Date:
+      - Wed, 15 Apr 2020 20:39:11 GMT
+      Server: ''
+      Strict-Transport-Security:
+      - max-age=31536000
+      Vary:
+      - Accept-Encoding
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      Content-Length:
+      - '905'
+      Set-Cookie: ''
+    body:
+      encoding: UTF-8
+      string: '{"uuid": "91ffde13-d44b-4a5e-9846-2155070ba803", "action": "DeviceRouter",
         "result": {"totalCount": 1, "hash": "1", "success": true, "devices": [{"ipAddressString":
         null, "serialNumber": "", "pythonClass": "Products.ZenModel.Device", "hwManufacturer":
-        null, "collector": "zencollector01", "osModel": null, "productionState": -1,
+        null, "collector": "localhost", "osModel": null, "productionState": 1000,
         "systems": [], "priority": 3, "hwModel": null, "tagNumber": "", "osManufacturer":
-        null, "location": null, "groups": [{"uid": "/zport/dmd/Groups/BackboneDevices",
-        "path": "/Groups/BackboneDevices", "uuid": "65142f38-df6e-482e-a74d-ec825af8e058",
-        "name": "/BackboneDevices"}], "uid": "/zport/dmd/Devices/Server/devices/UnitTestDevice",
+        null, "location": null, "groups": [], "uid": "/zport/dmd/Devices/Server/devices/UnitTestDevice",
         "ipAddress": null, "events": {"info": {"count": 0, "acknowledged_count": 0},
         "clear": {"count": 0, "acknowledged_count": 0}, "warning": {"count": 0, "acknowledged_count":
         0}, "critical": {"count": 0, "acknowledged_count": 0}, "error": {"count":
         0, "acknowledged_count": 0}, "debug": {"count": 0, "acknowledged_count": 0}},
-        "name": "UnitTestDevice"}]}, "tid": 2, "type": "rpc", "method": "getDevices"}'
+        "name": "UnitTestDevice"}]}, "tid": 3, "type": "rpc", "method": "getDevices"}'
     http_version:
-  recorded_at: Mon, 25 Feb 2019 23:20:07 GMT
+  recorded_at: Wed, 15 Apr 2020 20:39:11 GMT
 recorded_with: VCR 4.0.0

data/test/fixtures/vcr_cassettes/6_2_1_test_0012_remodels_a_device.yml ADDED

@@ -0,0 +1,99 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://localhost:8080/zport/dmd/zport/dmd/device_router
+    body:
+      encoding: UTF-8
+      string: '[{"action":"DeviceRouter","method":"getDevices","data":[{"uid":"/zport/dmd/Devices","params":{"name":"UnitTestDevice"}}],"type":"rpc","tid":4}]'
+    headers:
+      User-Agent:
+      - HTTPClient/1.0 (2.8.3, ruby 2.3.3 (2016-11-21))
+      Accept:
+      - "*/*"
+      Date:
+      - Wed, 15 Apr 2020 20:39:11 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Cookie: ''
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      Date:
+      - Wed, 15 Apr 2020 20:39:11 GMT
+      Server: ''
+      Strict-Transport-Security:
+      - max-age=31536000
+      Vary:
+      - Accept-Encoding
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      Content-Length:
+      - '905'
+      Set-Cookie: ''
+    body:
+      encoding: UTF-8
+      string: '{"uuid": "d7e1f3b6-bff3-4ac0-b915-974e7b57bd24", "action": "DeviceRouter",
+        "result": {"totalCount": 1, "hash": "1", "success": true, "devices": [{"ipAddressString":
+        null, "serialNumber": "", "pythonClass": "Products.ZenModel.Device", "hwManufacturer":
+        null, "collector": "localhost", "osModel": null, "productionState": 1000,
+        "systems": [], "priority": 3, "hwModel": null, "tagNumber": "", "osManufacturer":
+        null, "location": null, "groups": [], "uid": "/zport/dmd/Devices/Server/devices/UnitTestDevice",
+        "ipAddress": null, "events": {"info": {"count": 0, "acknowledged_count": 0},
+        "clear": {"count": 0, "acknowledged_count": 0}, "warning": {"count": 0, "acknowledged_count":
+        0}, "critical": {"count": 0, "acknowledged_count": 0}, "error": {"count":
+        0, "acknowledged_count": 0}, "debug": {"count": 0, "acknowledged_count": 0}},
+        "name": "UnitTestDevice"}]}, "tid": 4, "type": "rpc", "method": "getDevices"}'
+    http_version:
+  recorded_at: Wed, 15 Apr 2020 20:39:11 GMT
+- request:
+    method: post
+    uri: http://localhost:8080/zport/dmd/zport/dmd/device_router
+    body:
+      encoding: UTF-8
+      string: '[{"action":"DeviceRouter","method":"remodel","data":[{"deviceUid":"/zport/dmd/Devices/Server/devices/UnitTestDevice","collectPlugins":"","background":false}],"type":"rpc","tid":5}]'
+    headers:
+      User-Agent:
+      - HTTPClient/1.0 (2.8.3, ruby 2.3.3 (2016-11-21))
+      Accept:
+      - "*/*"
+      Date:
+      - Wed, 15 Apr 2020 20:39:11 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Cookie: ''
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - application/json
+      Date:
+      - Wed, 15 Apr 2020 20:40:46 GMT
+      Server: ''
+      Strict-Transport-Security:
+      - max-age=31536000
+      Vary:
+      - Accept-Encoding
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      Content-Length:
+      - '166'
+      Set-Cookie: ''
+    body:
+      encoding: UTF-8
+      string: '{"uuid": "40e52e10-789f-4da0-b15a-b839dbce38ae", "action": "DeviceRouter",
+        "result": {"exitStatus": 0, "success": true}, "tid": 5, "type": "rpc", "method":
+        "remodel"}'
+    http_version:
+  recorded_at: Wed, 15 Apr 2020 20:40:46 GMT
+recorded_with: VCR 4.0.0

data/test/zenoss_client_test.rb CHANGED

@@ -158,6 +158,15 @@ describe Zenoss do
       set_info.wont_be_empty
       set_info['success'].must_equal true
     end
+    it 'remodels a device' do
+      uid = @dev.uid
+      remodel = @zen.remodel(uid)
+      remodel.must_be_kind_of Hash
+      remodel.wont_be_empty
+      remodel['success'].must_equal true
+      remodel['exitStatus'].must_equal 0
+    end
   end
 end

data/zenoss_client.gemspec CHANGED

@@ -10,8 +10,8 @@ Gem::Specification.new do |gem|
   gem.platform = Gem::Platform::RUBY
   gem.rubyforge_project  = nil
-  gem.authors = ['Dan Wanek', 'Ben Miller', 'Marek Skrobacki']
-  gem.email = ['dan.wanek@gmail.com', 'bjmllr@gmail.com', 'marek@skrobacki.uk']
+  gem.authors = ['Dan Wanek', 'Ben Miller', 'Marek Skrobacki', 'Taylor Etheredge']
+  gem.email = ['dan.wanek@gmail.com', 'bjmllr@gmail.com', 'marek@skrobacki.uk', 'taylor.etheredge@gmail.com']
   gem.homepage = "http://github.com/RubyOpenSource/zenoss_client"
   gem.summary = "A wrapper around the Zenoss JSON and REST APIs"
@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
   gem.rdoc_options = %w(-x test/ -x examples/)
   gem.extra_rdoc_files = %w(README.textile COPYING.txt)
-  gem.required_ruby_version = '>= 1.8.7'
+  gem.required_ruby_version = '>= 2.0.0-p648'
   gem.add_runtime_dependency  'httpclient', '~> 2.0'
   gem.add_runtime_dependency  'tzinfo', '~> 0.3.20'
   gem.add_runtime_dependency  'json', '~> 1.5'

metadata CHANGED

@@ -1,134 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: zenoss_client
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Dan Wanek
-- Ben Miller
-- Marek Skrobacki
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-08 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: httpclient
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.20
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.20
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-      This is a wrapper around the Zenoss JSON and REST APIs. For the most things it
-      should feel very familiar to zendmd, but there are some changes do to the merging
-      of the JSON and REST APIs. Please read the API docs for Zenoss and the YARDDoc for
-      this gem (rdoc.info).
-email:
-- dan.wanek@gmail.com
-- bjmllr@gmail.com
-- marek@skrobacki.uk
+description: "  \tThis is a Ruby library for accessing Zenoss through its REST interface.
+  \ It is a work in progress and as functionality is testing\n\tit will be added.
+  \ For documentation on what the method calls do see the official Zenoss API docs.\n"
+email: dan.wanek@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.textile
+- README.rdoc
 - COPYING.txt
 files:
 - ".gitignore"
 - ".travis.yml"
 - COPYING.txt
 - Gemfile
+- README.rdoc
 - README.textile
 - Rakefile
 - VERSION
@@ -207,18 +117,20 @@ files:
 - test/fixtures/vcr_cassettes/6_2_1_test_0009_renames_the_device.yml
 - test/fixtures/vcr_cassettes/6_2_1_test_0010_sets_info_for_a_device.yml
 - test/fixtures/vcr_cassettes/6_2_1_test_0011_sets_info_for_a_device_on_a_device_object.yml
+- test/fixtures/vcr_cassettes/6_2_1_test_0012_remodels_a_device.yml
 - test/test_helper.rb
 - test/zenoss_client_test.rb
 - test/zenoss_model_device_test.rb
 - tools/callZenossMethod.py
 - zenoss_client.gemspec
-homepage: http://github.com/RubyOpenSource/zenoss_client
-licenses:
-- GPL-3.0
+homepage: http://github.com/zenchild/zenoss_client
+licenses: []
 metadata: {}
-post_install_message:
+post_install_message: See README.rdoc
 rdoc_options:
 - "-x"
+- wsdl/
+- "-x"
 - test/
 - "-x"
 - examples/
@@ -235,9 +147,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
-summary: A wrapper around the Zenoss JSON and REST APIs
+summary: A Ruby API for accessing Zenoss via REST
 test_files: []