zenoss_client 0.8.0 → 0.9.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA256:
3
- metadata.gz: 49a04e901616b01c8d358d4241b504ba162a39f9f12156c44d1f33377b64d037
4
- data.tar.gz: b83e1398a83a7db53dec85b29f6b5662c7c9264fe02dc8b81fedfb37b7c3fb16
2
+ SHA1:
3
+ metadata.gz: ccd337639449bce606235f44cb65d9b008412765
4
+ data.tar.gz: b8b9151a872dcd01862a6bd1fbf65b0963e72427
5
5
  SHA512:
6
- metadata.gz: 1204abb1c334da5add5fe006153715580be6f8194ac41a0b715113f34493ccf259a44c00a362719f62ee761057e8e6eb5b694651fbb43ef7dce4d2ef0a83eeb0
7
- data.tar.gz: b1f1e0d54beda78f3cd28319829f0a2773e7e3dacff8034a99ee2ad8a4f7de24e738b3ad3daf851096dceb0da1f5dd6ca8533fa372ad5cd2f7d36f5a06ed3e44
6
+ metadata.gz: 441829da815122c4c59e03ad880b32e9fbbd8b7502ab9bf12b4442f76e3b76bcf110c0a40d78cea354c10f5f4a327548be701021e6aa4b7106330b832c9e0f5d
7
+ data.tar.gz: 19ffccd5bb28309aa0335578a1748c2e00bce494c3981ba3b1a10c55fce2e60f20330e7c93a94b7f3535f0e30749bdbf22eb5fa7ed4efdb8ea867c5c07e501c1
data/.travis.yml CHANGED
@@ -12,5 +12,5 @@ rvm:
12
12
  - jruby-head
13
13
 
14
14
  install:
15
- - gem install bundler
15
+ - gem install bundler -v 1.17.3
16
16
  - bundle install --jobs=3 --retry=3
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.8.0
1
+ 0.9.0
@@ -32,6 +32,7 @@ module Zenoss
32
32
  include Zenoss::RESTAPI
33
33
 
34
34
  def initialize(url, user, pass, opts = {}, &block)
35
+ @zenoss_version = opts[:version]
35
36
  @zenoss_uri = (url.is_a?(URI) ? url : URI.parse(url))
36
37
  @request_number = 1
37
38
  @httpcli = HTTPClient.new
@@ -26,7 +26,11 @@ module Zenoss
26
26
  end
27
27
 
28
28
  def get_report_tree(id = '/zport/dmd/Reports')
29
- json_request('ReportRouter', 'getTree', [{:id => id}])
29
+ if @zenoss_version && @zenoss_version > '6'
30
+ json_request('ReportRouter', 'asyncGetTree', [id])
31
+ else
32
+ json_request('ReportRouter', 'getTree', [{:id => id}])
33
+ end
30
34
  end
31
35
 
32
36
  end # ReportRouter
