hawkular-client 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bb18420ad9844b7c10d6e5e4e0df657dce7c172
-  data.tar.gz: 1bcac0ba50a633ecbf512a225c78aae0fb06fdf1
+  metadata.gz: d3f91327af0cba7955ceeabb25999cafb2e29331
+  data.tar.gz: 8b6efcd11c9fbab70e57f4a36b6b4f8babafb38a
 SHA512:
-  metadata.gz: b2adc059140248e2a9abea8c4000ae4df32b6004534b7eb1c1eb02a2f234b5a3294993142abb4e37cc8f4d5319f47a45729fbb1f4c335aac66d978852b271ee8
-  data.tar.gz: 0945f21efb375d356404683b19888fecadc3698dd55e496eb33a727d9cd411caabd2a883e23e13fe77dd829578f4c082d107fbefd8de5756379226133daa51ba
+  metadata.gz: fe4775cc86dff4e7778df1c6fafc48dda3da8581a2afcb02ed3f1be0a8c76ba251da0a7a49b60e17bcd816325b67fbaa0c9bfbd1f669a89679774f6d7b465ea6
+  data.tar.gz: 40143d8e9afefdb08eac2b1ff8ee0c6c9f4dd1116283cddf17a5fcb5869172380421d652ccebbdbb0f5e7899a4d157d682ac1230627e3cf842ef6575f9e2bc60

data/.travis.yml

@@ -3,3 +3,4 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.0

data/CHANGES.rdoc

@@ -3,6 +3,11 @@
 This document describes the relevant changes between releases of the
 _hawkular-client_ project.
 
+=== V 0.2.2
+
+* Bug fix to correctly read resource info for resources that are not directly below a feed.
+  Issue #54[https://github.com/hawkular/hawkular-client-ruby/issues/54]
+
 === V 0.2.1
 
 * Add support to create items in inventory

data/README.rdoc

@@ -13,7 +13,7 @@ A Ruby Hawkular Client.
 * Start a feature/bugfix branch
 * Commit and push until you are happy with your contribution
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Run your code through RuboCop (which is default when running +rake+) and fix complaints.
+* Run your code through RuboCop (which is default when running `rake`) and fix complaints.
 * When you open a pull request, watch out for failures on Travis.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is
   otherwise necessary, that is fine, but please isolate to its own commit so we can cherry-pick around it.
