hawkular-client 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8d5706d902b60d4a1c404fad9f0d95e043c46eb
-  data.tar.gz: 10935a5c5b4a9cacee09f950590b7dea2c40a581
+  metadata.gz: 7913796f40acecb8ad5eaeca8bb846dbaae63626
+  data.tar.gz: afdf2f08190d90a4f0a4be6bed389e42826c9e8e
 SHA512:
-  metadata.gz: d4c026030662146d6d67ce0ba3da0830a7a7f4c7edef2634bc225af17f0ae0e724aa1adae96964aa2a859e53f225d02456ca982ac5367c5864896f2bb7068294
-  data.tar.gz: 48aff9a3b3b0cd8e5d433b98ceb933434643d8fd58cae797a01d9b960e65a43b6c76796a0d19cb9760b9b3952c7c136e937c817137c9f665e0f1635272fa7c79
+  metadata.gz: 4b02e20b49ef0fb225d99cc736ee506f7eb5f6b318a2e18b4a6671f19643debdf9be69f31e879a3e7069d7f5b78ef4c42c6bcf2cd895704d39e83871b24daf19
+  data.tar.gz: da752848f50298b6385becb2447969d054e54e0721e281356f58c530e1373a8f249cda2090634a084663fa63494fd7a247f65da2894da4c95950ddd57ad57361

data/CHANGES.rdoc

@@ -3,6 +3,18 @@
 This document describes the relevant changes between releases of the
 _hawkular-client_ project.
 
+=== V 2.3.0
+
+* Wrap connection errors in `HawkularConnectionException` (a subclass of `HawkularException`)
+* Make sure the error callback is called on all kinds of errors (if it exists)
+* Use the new Rest-API of Hawkular-Inventory.
+* For authentication errors don't return raw html, but some sensible value
+* Make it explicit that rest-client v2.0 is used to follow ManageIQ
+* Provide parameters for operation definitions (depend on what the agent reports to inventory)
+* Use the new Hawkular-metrics endpoints if the hawkular-metrics version we talk to is >= 0.16
+
+Full list of items can be found at https://github.com/hawkular/hawkular-client-ruby/issues?q=milestone%3A2.3.0+is%3Aclosed
+
 === V 2.2.1
 
 * Fix a regression where URI:HTTP objects were no longer accepted as input for entrypoints.

data/README.rdoc

@@ -128,10 +128,12 @@ Integration tests are recorded and played against cassettes recorded with VCR
     rake spec
 * To run the tests against a live server, set +VCR_OFF+ to +1+ as in
     VCR_OFF=1 rake spec
-* To update the VCR tapes that supports it, set +VCR_UPDATE+ to +1+ as in
+* To update the VCR tapes that supports it (metrics and inventory), set +VCR_UPDATE+ to +1+ as in
     VCR_UPDATE=1 rake spec
-* 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
+* Currently, we support two posible metrics contexts: <code>hawkular-metrics 0.8.0.Final</code> and <code>hawkular-services</code> that contain metrics. If you want to run/re-record the tests only for services, you can skip the other context by <code>SKIP_V8_METRICS=1</code>, or similarly <code>SKIP_SERVICES_METRICS=1</code>. So for instance updating the VCR templates only for hawkular-services would require command:
+    VCR_UPDATE=1 SKIP_V8_METRICS=1 rspec ./spec/integration/metric_spec.rb
+
+For more details consult the {spec readme}[link:spec/README.rdoc].
 
 == Logging
 

data/Rakefile

@@ -2,11 +2,19 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
+desc 'Runs all the specs'
 RSpec::Core::RakeTask.new(:spec) do |task|
   task.pattern = './spec/**/*_spec.rb'
   task.rspec_opts = ['--color']
 end
 
+desc 'Runs the specs for metrics 0.8.0.Final'
+RSpec::Core::RakeTask.new(:'old-metrics') do |task|
+  task.pattern = './spec/integration/metric_spec.rb'
+  task.rspec_opts = ['--color']
+  ENV['SKIP_SERVICES_METRICS'] = '1'
+end
+
 RuboCop::RakeTask.new
 
 task default: [:rubocop, :spec]

data/hawkularclient.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_runtime_dependency('rest-client')
+  gem.add_runtime_dependency('rest-client', '~> 2.0.0')
   gem.add_runtime_dependency('websocket-client-simple', '~> 0.3.0')
   gem.add_runtime_dependency('addressable')
   gem.add_development_dependency('shoulda')

data/lib/hawkular/base_client.rb

@@ -163,6 +163,9 @@ module Hawkular
       attr_reader :message, :status_code
     end
 
+    class HawkularConnectionException < HawkularException
+    end
+
     private
 
     def token_header
@@ -175,7 +178,20 @@ module Hawkular
       headers
     end
 