@@ -0,0 +1,188 @@
1
+ ---
2
+ http_interactions:
3
+ - request:
4
+ method: post
5
+ uri: http://localhost:8080/zport/dmd/zport/acl_users/cookieAuthHelper/login
6
+ body:
7
+ encoding: UTF-8
8
+ string: __ac_name=admin&__ac_password=zenoss&submitted=true&came_from=https%3A%2F%2Fhttp:://localhost:8080/zport/dmd%2Fzport%2Fdmd
9
+ headers:
10
+ User-Agent:
11
+ - HTTPClient/1.0 (2.8.3, ruby 2.3.3 (2016-11-21))
12
+ Accept:
13
+ - "*/*"
14
+ Date:
15
+ - Tue, 19 Feb 2019 22:36:46 GMT
16
+ Content-Type:
17
+ - application/x-www-form-urlencoded
18
+ Cookie: ''
19
+ response:
20
+ status:
21
+ code: 302
22
+ message: Found
23
+ headers:
24
+ Content-Length:
25
+ - '25'
26
+ Content-Type:
27
+ - text/plain; charset=utf-8
28
+ Date:
29
+ - Tue, 19 Feb 2019 22:36:47 GMT
30
+ Location:
31
+ - "/zport/dmd?submitted=true"
32
+ Server: ''
33
+ Set-Cookie: ''
34
+ Strict-Transport-Security:
35
+ - max-age=31536000
36
+ X-Frame-Options:
37
+ - SAMEORIGIN
38
+ X-Xss-Protection:
39
+ - 1; mode=block
40
+ body:
41
+ encoding: UTF-8
42
+ string: "/zport/dmd?submitted=true"
43
+ http_version:
44
+ recorded_at: Tue, 19 Feb 2019 22:36:47 GMT
45
+ - request:
46
+ method: post
47
+ uri: http://localhost:8080/zport/dmd//zport/dmd?submitted=true
48
+ body:
49
+ encoding: UTF-8
50
+ string: __ac_name=admin&__ac_password=zenoss&submitted=true&came_from=https%3A%2F%2Fhttp:://localhost:8080/zport/dmd%2Fzport%2Fdmd
51
+ headers:
52
+ User-Agent:
53
+ - HTTPClient/1.0 (2.8.3, ruby 2.3.3 (2016-11-21))
54
+ Accept:
55
+ - "*/*"
56
+ Date:
57
+ - Tue, 19 Feb 2019 22:36:47 GMT
58
+ Content-Type:
59
+ - application/x-www-form-urlencoded
60
+ Cookie: ''
61
+ response:
62
+ status:
63
+ code: 200
64
+ message: OK
65
+ headers:
66
+ Cache-Control:
67
+ - max-age=0, no-cache
68
+ Content-Type:
69
+ - text/html; charset=utf-8
70
+ Date:
71
+ - Tue, 19 Feb 2019 22:36:47 GMT
72
+ Server: ''
73
+ Set-Cookie: ''
74
+ Strict-Transport-Security:
75
+ - max-age=31536000
76
+ Vary:
77
+ - Accept-Encoding
78
+ X-Frame-Options:
79
+ - SAMEORIGIN
80
+ X-Page-Speed:
81
+ - 1.11.33.4-0
82
+ X-Xss-Protection:
83
+ - 1; mode=block
84
+ Transfer-Encoding:
85
+ - chunked
86
+ body:
87
+ encoding: UTF-8
88
+ string: "\\n\\n <!DOCTYPE html>\\n<html>\\n"
89
+ http_version:
90
+ recorded_at: Tue, 19 Feb 2019 22:36:48 GMT
91
+ - request:
92
+ method: post
93
+ uri: http://localhost:8080/zport/dmd/zport/dmd/device_router
94
+ body:
95
+ encoding: UTF-8
96
+ string: __ac_name=admin&__ac_password=zenoss&submitted=true&came_from=https%3A%2F%2Fhttp:://localhost:8080/zport/dmd%2Fzport%2Fdmd
97
+ headers:
98
+ User-Agent:
99
+ - HTTPClient/1.0 (2.8.3, ruby 2.3.3 (2016-11-21))
100
+ Accept:
101
+ - "*/*"
102
+ Date:
103
+ - Tue, 19 Feb 2019 22:36:48 GMT
104
+ Content-Type:
105
+ - application/json; charset=utf-8
106
+ Cookie: ''
107
+ response:
108
+ status:
109
+ code: 200
110
+ message: OK
111
+ headers:
112
+ Content-Type:
113
+ - application/json
114
+ Date:
115
+ - Tue, 19 Feb 2019 22:36:49 GMT
116
+ Server: ''
117
+ Strict-Transport-Security:
118
+ - max-age=31536000
119
+ Vary:
120
+ - Accept-Encoding
121
+ X-Frame-Options:
122
+ - SAMEORIGIN
123
+ X-Xss-Protection:
124
+ - 1; mode=block
125
+ Content-Length:
126
+ - '309'
127
+ Set-Cookie: ''
128
+ body:
129
+ encoding: UTF-8
130
+ string: '{"uuid": "02f12150-4aa5-4616-a35d-fd4b942421a4", "action": "DeviceRouter",
131
+ "result": {"new_jobs": [{"uuid": "3bbee1ec-4f40-44ce-ada1-cc064eb40505", "description":
132
+ "Create UnitTestDevice under /Devices/Server", "uid": "/zport/dmd/JobManager"}],
133
+ "success": true}, "tid": 1, "type": "rpc", "method": "addDevice"}'
134
+ http_version:
135
+ recorded_at: Tue, 19 Feb 2019 22:36:49 GMT
136
+ - request:
137
+ method: post
138
+ uri: http://localhost:8080/zport/dmd/zport/dmd/device_router
139
+ body:
140
+ encoding: UTF-8
141
+ string: __ac_name=admin&__ac_password=zenoss&submitted=true&came_from=https%3A%2F%2Fhttp:://localhost:8080/zport/dmd%2Fzport%2Fdmd
142
+ headers:
143
+ User-Agent:
144
+ - HTTPClient/1.0 (2.8.3, ruby 2.3.3 (2016-11-21))
145
+ Accept:
146
+ - "*/*"
147
+ Date:
148
+ - Tue, 19 Feb 2019 22:36:49 GMT
149
+ Content-Type:
150
+ - application/json; charset=utf-8
151
+ Cookie: ''
152
+ response:
153
+ status:
154
+ code: 200
155
+ message: OK
156
+ headers:
157
+ Content-Type:
158
+ - application/json
159
+ Date:
160
+ - Tue, 19 Feb 2019 22:36:49 GMT
161
+ Server: ''
162
+ Strict-Transport-Security:
163
+ - max-age=31536000
164
+ Vary:
165
+ - Accept-Encoding
166
+ X-Frame-Options:
167
+ - SAMEORIGIN
168
+ X-Xss-Protection:
169
+ - 1; mode=block
170
+ Content-Length:
171
+ - '904'
172
+ Set-Cookie: ''
173
+ body:
174
+ encoding: UTF-8
175
+ string: '{"uuid": "8c081232-47f0-43f1-9e06-691574b5a164", "action": "DeviceRouter",
176
+ "result": {"totalCount": 1, "hash": "1", "success": true, "devices": [{"ipAddressString":
177
+ null, "serialNumber": "", "pythonClass": "Products.ZenModel.Device", "hwManufacturer":
178
+ null, "collector": "localhost", "osModel": null, "productionState": 400, "systems":
179
+ [], "priority": 3, "hwModel": null, "tagNumber": "", "osManufacturer": null,
180
+ "location": null, "groups": [], "uid": "/zport/dmd/Devices/Server/devices/UnitTestDevice",
181
+ "ipAddress": null, "events": {"info": {"count": 0, "acknowledged_count": 0},
182
+ "clear": {"count": 0, "acknowledged_count": 0}, "warning": {"count": 0, "acknowledged_count":
183
+ 0}, "critical": {"count": 0, "acknowledged_count": 0}, "error": {"count":
184
+ 0, "acknowledged_count": 0}, "debug": {"count": 0, "acknowledged_count": 0}},
185
+ "name": "UnitTestDevice"}]}, "tid": 2, "type": "rpc", "method": "getDevices"}'
186
+ http_version:
187
+ recorded_at: Tue, 19 Feb 2019 22:36:49 GMT
188
+ recorded_with: VCR 4.0.0
@@ -0,0 +1,107 @@
1
+ ---
2
+ http_interactions:
3
+ - request:
4
+ method: post
5
+ uri: http://localhost:8080/zport/dmd/zport/dmd/device_router
6
+ body:
7
+ encoding: UTF-8
8
+ string: '[{"action":"DeviceRouter","method":"getDevices","data":[{"uid":"/zport/dmd/Devices","params":{"name":"UnitTestDevice"}}],"type":"rpc","tid":7}]'
9
+ headers:
10
+ User-Agent:
11
+ - HTTPClient/1.0 (2.8.3, ruby 2.3.3 (2016-11-21))
12
+ Accept:
13
+ - "*/*"
14
+ Date:
15
+ - Tue, 19 Feb 2019 22:36:50 GMT
16
+ Content-Type:
17
+ - application/json; charset=utf-8
18
+ Cookie: ''
19
+ response:
20
+ status:
21
+ code: 200
22
+ message: OK
23
+ headers:
24
+ Content-Type:
25
+ - application/json
26
+ Date:
27
+ - Tue, 19 Feb 2019 22:36:50 GMT
28
+ Server: ''
29
+ Strict-Transport-Security:
30
+ - max-age=31536000
31
+ Vary:
32
+ - Accept-Encoding
33
+ X-Frame-Options:
34
+ - SAMEORIGIN
35
+ X-Xss-Protection:
36
+ - 1; mode=block
37
+ Content-Length:
38
+ - '904'
39
+ Set-Cookie: ''
40
+ body:
41
+ encoding: UTF-8
42
+ string: '{"uuid": "99425e21-1fb5-4a6c-8466-b1969bf927ec", "action": "DeviceRouter",
43
+ "result": {"totalCount": 1, "hash": "1", "success": true, "devices": [{"ipAddressString":
44
+ null, "serialNumber": "", "pythonClass": "Products.ZenModel.Device", "hwManufacturer":
45
+ null, "collector": "localhost", "osModel": null, "productionState": 400, "systems":
46
+ [], "priority": 3, "hwModel": null, "tagNumber": "", "osManufacturer": null,
47
+ "location": null, "groups": [], "uid": "/zport/dmd/Devices/Server/devices/UnitTestDevice",
48
+ "ipAddress": null, "events": {"info": {"count": 0, "acknowledged_count": 0},
49
+ "clear": {"count": 0, "acknowledged_count": 0}, "warning": {"count": 0, "acknowledged_count":
50
+ 0}, "critical": {"count": 0, "acknowledged_count": 0}, "error": {"count":
51
+ 0, "acknowledged_count": 0}, "debug": {"count": 0, "acknowledged_count": 0}},
52
+ "name": "UnitTestDevice"}]}, "tid": 7, "type": "rpc", "method": "getDevices"}'
53
+ http_version:
54
+ recorded_at: Tue, 19 Feb 2019 22:36:50 GMT
55
+ - request:
56
+ method: post
57
+ uri: http://localhost:8080/zport/dmd/zport/dmd/device_router
58
+ body:
59
+ encoding: UTF-8
60
+ string: '[{"action":"DeviceRouter","method":"getDevices","data":[{"uid":"/zport/dmd/Devices","params":{"name":"UnitTestDevice"}}],"type":"rpc","tid":8}]'
61
+ headers:
62
+ User-Agent:
63
+ - HTTPClient/1.0 (2.8.3, ruby 2.3.3 (2016-11-21))
64
+ Accept:
65
+ - "*/*"
66
+ Date:
67
+ - Tue, 19 Feb 2019 22:36:50 GMT
68
+ Content-Type:
69
+ - application/json; charset=utf-8
70
+ Cookie: ''
71
+ response:
72
+ status:
73
+ code: 200
74
+ message: OK
75
+ headers:
76
+ Content-Type:
77
+ - application/json
78
+ Date:
79
+ - Tue, 19 Feb 2019 22:36:51 GMT
80
+ Server: ''
81
+ Strict-Transport-Security:
82
+ - max-age=31536000
83
+ Vary:
84
+ - Accept-Encoding
85
+ X-Frame-Options:
86
+ - SAMEORIGIN
87
+ X-Xss-Protection:
88
+ - 1; mode=block
89
+ Content-Length:
90
+ - '904'
91
+ Set-Cookie: ''
92
+ body:
93
+ encoding: UTF-8
94
+ string: '{"uuid": "b7f6ae66-d850-4deb-96e3-eb70954e4c4e", "action": "DeviceRouter",
95
+ "result": {"totalCount": 1, "hash": "1", "success": true, "devices": [{"ipAddressString":
96
+ null, "serialNumber": "", "pythonClass": "Products.ZenModel.Device", "hwManufacturer":
97
+ null, "collector": "localhost", "osModel": null, "productionState": 400, "systems":
98
+ [], "priority": 3, "hwModel": null, "tagNumber": "", "osManufacturer": null,
99
+ "location": null, "groups": [], "uid": "/zport/dmd/Devices/Server/devices/UnitTestDevice",
100
+ "ipAddress": null, "events": {"info": {"count": 0, "acknowledged_count": 0},
101
+ "clear": {"count": 0, "acknowledged_count": 0}, "warning": {"count": 0, "acknowledged_count":
102
+ 0}, "critical": {"count": 0, "acknowledged_count": 0}, "error": {"count":
103
+ 0, "acknowledged_count": 0}, "debug": {"count": 0, "acknowledged_count": 0}},
104
+ "name": "UnitTestDevice"}]}, "tid": 8, "type": "rpc", "method": "getDevices"}'
105
+ http_version:
106
+ recorded_at: Tue, 19 Feb 2019 22:36:51 GMT
107
+ recorded_with: VCR 4.0.0
@@ -0,0 +1,131 @@
1
+ ---
2
+ http_interactions:
3
+ - request:
4
+ method: post
5
+ uri: http://localhost:8080/zport/dmd/zport/dmd/device_router
6
+ body:
7
+ encoding: UTF-8
8
+ string: '[{"action":"DeviceRouter","method":"getDevices","data":[{"uid":"/zport/dmd/Devices","params":{"name":"UnitTestDevice"}}],"type":"rpc","tid":11}]'
9
+ headers:
10
+ User-Agent:
11
+ - HTTPClient/1.0 (2.8.3, ruby 2.3.3 (2016-11-21))
12
+ Accept:
13
+ - "*/*"
14
+ Date:
15
+ - Tue, 19 Feb 2019 22:36:51 GMT
16
+ Content-Type:
17
+ - application/json; charset=utf-8
18
+ Cookie: ''
19
+ response:
20
+ status:
21
+ code: 200
22
+ message: OK
23
+ headers:
24
+ Content-Type:
25
+ - application/json
26
+ Date:
27
+ - Tue, 19 Feb 2019 22:36:51 GMT
28
+ Server: ''
29
+ Strict-Transport-Security:
30
+ - max-age=31536000
31
+ Vary:
32
+ - Accept-Encoding
33
+ X-Frame-Options:
34
+ - SAMEORIGIN
35
+ X-Xss-Protection:
36
+ - 1; mode=block
37
+ Content-Length:
38
+ - '905'
39
+ Set-Cookie: ''
40
+ body:
41
+ encoding: UTF-8
42
+ string: '{"uuid": "252d5c1e-ede2-460f-93d5-f33be9becd07", "action": "DeviceRouter",
43
+ "result": {"totalCount": 1, "hash": "1", "success": true, "devices": [{"ipAddressString":
44
+ null, "serialNumber": "", "pythonClass": "Products.ZenModel.Device", "hwManufacturer":
45
+ null, "collector": "localhost", "osModel": null, "productionState": 400, "systems":
46
+ [], "priority": 3, "hwModel": null, "tagNumber": "", "osManufacturer": null,
47
+ "location": null, "groups": [], "uid": "/zport/dmd/Devices/Server/devices/UnitTestDevice",
48
+ "ipAddress": null, "events": {"info": {"count": 0, "acknowledged_count": 0},
49
+ "clear": {"count": 0, "acknowledged_count": 0}, "warning": {"count": 0, "acknowledged_count":
50
+ 0}, "critical": {"count": 0, "acknowledged_count": 0}, "error": {"count":
51
+ 0, "acknowledged_count": 0}, "debug": {"count": 0, "acknowledged_count": 0}},
52
+ "name": "UnitTestDevice"}]}, "tid": 11, "type": "rpc", "method": "getDevices"}'
53
+ http_version:
54
+ recorded_at: Tue, 19 Feb 2019 22:36:51 GMT
55
+ - request:
56
+ method: get
57
+ uri: http://localhost:8080/zport/dmd/zport/dmd/Devices/Server/devices/UnitTestDevice/sysUpTime
58
+ body:
59
+ encoding: UTF-8
60
+ string: ''
61
+ headers:
62
+ User-Agent:
63
+ - HTTPClient/1.0 (2.8.3, ruby 2.3.3 (2016-11-21))
64
+ Accept:
65
+ - "*/*"
66
+ Date:
67
+ - Tue, 19 Feb 2019 22:36:51 GMT
68
+ Cookie: ''
69
+ response:
70
+ status:
71
+ code: 200
72
+ message: OK
73
+ headers:
74
+ Content-Length:
75
+ - '2'
76
+ Content-Type:
77
+ - text/plain; charset=utf-8
78
+ Date:
79
+ - Tue, 19 Feb 2019 22:36:52 GMT
80
+ Server: ''
81
+ Strict-Transport-Security:
82
+ - max-age=31536000
83
+ X-Frame-Options:
84
+ - SAMEORIGIN
85
+ X-Xss-Protection:
86
+ - 1; mode=block
87
+ Set-Cookie: ''
88
+ body:
89
+ encoding: UTF-8
90
+ string: "-1"
91
+ http_version:
92
+ recorded_at: Tue, 19 Feb 2019 22:36:52 GMT
93
+ - request:
94
+ method: get
95
+ uri: http://localhost:8080/zport/dmd/zport/dmd/Devices/Server/devices/UnitTestDevice/sysUpTime
96
+ body:
97
+ encoding: UTF-8
98
+ string: ''
99
+ headers:
100
+ User-Agent:
101
+ - HTTPClient/1.0 (2.8.3, ruby 2.3.3 (2016-11-21))
102
+ Accept:
103
+ - "*/*"
104
+ Date:
105
+ - Tue, 19 Feb 2019 22:36:52 GMT
106
+ Cookie: ''
107
+ response:
108
+ status:
109
+ code: 200
110
+ message: OK
111
+ headers:
112
+ Content-Length:
113
+ - '2'
114
+ Content-Type:
115
+ - text/plain; charset=utf-8
116
+ Date:
117
+ - Tue, 19 Feb 2019 22:36:52 GMT
118
+ Server: ''
119
+ Strict-Transport-Security:
120
+ - max-age=31536000
121
+ X-Frame-Options:
122
+ - SAMEORIGIN
123
+ X-Xss-Protection:
124
+ - 1; mode=block
125
+ Set-Cookie: ''
126
+ body:
127
+ encoding: UTF-8
128
+ string: "-1"
129
+ http_version:
130
+ recorded_at: Tue, 19 Feb 2019 22:36:52 GMT
131
+ recorded_with: VCR 4.0.0