@@ -23,12 +23,12 @@ A Ruby Hawkular Client.
 Integration tests are recorded and played against cassettes recorded with VCR
 (http://www.relishapp.com/vcr/vcr/docs)
 
-* Edit the endpoint properties in the file +spec/endpoint.yml+ (user, password and host name) if needed
+* Edit the endpoint properties in the file `spec/endpoint.yml`(user, password and host name) if needed
 * From command line run
     rake spec
-* To run the tests against a live server, set +VCR_OFF+ to +1+ as in
+* To run the tests against a live server, set VCR_OFF to 1 as in
     VCR_OFF=1 rake spec
-* To run the tests for operations against a live server using the WebSockets, set +WEBSOCKET_ON+ to +1+ as in
+* To run the tests for operations against a live server using the WebSockets, set WEBSOCKET_ON to 1 as in
     WEBSOCKET_ON=1 rake spec
 (WebSocket communication can't be recorded by VCR)
 

data/hawkularclient.gemspec

@@ -6,8 +6,8 @@ require 'version'
 Gem::Specification.new do |gem|
   gem.name          = 'hawkular-client'
   gem.version       = Hawkular::VERSION
-  gem.authors       = ['Libor Zoubek', 'Heiko W. Rupp', 'Jirka Kremser', 'Federico Simoncelli']
-  gem.email         = %w(lzoubek@redhat.com hrupp@redhat.com jkremser@redhat.com)
+  gem.authors       = ['Libor Zoubek', 'Heiko W. Rupp', 'Federico Simoncelli']
+  gem.email         = %w(lzoubek@redhat.com hrupp@redhat.com)
   gem.homepage      = 'https://github.com/hawkular/hawkular-client-ruby'
   gem.summary       = 'A Ruby client for Hawkular'
   gem.license       = 'ASL 2.0'
@@ -27,7 +27,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('shoulda')
   gem.add_development_dependency('rspec-rails', '~> 3.0')
   gem.add_development_dependency('rake', '< 11')
-  gem.add_development_dependency('simple-websocket-vcr', '= 0.0.4')
   gem.add_development_dependency('yard')
   gem.add_development_dependency('webmock')
   gem.add_development_dependency('vcr')

data/lib/hawkular.rb

@@ -47,6 +47,7 @@ module Hawkular
     # as many ids inside Hawkular can contain characters
     # that are invalid for an url/uri.
     # The passed value is duplicated
+    # Does not escape the = character
     # @param [String] url_part Part of an url to be escaped
     # @return [String] escaped url_part as new string
     def hawk_escape(url_part)
@@ -68,6 +69,19 @@ module Hawkular
       sub_url
     end
 
+    # Escapes the passed url part. This is necessary,
+    # as many ids inside Hawkular can contain characters
+    # that are invalid for an url/uri.
+    # The passed value is duplicated
+    # Does escape the = character
+    # @param [String] url_part Part of an url to be escaped
+    # @return [String] escaped url_part as new string
+    def hawk_escape_id(url_part)
+      sub_url = hawk_escape url_part
+      sub_url.gsub!('=', '%3d')
+      sub_url
+    end
+
     def http_post(suburl, hash, headers = {})
       body = JSON.generate(hash)
       res = rest_client(suburl).post(body, http_headers(headers))

data/lib/inventory/inventory_api.rb

@@ -62,7 +62,7 @@ module Hawkular::Inventory
       if feed.nil?
         ret = http_get('/resourceTypes')
       else
-        the_feed = hawk_escape feed
+        the_feed = hawk_escape_id feed
         ret = http_get("/feeds/#{the_feed}/resourceTypes")
       end
       ret.map { |rt| ResourceType.new(rt) }
@@ -74,7 +74,7 @@ module Hawkular::Inventory
     # @return [Array<Resource>] List of resources, which can be empty.
     def list_resources_for_feed(feed, fetch_properties = false)
       fail 'Feed must be given' unless feed
-      the_feed = hawk_escape feed
+      the_feed = hawk_escape_id feed
       ret = http_get("/feeds/#{the_feed}/resources")
       ret.map do |r|
         if fetch_properties
@@ -95,12 +95,12 @@ module Hawkular::Inventory
     # @return [Array<Resource>] List of resources. Can be empty
     def list_resources_for_type(feed, type, fetch_properties = false)
       fail 'Type must not be nil' unless type
-      the_type = hawk_escape type
+      the_type = hawk_escape_id type
       if feed.nil?
         ret = http_get("resourceTypes/#{the_type}/resources")
       else
 
-        the_feed = hawk_escape feed
+        the_feed = hawk_escape_id feed
         ret = http_get("/feeds/#{the_feed}/resourceTypes/#{the_type}/resources")
       end
       ret.map do |r|
@@ -113,14 +113,18 @@ module Hawkular::Inventory
     end
 
     # Retrieve runtime properties for the passed resource
-    # @param [String] resource_id Id of the resource to read properties from
-    # @param [String] feed Feed of the resource
+    # @param [String] feed_id Feed of the resource
+    # @param [Array<String>] res_ids Ids of the resource to read properties from (parent to child order)
     # @return [Hash<String,Object] Hash with additional data
-    def get_config_data_for_resource(resource_id, feed)
-      the_id = hawk_escape resource_id
-      the_feed = hawk_escape feed
+    def get_config_data_for_resource(res_ids, feed_id)
+      resource_path = if res_ids.is_a?(Array)
+                        res_ids.map { |id| hawk_escape_id id }.join('/')
+                      else
+                        hawk_escape_id res_ids
+                      end
+      the_feed = hawk_escape_id feed_id
       query = generate_query_params dataType: 'configuration'
-      http_get("feeds/#{the_feed}/resources/#{the_id}/data#{query}")
+      http_get("feeds/#{the_feed}/resources/#{resource_path}/data#{query}")
     rescue
       {}
     end
@@ -132,11 +136,11 @@ module Hawkular::Inventory
     # @return [Array<Resource>] List of resources that are children of the given parent resource.
     #   Can be empty
     def list_child_resources(parent_resource, recursive = false)
-      the_feed = hawk_escape parent_resource.feed
-      the_id = hawk_escape parent_resource.id
+      the_feed = hawk_escape_id parent_resource.feed
+      resource_path_escaped = CanonicalPath.parse(parent_resource.path).resource_ids.join('/')
 
       which_children = (recursive ? '/recursiveChildren' : '/children')
-      ret = http_get("/feeds/#{the_feed}/resources/#{the_id}#{which_children}")
+      ret = http_get("/feeds/#{the_feed}/resources/#{resource_path_escaped}#{which_children}")
       ret.map { |r| Resource.new(r) }
     end
 
@@ -155,7 +159,7 @@ module Hawkular::Inventory
     # @param [String] named Name of the relationship
     # @return [Array<Relationship>] List of relationships
     def list_relationships_for_feed(feed_id, named = nil)
-      the_feed = hawk_escape feed_id
+      the_feed = hawk_escape_id feed_id
       query = named.nil? ? '' : (generate_query_params named: named)
       ret = http_get("/feeds/#{the_feed}/relationships#{query}")
       ret.map { |r| Relationship.new(r) }
@@ -199,11 +203,11 @@ module Hawkular::Inventory
     # @return [Array<Metric>] List of metrics. Can be empty
     def list_metrics_for_metric_type(feed, type)
       fail 'Type must not be nil' unless type
-      the_type = hawk_escape type
+      the_type = hawk_escape_id type
       if feed.nil?
         type_hash = http_get("metricTypes/#{the_type}")
       else
-        the_feed = hawk_escape feed
+        the_feed = hawk_escape_id feed
         type_hash = http_get("/feeds/#{the_feed}/metricTypes/#{the_type}")
       end
 
@@ -226,11 +230,11 @@ module Hawkular::Inventory
     # @return [Array<Metric>] List of metrics. Can be empty
     def list_metrics_for_resource_type(feed, type)
       fail 'Type must not be nil' unless type
-      the_type = hawk_escape type
+      the_type = hawk_escape_id type
       if feed.nil?
         ret = http_get("resourceTypes/#{the_type}/resources")
       else
-        the_feed = hawk_escape feed
+        the_feed = hawk_escape_id feed
         ret = http_get("feeds/#{the_feed}/resourceTypes/#{the_type}/resources")
       end
       ret.flat_map do |r|
@@ -259,10 +263,10 @@ module Hawkular::Inventory
     #    # Don't filter, return all metric definitions
     #    client.list_metrics_for_resource(wild_fly)
     def list_metrics_for_resource(resource, filter = {})
-      the_feed = hawk_escape resource.feed
-      the_id = hawk_escape resource.id
+      the_feed = hawk_escape_id resource.feed
+      resource_path_escaped = CanonicalPath.parse(resource.path).resource_ids.join('/')
 
-      ret = http_get("/feeds/#{the_feed}/resources/#{the_id}/metrics")
+      ret = http_get("/feeds/#{the_feed}/resources/#{resource_path_escaped}/metrics")
       with_nils = ret.map do |m|
         metric_new = Metric.new(m)
         found = should_include?(metric_new, filter)
@@ -285,7 +289,7 @@ module Hawkular::Inventory
       rescue HawkularException  => error
         # 409 We already exist -> that is ok
         if error.status_code == 409
-          the_feed = hawk_escape feed_id
+          the_feed = hawk_escape_id feed_id
           http_get("/feeds/#{the_feed}")
         else
           raise
@@ -296,7 +300,7 @@ module Hawkular::Inventory
     # Delete the feed with the passed feed id.
     # @param feed Id of the feed to be deleted.
     def delete_feed(feed)
-      the_feed = hawk_escape feed
+      the_feed = hawk_escape_id feed
       http_delete("/feeds/#{the_feed}")
     end
 
@@ -306,7 +310,7 @@ module Hawkular::Inventory
     # @param [String] type_name Name of the type
     # @return [ResourceType] ResourceType object just created
     def create_resource_type(feed_id, type_id, type_name)
-      the_feed = hawk_escape feed_id
+      the_feed = hawk_escape_id feed_id
 
       type = create_blueprint
       type[:id] = type_id
@@ -318,7 +322,7 @@ module Hawkular::Inventory
         # 409 We already exist -> that is ok
         raise unless error.status_code == 409
       ensure
-        the_type = hawk_escape type_id
+        the_type = hawk_escape_id type_id
         res = http_get("/feeds/#{the_feed}/resourceTypes/#{the_type}")
       end
       ResourceType.new(res)
@@ -331,9 +335,22 @@ module Hawkular::Inventory
     # @param [String] resource_id Id of the resource
     # @param [String] resource_name Name of the resource
     # @param [Hash<String,Object>] properties Additional properties. Those are not the config-properties
-    # TODO allow to create this as child of another resource
     def create_resource(feed_id, type_path, resource_id, resource_name = nil, properties = {})
-      the_feed = hawk_escape feed_id
+      create_resource_under_resource(feed_id, type_path, [], resource_id, resource_name, properties)
+    end
+
+    # Create a resource of a given type under a given feed. To retrieve that resource
+    # you need to call {#get_resource}
+    # @param [String] feed_id Id of the feed to add the resource to
+    # @param [String] type_path Path of the resource type of this resource
+    # @param [Array<String>] parent_resource_ids Ids of the resources under which we create this resource
+    #                                            (parent to child order)
+    # @param [String] resource_id Id of the resource
+    # @param [String] resource_name Name of the resource
+    # @param [Hash<String,Object>] properties Additional properties. Those are not the config-properties
+    def create_resource_under_resource(feed_id, type_path, parent_resource_ids, resource_id, resource_name = nil,
+                                       properties = {})
+      the_feed = hawk_escape_id feed_id
 
       res = create_blueprint
       res[:properties] = properties
@@ -342,26 +359,32 @@ module Hawkular::Inventory
       res[:resourceTypePath] = type_path
 
       begin
-        http_post("/feeds/#{the_feed}/resources", res)
+        if parent_resource_ids.empty?
+          http_post("/feeds/#{the_feed}/resources", res)
+        else
+          parent_resource_path = parent_resource_ids.map { |id| hawk_escape_id id }.join('/')
+          http_post("/feeds/#{the_feed}/resources/#{parent_resource_path}", res)
+        end
       rescue HawkularException => error
         # 409 We already exist -> that is ok
         raise unless error.status_code == 409
       end
 
-      get_resource feed_id, resource_id, false
+      get_resource feed_id, parent_resource_ids << resource_id, false
     end
 
     # Return the resource object for the passed id
     # @param [String] feed_id Id of the feed this resource belongs to
-    # @param [String] res_id Id of the resource to fetch
+    # @param [Array<String>] res_ids Ids of the resource to fetch (parent to child order)
     # @param [Boolean] fetch_resource_config Should the resource config data be fetched?
-    def get_resource(feed_id, res_id, fetch_resource_config = true)
-      the_feed = hawk_escape feed_id
-      the_resource = hawk_escape res_id
+    def get_resource(feed_id, res_ids, fetch_resource_config = true)
+      the_feed = hawk_escape_id feed_id
+      res_path = res_ids.is_a?(Array) ? (res_ids.map { |id| hawk_escape_id id }.join('/')) : hawk_escape_id(res_ids)
 
-      res = http_get("/feeds/#{the_feed}/resources/#{the_resource}")
+      res = http_get("/feeds/#{the_feed}/resources/#{res_path}")
       if fetch_resource_config
-        p = get_config_data_for_resource(res_id, feed_id)
+        p = get_config_data_for_resource(res_ids, feed_id)
+        res['properties'] ||= {}
         res['properties'].merge p['value'] unless p['value'].nil?
       end
       Resource.new(res)
@@ -375,7 +398,7 @@ module Hawkular::Inventory
     # @param [Numeric] collection_interval
     # @return [MetricType] Type just created or the one from the server if it already existed.
     def create_metric_type(feed_id, metric_type_id, type = 'GAUGE', unit = 'NONE', collection_interval = 60)
-      the_feed = hawk_escape feed_id
+      the_feed = hawk_escape_id feed_id
 
       metric_kind = type.nil? ? 'GAUGE' : type.upcase
       fail "Unknown type #{metric_kind}" unless %w(GAUGE COUNTER AVAILABILITY').include?(metric_kind)
@@ -398,16 +421,17 @@ module Hawkular::Inventory
     # @param [String] feed_id Id of the feed
     # @param [String] metric_id Id of the metric
     # @param [String] type_path Full path of the MetricType
-    # @param [String] resource_id Id of the resource to associate the metric with
+    # @param [Array<String>] res_ids Ids of the resource to associate the metric with (from parent to child)
     # @param [String] metric_name a (display) name for the metric. If nil, #metric_id is used.
     # @return [Metric] The metric created or if it already existed the version from the server
-    def create_metric_for_resource(feed_id, metric_id, type_path, resource_id, metric_name = nil)
-      the_feed = hawk_escape feed_id
-      the_resource = hawk_escape resource_id
+    # rubocop:disable Metrics/CyclomaticComplexity
+    def create_metric_for_resource(feed_id, metric_id, type_path, res_ids, metric_name = nil)
+      the_feed = hawk_escape_id feed_id
+      res_path = res_ids.is_a?(Array) ? (res_ids.map { |id| hawk_escape_id id }.join('/')) : hawk_escape_id(res_ids)
 
       m = {}
       m['id'] = metric_id
-      m['name'] = (metric_name.nil?) ? metric_id : metric_name
+      m['name'] = metric_name || metric_id
       m['metricTypePath'] = type_path
 
       begin
@@ -421,13 +445,14 @@ module Hawkular::Inventory
       the_metric = Metric.new(ret)
 
       begin
-        http_post("/feeds/#{the_feed}/resources/#{the_resource}/metrics", [the_metric.path])
+        http_post("/feeds/#{the_feed}/resources/#{res_path}/metrics", [the_metric.path])
       rescue HawkularException => error
         # 409 We already exist -> that is ok
         raise unless error.status_code == 409
       end
       the_metric
     end
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     # Listen on inventory changes
     # @param [String] type Type of entity for which we want the events.

data/lib/operations/operations_api.rb

@@ -47,14 +47,12 @@ module Hawkular::Operations
     #
     # @option args [String]  :host base url of Hawkular - e.g http://localhost:8080
     # @option args [Hash{String=>String}]  :credentials Hash of {username, password} or token
-    # @option args [Fixnum]  :wait_time Time in seconds describing how long the constructor should block - handshake
     #
     # @example
     #   Hawkular::Operations::OperationsClient.new(credentials: {username: 'jdoe', password: 'password'})
     def initialize(args)
       args[:host] ||= 'localhost:8080'
       args[:credentials] ||= {}
-      args[:wait_time] ||= 0.5
       super(args[:host], args[:credentials])
       # note: if we start using the secured WS, change the protocol to wss://
       url = "ws://#{entrypoint}/hawkular/command-gateway/ui/ws"
@@ -68,7 +66,7 @@ module Hawkular::Operations
           end
         end
       end
-      sleep args[:wait_time]
+      sleep 1
     end
 
     # Closes the WebSocket connection
@@ -204,7 +202,6 @@ module Hawkular::Operations
     end
 
     def handle_message(operation_name, operation_payload, &callback)
-      client = @ws
       # register a callback handler
       @ws.on :message do |msg|
         parsed = msg.data.to_msg_hash
@@ -236,7 +233,7 @@ module Hawkular::Operations
 
     def prepare_payload_hash(ignored_params, hash)
       # it filters out ignored params and convert keys from snake_case to camelCase
-      Hash[hash.select { |k, _| !ignored_params.include? k }.map { |k, v| [to_camel_case(k.to_s).to_sym, v] }]
+      hash.select { |k, _| !ignored_params.include? k }.map { |k, v| [to_camel_case(k.to_s).to_sym, v] }.to_h
     end
 
     def to_camel_case(str)

data/lib/version.rb

@@ -4,5 +4,5 @@
 # @see https://github.com/hawkular
 module Hawkular
   # Version of the Hawkular Ruby Gem
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/integration/inventory_spec.rb

@@ -3,7 +3,7 @@ require "#{File.dirname(__FILE__)}/../spec_helper"
 require 'securerandom'
 
 module Hawkular::Inventory::RSpec
-  describe 'Inventory/Tenants', :vcr do
+  describe 'Tenants', :vcr do
     it 'Should Get Tenant For Explicit Credentials' do
       # get the client for given endpoint for given credentials
       creds = { username: 'jdoe', password: 'password' }
@@ -120,6 +120,17 @@ module Hawkular::Inventory::RSpec
       expect(children.size).to be(21)
     end
 
+    it 'Should list children of nested resource' do
+      wildfly_res_id = 'Local~~'
+      datasource_res_id = 'Local~/subsystem=datasources/data-source=ExampleDS'
+      datasource = @client.get_resource(@state[:feed], [wildfly_res_id, datasource_res_id])
+      expect(datasource.name).to eq('ExampleDS')
+
+      children = @client.list_child_resources(datasource)
+
+      expect(children.size).to be(0)
+    end
+
     it 'Should list recursive children of WildFly' do
       resources = @client.list_resources_for_type(@state[:feed], 'WildFly Server')
       wild_fly = resources[0]
@@ -166,6 +177,22 @@ module Hawkular::Inventory::RSpec
       expect(metrics.size).to be(14)
     end
 
+    it 'Should return config data of given resource' do
+      config = @client.get_config_data_for_resource('Local~~', @state[:feed])
+
+      expect(config['value']['Server State']).to eq('running')
+      expect(config['value']['Product Name']).to eq('Hawkular')
+    end
+
+    it 'Should return config data of given nested resource' do
+      wildfly_res_id = 'Local~~'
+      datasource_res_id = 'Local~/subsystem=datasources/data-source=ExampleDS'
+      config = @client.get_config_data_for_resource([wildfly_res_id, datasource_res_id], @state[:feed])
+
+      expect(config['value']['Username']).to eq('sa')
+      expect(config['value']['Driver Name']).to eq('h2')
+    end
+
     it 'Should create a feed' do
       feed_id = 'feed_1123sdncisud6237ui23hjbdscuzsad'
       ret = @client.create_feed feed_id
@@ -242,6 +269,30 @@ module Hawkular::Inventory::RSpec
       expect(m.name).to eq('Metric1')
     end
 
+    it 'Should create a nested resource and metric on it' do
+      new_feed_id = 'feed_may_exist'
+      @client.create_feed new_feed_id
+      ret = @client.create_resource_type new_feed_id, 'rt-123-1', 'ResourceType'
+      type_path = ret.path
+
+      @client.create_resource new_feed_id, type_path, 'r124-a', 'Res-a'
+      nested_resource = @client.create_resource_under_resource new_feed_id, type_path, ['r124-a'], 'r124-b', 'Res-a'
+      expect(nested_resource.path).to include('r;r124-a/r;r124-b')
+
+      mt = @client.create_metric_type new_feed_id, 'mt-124-a'
+      expect(mt).not_to be_nil
+      expect(mt.id).to eq('mt-124-a')
+
+      m_name = 'MetricUnderNestedResource'
+      m = @client.create_metric_for_resource new_feed_id, 'm-124-a', mt.path, %w(r124-a r124-b), m_name
+      expect(m.id).to eq('m-124-a')
+      expect(m.name).to eq(m_name)
+
+      metrics = @client.list_metrics_for_resource nested_resource
+      expect(metrics.size).to eq(1)
+      expect(metrics[0].id).to eq(m.id)
+    end
+
     it 'Should create and get a resource' do
       feed_id = 'feed_may_exist'
       @client.create_feed feed_id
@@ -268,81 +319,76 @@ module Hawkular::Inventory::RSpec
       expect { @client.create_metric_type feed_id, 'abc', 'FOOBaR' }.to raise_error(RuntimeError, /Unknown type FOOBAR/)
     end
 
-    let(:example) do |e|
-      e
-    end
-
     it 'Client should listen on various inventory events', :websocket do
-      VCR::WebSocket.configure do |c|
-        c.hook_uris = ['localhost:8080']
+      # turn VCR off
+      VCR.eject_cassette
+      VCR.turn_off!(ignore_cassettes: true)
+      WebMock.allow_net_connect!
+
+      prefix = SecureRandom.uuid
+      id_1 = prefix + '-r126'
+      id_2 = prefix + '-r127'
+      id_3 = prefix + '-r128'
+
+      new_resource_events = {}
+      resources_closable = @client.events do |resource|
+        new_resource_events[resource.id] = resource
+      end
+
+      deleted_feed_events = {}
+      feed_deleted_closable = @client.events('feed', 'deleted') do |feed|
+        deleted_feed_events[feed.id] = feed
+      end
+
+      new_resource_types_events = {}
+      resource_type_closable = @client.events('resourcetype') do |resource_type|
+        new_resource_types_events[resource_type.id] = resource_type
       end
 
-      VCR::WebSocket.record(example, self) do
-        # TODO: erb
-        # prefix = SecureRandom.uuid
-        prefix = 'random'
-
-        id_1 = prefix + '-r126'
-        id_2 = prefix + '-r127'
-        id_3 = prefix + '-r128'
-
-        new_resource_events = {}
-        resources_closable = @client.events do |resource|
-          new_resource_events[resource.id] = resource
-        end
-
-        deleted_feed_events = {}
-        feed_deleted_closable = @client.events('feed', 'deleted') do |feed|
-          deleted_feed_events[feed.id] = feed
-        end
-
-        new_resource_types_events = {}
-        resource_type_closable = @client.events('resourcetype') do |resource_type|
-          new_resource_types_events[resource_type.id] = resource_type
-        end
-
-        registered_feed_events = {}
-        feeds_closable = @client.events('feed', 'created') do |feed|
-          registered_feed_events[feed.id] = feed
-        end
-
-        feed_id = prefix + '-feed'
-        resource_type_id = prefix + '-rt-123'
-        resource_type_name = 'ResourceType'
-
-        VCR.use_cassette('Inventory/Helpers/generate_some_events_for_websocket') do
-          @client.create_feed feed_id
-          ret = @client.create_resource_type feed_id, resource_type_id, resource_type_name
-          type_path = ret.path
-
-          # create 3 resources
-          @client.create_resource feed_id, type_path, id_1, 'My Resource 1', 'version' => 1.0
-          @client.create_resource feed_id, type_path, id_2, 'My Resource 2', 'version' => 1.1
-          resources_closable.close
-          @client.create_resource feed_id, type_path, id_3, 'My Resource 3', 'version' => 1.2
-
-          @client.delete_feed feed_id
-        end
-
-        # wait for the data
-        sleep 2 if !VCR::WebSocket.cassette || VCR::WebSocket.cassette.recording?
-        [feed_deleted_closable, resource_type_closable, feeds_closable].each(&:close)
-        expect(new_resource_events[id_1]).not_to be_nil
-        expect(new_resource_events[id_1].properties['version']).to eq(1.0)
-        expect(new_resource_events[id_2]).not_to be_nil
-        expect(new_resource_events[id_2].properties['version']).to eq(1.1)
-        # resource with id_3 should not be among events, because we stopped listening before creating the 3rd one
-        expect(new_resource_events[id_3]).to be_nil
-
-        expect(registered_feed_events[feed_id]).not_to be_nil
-        expect(registered_feed_events[feed_id].id).to eq(feed_id)
-
-        expect(deleted_feed_events[feed_id]).not_to be_nil
-        expect(deleted_feed_events[feed_id].id).to eq(feed_id)
-
-        expect(new_resource_types_events[resource_type_id]).not_to be_nil
-        expect(new_resource_types_events[resource_type_id].id).to eq(resource_type_id)
-        expect(new_resource_types_events[resource_type_id].name).to eq(resource_type_name)
+      registered_feed_events = {}
+      feeds_closable = @client.events('feed', 'created') do |feed|
+        registered_feed_events[feed.id] = feed
+      end
+
+      feed_id = prefix + '-feed'
+      resource_type_id = prefix + '-rt-123'
+      resource_type_name = 'ResourceType'
+      @client.create_feed feed_id
+      ret = @client.create_resource_type feed_id, resource_type_id, resource_type_name
+      type_path = ret.path
+
+      # create 3 resources
+      @client.create_resource feed_id, type_path, id_1, 'My Resource 1', 'version' => 1.0
+      @client.create_resource feed_id, type_path, id_2, 'My Resource 2', 'version' => 1.1
+      resources_closable.close
+      @client.create_resource feed_id, type_path, id_3, 'My Resource 3', 'version' => 1.2
+
+      @client.delete_feed feed_id
+
+      # wait for the data
+      sleep 2
+      [feed_deleted_closable, resource_type_closable, feeds_closable].each(&:close)
+      expect(new_resource_events[id_1]).not_to be_nil
+      expect(new_resource_events[id_1].properties['version']).to eq(1.0)
+      expect(new_resource_events[id_2]).not_to be_nil
+      expect(new_resource_events[id_2].properties['version']).to eq(1.1)
+      # resource with id_3 should not be among events, because we stopped listening before creating the 3rd one
+      expect(new_resource_events[id_3]).to be_nil
+
+      expect(registered_feed_events[feed_id]).not_to be_nil
+      expect(registered_feed_events[feed_id].id).to eq(feed_id)
+
+      expect(deleted_feed_events[feed_id]).not_to be_nil
+      expect(deleted_feed_events[feed_id].id).to eq(feed_id)
+
+      expect(new_resource_types_events[resource_type_id]).not_to be_nil
+      expect(new_resource_types_events[resource_type_id].id).to eq(resource_type_id)
+      expect(new_resource_types_events[resource_type_id].name).to eq(resource_type_name)
+
+      # turn VCR on again if enabled
+      if ENV['VCR_OFF'] != '1'
+        VCR.turn_on!
+        WebMock.disable_net_connect!
       end
     end