+    # @!visibility private
+    def connect_error(fault)
+      if fault.is_a?(SocketError)
+        HawkularConnectionException.new(fault.to_s)
+      elsif [Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::EHOSTUNREACH,
+             Errno::EADDRNOTAVAIL, Errno::ENETDOWN, Errno::ENETUNREACH,
+             Errno::ETIMEDOUT].include?(fault.class)
+        HawkularConnectionException.new(fault.to_s, fault.class::Errno)
+      end
+    end
+
     def handle_fault(f)
+      http_code = (f.respond_to?(:http_code) ? f.http_code : 0)
+      fail HawkularException.new('Unauthorized', http_code) if f.instance_of? RestClient::Unauthorized
       if f.respond_to?(:http_body) && !f.http_body.nil?
         begin
           json_body = JSON.parse(f.http_body)
@@ -183,7 +199,9 @@ module Hawkular
         rescue JSON::ParserError
           fault_message = f.http_body
         end
-        fail HawkularException.new(fault_message, (f.respond_to?(:http_code) ? f.http_code : 0))
+        fail HawkularException.new(fault_message, http_code)
+      elsif (connect_error_exception = connect_error(f))
+        fail connect_error_exception
       else
         fail f
       end

data/lib/hawkular/hawkular_client.rb

@@ -58,7 +58,7 @@ module Hawkular
 
     # this is in a dedicated method, because constructor opens the websocket connection to make the handshake
     def init_operations_client
-      Operations::OperationsClient.new(entrypoint: @state[:entrypoint].gsub(/^https?/, 'ws'),
+      Operations::OperationsClient.new(entrypoint: @state[:entrypoint].to_s.sub(/^https?/, 'ws'),
                                        credentials: @state[:credentials],
                                        options: @state[:options])
     end

data/lib/hawkular/hawkular_client_utils.rb

@@ -35,6 +35,7 @@ module HawkularUtilsMixin
   def hawk_escape_id(url_part)
     sub_url = hawk_escape url_part
     sub_url.gsub!('=', '%3d')
+    sub_url.gsub!(';', '%3b')
     sub_url
   end
 end

data/lib/hawkular/inventory/entities.rb

@@ -0,0 +1,234 @@
+# It contains class definitions that are used by the inventory REST client
+module Hawkular::Inventory
+  # A Basic inventory entity with id, name, path and optional properties
+  class BaseEntity
+    # @return [String] Full path of the entity
+    attr_reader :path
+    # @return [String] Name of the entity
+    attr_reader :name
+    # @return [String] Id of the entity
+    attr_reader :id
+    # @return [String] Feed this entity belongs to (or nil in case of a feedless entity)
+    attr_reader :feed
+    # @return [String] Name of the environment for this entity
+    attr_reader :env
+    # @return [String] Properties of this entity
+    attr_reader :properties
+
+    def initialize(hash)
+      @id = hash['id']
+      @path = hash['path']
+      @name = hash['name'] || @id
+      @properties = hash['properties'] || {}
+      @_hash = hash.dup
+
+      return if @path.nil?
+
+      tmp = @path.split('/')
+      tmp.each do |pair|
+        (key, val) = pair.split(';')
+        case key
+        when 'f'
+          @feed = val
+        when 'e'
+          @env = val
+        end
+      end
+    end
+
+    def ==(other)
+      self.equal?(other) || other.class == self.class && other.id == @id
+    end
+
+    # Returns a hash representation of the resource type
+    # @return [Hash<String,Object>] hash of the type
+    def to_h
+      @_hash.dup
+    end
+  end
+
+  # A ResourceType is like a class definition for {Resource}s
+  # ResourceTypes are currently unique per feed, but one can assume
+  # that a two types with the same name of two different feeds are
+  # (more or less) the same.
+  class ResourceType < BaseEntity
+    def initialize(rt_hash)
+      super(rt_hash)
+    end
+  end
+
+  # A Resource is an instantiation of a {ResourceType}
+  class Resource < BaseEntity
+    # @return [String] Full path of the {ResourceType}
+    attr_reader :type_path
+
+    def initialize(res_hash)
+      super(res_hash)
+      if res_hash.key? :resourceTypePath
+        @type_path = res_hash[:resourceTypePath]
+      else
+        @type = res_hash['type']
+        @type_path = res_hash['type']['path']
+      end
+    end
+  end
+
+  # Fields that are common for MetricType and Metric
+  module MetricFields
+    # @return [String] GAUGE, COUNTER, etc.
+    attr_reader :type
+    # @return [String] metric unit such as NONE, BYTES, etc.
+    attr_reader :unit
+    # @return [Long] collection interval in seconds, it has different semantics for MetricType and for Metric
+    #                for MetricType it's a default that will be applied to all the metric of that type,
+    #                in the Metric this can be overridden
+    attr_reader :collection_interval
+  end
+
+  # Definition of a Metric Type inside the inventory.
+  class MetricType < BaseEntity
+    include MetricFields
+
+    def initialize(type_hash)
+      super(type_hash)
+      @type = type_hash['type']
+      @unit = type_hash['unit']
+      @collection_interval = type_hash['collectionInterval']
+    end
+  end
+
+  # Definition of a Metric inside the inventory.
+  class Metric < BaseEntity
+    include MetricFields
+
+    def initialize(metric_hash)
+      super(metric_hash)
+      @type = metric_hash['type']['type']
+      @type_path = metric_hash['type']['path']
+      @unit = metric_hash['type']['unit']
+      @collection_interval = metric_hash['type']['collectionInterval']
+    end
+  end
+
+  class OperationDefinition < BaseEntity
+    attr_reader :params
+
+    def initialize(op_hash)
+      super(op_hash)
+      @params = {}
+      param_list = op_hash['properties']['params']
+      return if param_list.nil?
+      param_list.each do |p|
+        @params.store p['name'], p
+      end
+    end
+  end
+
+  # Definition of a Relationship between two entities in Inventory
+  class Relationship
+    attr_accessor :source_id
+    attr_reader :target_id
+    attr_reader :properties
+    attr_reader :name
+    attr_reader :id
+
+    def initialize(hash = {})
+      if hash.empty?
+        @properties = {}
+        return
+      end
+
+      @source_id = hash['source']
+      @target_id = hash['target']
+      @properties = hash['properties']
+      @name = hash['name']
+      @id = hash['id']
+    end
+
+    def to_h
+      hash = {}
+      hash['source'] = @source_id
+      hash['target'] = @target_id
+      hash['properties'] = @properties
+      hash['name'] = @name
+      hash['id'] = @id
+      hash
+    end
+  end
+
+  class CanonicalPath
+    attr_reader :tenant_id
+    attr_reader :feed_id
+    attr_reader :environment_id
+    attr_reader :resource_ids
+    attr_reader :metric_id
+    attr_reader :resource_type_id
+    attr_reader :metric_type_id
+
+    def initialize(hash)
+      @tenant_id = hash[:tenant_id]
+      @feed_id = hash[:feed_id]
+      @environment_id = hash[:environment_id]
+      @resource_type_id = hash[:resource_type_id]
+      @metric_type_id = hash[:metric_type_id]
+      @resource_ids = hash[:resource_ids]
+      @metric_id = hash[:metric_id]
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity
+    def self.parse(path)
+      fail 'CanonicalPath must not be nil or empty' if path.to_s.strip.length == 0
+      tmp = path.split('/')
+      hash = {}
+      tmp.each do |pair|
+        (key, val) = pair.split(';')
+        case key
+        when 't'
+          hash[:tenant_id] = val
+        when 'f'
+          hash[:feed_id] = val
+        when 'e'
+          hash[:environment_id] = val
+        when 'm'
+          hash[:metric_id] = val
+        when 'r'
+          hash[:resource_ids] = [] if hash[:resource_ids].nil?
+          hash[:resource_ids].push(val)
+        when 'mt'
+          hash[:metric_type_id] = val
+        when 'rt'
+          hash[:resource_type_id] = val
+        end
+      end
+      CanonicalPath.new(hash)
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity
+
+    def ==(other)
+      self.equal?(other) || other.class == self.class && other.state == state
+    end
+
+    def to_s
+      ret = "/t;#{@tenant_id}"
+      ret += "/f;#{@feed_id}" unless @feed_id.nil?
+      ret += "/e;#{@environment_id}" unless @environment_id.nil?
+      ret += "/rt;#{@resource_type_id}" unless @resource_type_id.nil?
+      ret += "/mt;#{@metric_type_id}" unless @metric_type_id.nil?
+      ret += "/m;#{@metric_id}" unless @metric_id.nil?
+      ret += resources_chunk.to_s
+      ret
+    end
+
+    protected
+
+    def state
+      [@tenant_id, @feed_id, @environment_id, @resource_ids, @metric_id, @metric_type_id, @resource_type_id]
+    end
+
+    private
+
+    def resources_chunk
+      @resource_ids.map { |r| "/r;#{r}" }.join unless @resource_ids.nil?
+    end
+  end
+end

data/lib/hawkular/inventory/inventory_api.rb

@@ -2,6 +2,8 @@ require 'hawkular/base_client'
 require 'websocket-client-simple'
 require 'json'
 
+require 'hawkular/inventory/entities'
+
 # Inventory module provides access to the Hawkular Inventory REST API.
 # @see http://www.hawkular.org/docs/rest/rest-inventory.html
 #
@@ -10,6 +12,8 @@ require 'json'
 module Hawkular::Inventory
   # Client class to interact with Hawkular Inventory
   class InventoryClient < Hawkular::BaseClient
+    attr_reader :version
+
     # Create a new Inventory Client
     # @param entrypoint [String] base url of Hawkular-inventory - e.g
     #   http://localhost:8080/hawkular/inventory
@@ -20,21 +24,7 @@ module Hawkular::Inventory
       @entrypoint = entrypoint
       super(entrypoint, credentials, options)
       version = fetch_version_and_status['Implementation-Version']
-      major, minor = version.scan(/\d+/).map(&:to_i)
-      @entrypoint << '/deprecated' unless major == 0 && minor < 17
-    end
-
-    def fetch_version_and_status
-      if @entrypoint.end_with? '/deprecated'
-        begin
-          backup_entrypoint = @entrypoint
-          @entrypoint = @entrypoint[0...-'/deprecated'.size]
-          return http_get('/status')
-        ensure
-          @entrypoint = backup_entrypoint
-        end
-      end
-      http_get('/status')
+      @version = version.scan(/\d+/).map(&:to_i)
     end
 
     # Creates a new Inventory Client
@@ -52,6 +42,8 @@ module Hawkular::Inventory
     # If no credentials are passed, the ones from the constructor are used
     # @param credentials [Hash{String=>String}] Hash of username, password, token(optional)
     # @return [String] tenant id
+    # @deprecated this doesn't provide any value, because it merely returns the tenant ID which is known before the
+    # call anyway.
     def get_tenant(credentials = {})
       creds = credentials.empty? ? @credentials : credentials
       auth_header = { Authorization: base_64_credentials(creds) }
@@ -61,16 +53,10 @@ module Hawkular::Inventory
       ret['id']
     end
 
-    # TODO: revisit and potentially move to Base ?
-    def impersonate!(credentials = {})
-      @tenant = get_tenant(credentials)
-      @options[:tenant] = @tenant
-    end
-
     # List feeds in the system
     # @return [Array<String>] List of feed ids
-    def list_feeds(_environment = 'test')
-      ret = http_get('feeds')
+    def list_feeds
+      ret = http_get('/traversal/type=f')
       ret.map { |f| f['id'] }
     end
 
@@ -79,10 +65,10 @@ module Hawkular::Inventory
     # @return [Array<ResourceType>] List of types, that can be empty
     def list_resource_types(feed_id = nil)
       if feed_id.nil?
-        ret = http_get('/resourceTypes')
+        ret = http_get('/traversal/type=rt')
       else
         the_feed = hawk_escape_id feed_id
-        ret = http_get("/feeds/#{the_feed}/resourceTypes")
+        ret = http_get("/traversal/f;#{the_feed}/type=rt")
       end
       ret.map { |rt| ResourceType.new(rt) }
     end
@@ -94,7 +80,7 @@ module Hawkular::Inventory
     def list_resources_for_feed(feed_id, fetch_properties = false, filter = {})
       fail 'Feed id must be given' unless feed_id
       the_feed = hawk_escape_id feed_id
-      ret = http_get("/feeds/#{the_feed}/resources")
+      ret = http_get("/traversal/f;#{the_feed}/type=r")
       to_filter = ret.map do |r|
         if fetch_properties
           p = get_config_data_for_resource(r['path'])
@@ -117,10 +103,9 @@ module Hawkular::Inventory
       resource_type_id = path.resource_type_id
       feed_id = path.feed_id
       if feed_id.nil?
-        ret = http_get("resourceTypes/#{resource_type_id}/resources")
+        ret = http_get("/traversal/rt;#{resource_type_id}/rl;defines/type=r")
       else
-
-        ret = http_get("/feeds/#{feed_id}/resourceTypes/#{resource_type_id}/resources")
+        ret = http_get("/traversal/f;#{feed_id}/rt;#{resource_type_id}/rl;defines/type=r")
       end
       ret.map do |r|
         if fetch_properties && !feed_id.nil?
@@ -136,10 +121,9 @@ module Hawkular::Inventory
     # @return [Hash<String,Object] Hash with additional data
     def get_config_data_for_resource(resource_path)
       path = resource_path.is_a?(CanonicalPath) ? resource_path : CanonicalPath.parse(resource_path)
-      resource_path = path.resource_ids.join('/')
+      resource_path = 'r;' + path.resource_ids.join('/r;')
       feed_id = path.feed_id
-      query = generate_query_params dataType: 'configuration'
-      http_get("feeds/#{feed_id}/resources/#{resource_path}/data#{query}")
+      http_get("/entity/f;#{feed_id}/#{resource_path}/d;configuration")
     rescue
       {}
     end
@@ -152,10 +136,14 @@ module Hawkular::Inventory
     #   Can be empty
     def list_child_resources(parent_res_path, recursive = false)
       path = parent_res_path.is_a?(CanonicalPath) ? parent_res_path : CanonicalPath.parse(parent_res_path)
-      parent_resource_path = path.resource_ids.join('/')
+      parent_resource_path = 'r;' + path.resource_ids.join('/r;')
       feed_id = path.feed_id
-      which_children = (recursive ? '/recursiveChildren' : '/children')
-      ret = http_get("/feeds/#{feed_id}/resources/#{parent_resource_path}#{which_children}")
+
+      if recursive
+        ret = http_get("/traversal/f;#{feed_id}/#{parent_resource_path}/recursive;over=isParentOf;type=r")
+      else
+        ret = http_get("/traversal/f;#{feed_id}/#{parent_resource_path}/type=r")
+      end
       ret.map { |r| Resource.new(r) }
     end
 
@@ -168,9 +156,14 @@ module Hawkular::Inventory
       query_params = {
         sort: '__targetCp'
       }
-      query_params[:named] = named unless named.nil?
+
       query = generate_query_params query_params
-      ret = http_get("/path#{path}/relationships#{query}")
+      if named.nil?
+        ret = http_get("/traversal#{path}/relationships#{query}")
+      else
+        ret = http_get("/traversal#{path}/relationships;name=#{named}#{query}")
+      end
+
       ret.map { |r| Relationship.new(r) }
     end
 
@@ -183,9 +176,14 @@ module Hawkular::Inventory
       query_params = {
         sort: '__targetCp'
       }
-      query_params[:named] = named unless named.nil?
+
       query = generate_query_params query_params
-      ret = http_get("/feeds/#{the_feed}/relationships#{query}")
+      if named.nil?
+        ret = http_get("/traversal/f;#{the_feed}/relationships#{query}")
+      else
+        ret = http_get("/traversal;/f;#{the_feed}/relationships;named=#{named}#{query}")
+      end
+
       ret.map { |r| Relationship.new(r) }
     rescue
       []
@@ -196,29 +194,9 @@ module Hawkular::Inventory
     # @return inventory entity
     def get_entity(path)
       c_path = path.is_a?(CanonicalPath) ? path : CanonicalPath.parse(path)
-      http_get("path#{c_path}")
+      http_get("/entity/#{c_path}")
     end
 
-    # [15:01:51]  <jkremser>	pilhuhn, this works for me curl -XPOST
-    #   -H "Content-Type: application/json"
-    #   -u jdoe:password -d
-    # '{"id" : "foo", "source": "/t;28026b36-8fe4-4332-84c8-524e173a68bf/f;localhost",
-    # "target": "/t;28026b36-8fe4-4332-84c8-524e173a68bf/f;localhost/r;localhost~Local~~/
-    #      r;localhost~Local~%2Fsubsystem=hawkular-bus-broker",
-    # "name": "isRelatedTo"}'
-    #    'http://localhost:8080/hawkular/inventory/feeds/localhost/relationships'
-    #
-    # def create_relationship(source_resource, target_resource, name, properties = {})
-    #   rel = Relationship.new
-    #   rel.source_id = source_resource.path
-    #   rel.target_id = target_resource.path
-    #   rel.name = name
-    #   rel.properties = properties
-    #
-    #   http_post('/feeds/' + source_resource.feed + '/relationships',
-    #             rel.to_h)
-    # end
-
     # List the metrics for the passed metric type. If feed is not passed in the path,
     # all the metrics across all the feeds of a given type will be retrieved
     # This method may perform multiple REST calls.
@@ -230,16 +208,12 @@ module Hawkular::Inventory
       metric_type_id = path.metric_type_id
       feed_id = path.feed_id
       if feed_id.nil?
-        type_hash = http_get("metricTypes/#{metric_type_id}")
+        ret = http_get("/traversal/mt;#{metric_type_id}/rl;defines/type=m")
       else
-        type_hash = http_get("/feeds/#{feed_id}/metricTypes/#{metric_type_id}")
+        ret = http_get("/traversal/f;#{feed_id}/mt;#{metric_type_id}/rl;defines/type=m")
       end
 
-      relations = list_relationships(type_hash['path'], 'defines')
-      relations.map do |rel|
-        metric_hash = get_entity rel.target_id.to_s
-        Metric.new(metric_hash)
-      end
+      ret.map { |m| Metric.new(m) }
     rescue
       []
     end
@@ -255,21 +229,14 @@ module Hawkular::Inventory
       resource_type_id = path.resource_type_id
       feed_id = path.feed_id
 
+      query = generate_query_params sort: 'id'
       if feed_id.nil?
-        ret = http_get("resourceTypes/#{resource_type_id}/resources")
+        ret = http_get("/traversal/rt;#{resource_type_id}/rl;defines/type=r/rl;incorporates/type=m#{query}")
       else
-        ret = http_get("feeds/#{feed_id}/resourceTypes/#{resource_type_id}/resources")
-      end
-      ret.flat_map do |r|
-        path = CanonicalPath.parse(r['path'])
-        query = generate_query_params sort: 'id'
-        if !path.feed_id.nil?
-          nested_ret = http_get("feeds/#{path.feed_id}/resources/#{path.resource_ids.join('/')}/metrics#{query}")
-        else
-          nested_ret = http_get("#{path.environment_id}/resources/#{path.resource_ids.join('/')}/metrics#{query}")
-        end
-        nested_ret.map { |m| Metric.new(m) }
+        ret = http_get(
+          "/traversal/f;#{feed_id}/rt;#{resource_type_id}/rl;defines/type=r/rl;incorporates/type=m#{query}")
       end
+      ret.map { |m| Metric.new(m) }
     end
 
     # List metric (definitions) for the passed resource. It is possible to filter down the
@@ -289,10 +256,10 @@ module Hawkular::Inventory
     def list_metrics_for_resource(resource_path, filter = {})
       path = resource_path.is_a?(CanonicalPath) ? resource_path : CanonicalPath.parse(resource_path)
       feed_id = path.feed_id
-      resource_path_escaped = path.resource_ids.join('/')
+      resource_path_escaped = 'r;' + path.resource_ids.join('/r;')
 
       query = generate_query_params sort: 'id'
-      ret = http_get("/feeds/#{feed_id}/resources/#{resource_path_escaped}/metrics#{query}")
+      ret = http_get("/traversal/f;#{feed_id}/#{resource_path_escaped}/rl;incorporates/type=m#{query}")
       to_filter = ret.map { |m| Metric.new(m) }
       filter_entities(to_filter, filter)
     end
@@ -307,12 +274,12 @@ module Hawkular::Inventory
       feed[:name] = feed_name
 
       begin
-        return http_post('/feeds/', feed)
+        return http_post('/entity/feed', feed)
       rescue HawkularException  => error
         # 409 We already exist -> that is ok
         if error.status_code == 409
           the_feed = hawk_escape_id feed_id
-          http_get("/feeds/#{the_feed}")
+          http_get("/entity/f;#{the_feed}")
         else
           raise
         end
@@ -323,7 +290,7 @@ module Hawkular::Inventory
     # @param feed_id Id of the feed to be deleted.
     def delete_feed(feed_id)
       the_feed = hawk_escape_id feed_id
-      http_delete("/feeds/#{the_feed}")
+      http_delete("/entity/f;#{the_feed}")
     end
 
     # Create a new resource type
@@ -339,13 +306,13 @@ module Hawkular::Inventory
       type[:name] = type_name
 
       begin
-        http_post("/feeds/#{the_feed}/resourceTypes", type)
+        http_post("/entity/f;#{the_feed}/resourceType", type)
       rescue HawkularException => error
         # 409 We already exist -> that is ok
         raise unless error.status_code == 409
       ensure
         the_type = hawk_escape_id type_id
-        res = http_get("/feeds/#{the_feed}/resourceTypes/#{the_type}")
+        res = http_get("/entity/f;#{the_feed}/rt;#{the_type}")
       end
       ResourceType.new(res)
     end
@@ -381,11 +348,11 @@ module Hawkular::Inventory
 
       begin
         if parent_res_path.nil?
-          res = http_post("/feeds/#{feed_id}/resources", res)
+          res = http_post("/entity/f;#{feed_id}/resource", res)
         else
           path = parent_res_path.is_a?(CanonicalPath) ? parent_res_path : CanonicalPath.parse(parent_res_path)
-          resource_path = path.resource_ids.join('/')
-          res = http_post("/feeds/#{feed_id}/resources/#{resource_path}", res)
+          resource_path = 'r;' + path.resource_ids.join('/r;')
+          res = http_post("/entity/f;#{feed_id}/#{resource_path}/resource", res)
         end
       rescue HawkularException => error
         # 409 We already exist -> that is ok
@@ -400,9 +367,9 @@ module Hawkular::Inventory
     def get_resource(resource_path, fetch_resource_config = true)
       path = resource_path.is_a?(CanonicalPath) ? resource_path : CanonicalPath.parse(resource_path)
       feed_id = path.feed_id
-      res_path = path.resource_ids.join('/')
+      res_path = 'r;' + path.resource_ids.join('/r;')
 
-      res = http_get("/feeds/#{feed_id}/resources/#{res_path}")
+      res = http_get("/entity/f;#{feed_id}/#{res_path}")
       if fetch_resource_config
         p = get_config_data_for_resource(resource_path)
         res['properties'] ||= {}
@@ -427,13 +394,13 @@ module Hawkular::Inventory
       mt = build_metric_type_hash(collection_interval, metric_kind, metric_type_id, unit)
 
       begin
-        http_post("/feeds/#{the_feed}/metricTypes", mt)
+        http_post("/entity/f;#{the_feed}/metricType", mt)
       rescue HawkularException => error
         # 409 We already exist -> that is ok
         raise unless error.status_code == 409
       end
 
-      new_mt = http_get("/feeds/#{the_feed}/metricTypes/#{metric_type_id}")
+      new_mt = http_get("/entity/f;#{the_feed}/mt;#{metric_type_id}")
 
       MetricType.new(new_mt)
     end
@@ -445,8 +412,13 @@ module Hawkular::Inventory
       parsed_path = CanonicalPath.parse(resource_type_path.to_s)
       feed_id = parsed_path.feed_id
       resource_type_id = parsed_path.resource_type_id
-      ret = http_get("/feeds/#{feed_id}/resourceTypes/#{resource_type_id}/operationTypes")
-      ret.map { |ot| ot['id'] }
+      ret = http_get("/traversal/f;#{feed_id}/rt;#{resource_type_id}/type=ot")
+      res = {}
+      ret.each do |ot|
+        od = OperationDefinition.new ot
+        res.store od.name, od
+      end
+      res
     end
 
     # List operation definitions (types) for a given resource
@@ -467,7 +439,7 @@ module Hawkular::Inventory
       type_path = metric_type_path.is_a?(CanonicalPath) ? metric_type_path : CanonicalPath.parse(metric_type_path)
       feed_id = type_path.feed_id
       res_path = resource_path.is_a?(CanonicalPath) ? resource_path : CanonicalPath.parse(resource_path)
-      res_path_str = res_path.resource_ids.join('/')
+      res_path_str = 'r;' + res_path.resource_ids.join('/r;')
 
       m = {}
       m['id'] = metric_id
@@ -475,17 +447,20 @@ module Hawkular::Inventory
       m['metricTypePath'] = type_path.to_s
 
       begin
-        http_post("/feeds/#{feed_id}/metrics", m)
+        http_post("/entity/f;#{feed_id}/metric", m)
       rescue HawkularException => error
         # 409 We already exist -> that is ok
         raise unless error.status_code == 409
       end
 
-      ret = http_get("/feeds/#{feed_id}/metrics/#{metric_id}")
+      ret = http_get("/entity/f;#{feed_id}/m;#{metric_id}")
       the_metric = Metric.new(ret)
 
       begin
-        http_post("/feeds/#{feed_id}/resources/#{res_path_str}/metrics", [the_metric.path])
+        rl = {}
+        rl['otherEnd'] = the_metric.path.to_s
+        rl['name'] = 'incorporates'
+        http_post("/entity/f;#{feed_id}/#{res_path_str}/relationship", [rl])
       rescue HawkularException => error
         # 409 We already exist -> that is ok
         raise unless error.status_code == 409
@@ -500,8 +475,18 @@ module Hawkular::Inventory
     # Allowed values: created, updated, deleted, copied, registered
     def events(type = 'resource', action = 'created')
       tenant_id = get_tenant
+
+      base64_creds = ["#{@credentials[:username]}:#{@credentials[:password]}"].pack('m').delete("\r\n")
+      ws_options = {
+        headers: {
+          Authorization: 'Basic ' + base64_creds,
+          Accept: 'application/json'
+        }
+      }
+      ws_options[:headers][:'Hawkular-Tenant'] = tenant_id
+
       url = "#{entrypoint.gsub(/https?/, 'ws')}/ws/events?tenantId=#{tenant_id}&type=#{type}&action=#{action}"
-      @ws = WebSocket::Client::Simple.connect url do |client|
+      @ws = WebSocket::Client::Simple.connect url, ws_options do |client|
         client.on :message do |msg|
           parsed_message = JSON.parse(msg.data)
           entity = case type
@@ -527,6 +512,13 @@ module Hawkular::Inventory
       @ws.close
     end
 
+    # Return version and status information for the used version of Hawkular-Inventory
+    # @return [Hash{String=>String}]
+    #         ('Implementation-Version', 'Built-From-Git-SHA1', 'Status')
+    def fetch_version_and_status
+      http_get('/status')
+    end
+
     private
 
     # Creates a hash with the fields required by the Blueprint api in Hawkular-Inventory
@@ -562,215 +554,4 @@ module Hawkular::Inventory
       end
     end
   end
-
-  # A Basic inventory entity with id, name, path and optional properties
-  class BaseEntity
-    # @return [String] Full path of the entity
-    attr_reader :path
-    # @return [String] Name of the entity
-    attr_reader :name
-    # @return [String] Name of the entity
-    attr_reader :id
-    # @return [String] Feed this entity belongs to (or nil in case of a feedless entity)
-    attr_reader :feed
-    # @return [String] Name of the environment for this entity
-    attr_reader :env
-    # @return [String] Properties of this entity
-    attr_reader :properties
-
-    def initialize(hash)
-      @id = hash['id']
-      @path = hash['path']
-      @name = hash['name'] || @id
-      @properties = hash['properties'] || {}
-      @_hash = hash.dup
-
-      return if @path.nil?
-
-      tmp = @path.split('/')
-      tmp.each do |pair|
-        (key, val) = pair.split(';')
-        case key
-        when 'f'
-          @feed = val
-        when 'e'
-          @env = val
-        end
-      end
-    end
-
-    def ==(other)
-      self.eql?(other) || other.class == self.class && other.id == @id
-    end
-
-    # Returns a hash representation of the resource type
-    # @return [Hash<String,Object>] hash of the type
-    def to_h
-      @_hash.dup
-    end
-  end
-
-  # A ResourceType is like a class definition for {Resource}s
-  # ResourceTypes are currently unique per feed, but one can assume
-  # that a two types with the same name of two different feeds are
-  # (more or less) the same.
-  class ResourceType < BaseEntity
-    def initialize(rt_hash)
-      super(rt_hash)
-    end
-  end
-
-  # A Resource is an instantiation of a {ResourceType}
-  class Resource < BaseEntity
-    # @return [String] Full path of the {ResourceType}
-    attr_reader :type_path
-
-    def initialize(res_hash)
-      super(res_hash)
-      @type = res_hash['type']
-      @type_path = res_hash['type']['path']
-    end
-  end
-
-  class MetricType < BaseEntity
-    # @return [String] GAUGE, COUNTER, etc.
-    attr_reader :type
-    # @return [String] metric unit such as NONE, BYTES, etc.
-    attr_reader :unit
-    # @return [Long] collection interval in seconds
-    attr_reader :collection_interval
-
-    def initialize(type_hash)
-      super(type_hash)
-      @type = type_hash['type']
-      @unit = type_hash['unit']
-      @collection_interval = type_hash['collectionInterval']
-    end
-  end
-
-  # Definition of a Metric inside the inventory.
-  class Metric < BaseEntity
-    # @return [String] GAUGE, COUNTER, etc.
-    attr_reader :type
-    # @return [String] metric unit such as NONE, BYTES, etc.
-    attr_reader :unit
-    # @return [Long] collection interval in seconds
-    attr_reader :collection_interval
-
-    def initialize(metric_hash)
-      super(metric_hash)
-      @type = metric_hash['type']['type']
-      @type_path = metric_hash['type']['path']
-      @unit = metric_hash['type']['unit']
-      @collection_interval = metric_hash['type']['collectionInterval']
-    end
-  end
-
-  # Definition of a Relationship between two entities in Inventory
-  class Relationship
-    attr_accessor :source_id
-    attr_reader :target_id
-    attr_reader :properties
-    attr_reader :name
-    attr_reader :id
-
-    def initialize(hash = {})
-      if hash.empty?
-        @properties = {}
-        return
-      end
-
-      @source_id = hash['source']
-      @target_id = hash['target']
-      @properties = hash['properties']
-      @name = hash['name']
-      @id = hash['id']
-    end
-
-    def to_h
-      hash = {}
-      hash['source'] = @source_id
-      hash['target'] = @target_id
-      hash['properties'] = @properties
-      hash['name'] = @name
-      hash['id'] = @id
-      hash
-    end
-  end
-
-  class CanonicalPath
-    attr_reader :tenant_id
-    attr_reader :feed_id
-    attr_reader :environment_id
-    attr_reader :resource_ids
-    attr_reader :metric_id
-    attr_reader :resource_type_id
-    attr_reader :metric_type_id
-
-    def initialize(hash)
-      @tenant_id = hash[:tenant_id]
-      @feed_id = hash[:feed_id]
-      @environment_id = hash[:environment_id]
-      @resource_type_id = hash[:resource_type_id]
-      @metric_type_id = hash[:metric_type_id]
-      @resource_ids = hash[:resource_ids]
-      @metric_id = hash[:metric_id]
-    end
-
-    # rubocop:disable Metrics/CyclomaticComplexity
-    def self.parse(path)
-      fail 'CanonicalPath must not be nil or emtpy' if path.to_s.strip.length == 0
-      tmp = path.split('/')
-      hash = {}
-      tmp.each do |pair|
-        (key, val) = pair.split(';')
-        case key
-        when 't'
-          hash[:tenant_id] = val
-        when 'f'
-          hash[:feed_id] = val
-        when 'e'
-          hash[:environment_id] = val
-        when 'm'
-          hash[:metric_id] = val
-        when 'r'
-          hash[:resource_ids] = [] if hash[:resource_ids].nil?
-          hash[:resource_ids].push(val)
-        when 'mt'
-          hash[:metric_type_id] = val
-        when 'rt'
-          hash[:resource_type_id] = val
-        end
-      end
-      CanonicalPath.new(hash)
-    end
-    # rubocop:enable Metrics/CyclomaticComplexity
-
-    def ==(other)
-      self.eql?(other) || other.class == self.class && other.state == state
-    end
-
-    def to_s
-      ret = "/t;#{@tenant_id}"
-      ret += "/f;#{@feed_id}" unless @feed_id.nil?
-      ret += "/e;#{@environment_id}" unless @environment_id.nil?
-      ret += "/rt;#{@resource_type_id}" unless @resource_type_id.nil?
-      ret += "/mt;#{@metric_type_id}" unless @metric_type_id.nil?
-      ret += "/m;#{@metric_id}" unless @metric_id.nil?
-      ret += resources_chunk.to_s
-      ret
-    end
-
-    protected
-
-    def state
-      [@tenant_id, @feed_id, @environment_id, @resource_ids, @metric_id, @metric_type_id, @resource_type_id]
-    end
-
-    private
-
-    def resources_chunk
-      @resource_ids.map { |r| "/r;#{r}" }.join unless @resource_ids.nil?
-    end
-  end
 end