Fix the current ops issues

lib/hawkular/operations/operations_api.rb

@@ -53,14 +53,30 @@ def to_msg_hash
     # @example
     #   Hawkular::Operations::OperationsClient.new(credentials: {username: 'jdoe', password: 'password'})
     def initialize(args)
+      ep = args[:entrypoint]
+
+      unless ep.nil?
+        uri = URI.parse ep
+        args[:host] ||= "#{uri.host}:#{uri.port}"
+      end
+
       args[:host] ||= 'localhost:8080'
       args[:credentials] ||= {}
       args[:options] ||= {}
       args[:wait_time] ||= 0.5
       super(args[:host], args[:credentials], args[:options])
       # note: if we start using the secured WS, change the protocol to wss://
-      url = "ws://#{entrypoint}/hawkular/command-gateway/ui/ws"
-      @ws = Simple.connect url do |client|
+      url = "ws://#{args[:host]}/hawkular/command-gateway/ui/ws"
+      ws_options = {}
+      creds = args[:credentials]
+      incoming_opts = args[:options]
+      ws_options[:headers] = { 'Authorization' => 'Basic ' +
+          ["#{creds[:username]}:#{creds[:password]}"].pack('m').delete("\r\n"),
+                               'Hawkular-Tenant' => incoming_opts[:tenant],
+                               'Accept' => 'application/json'
+      }
+
+      @ws = Simple.connect url, ws_options do |client|
         client.on(:message, once: true) do |msg|
           parsed_message = msg.data.to_msg_hash
           puts parsed_message if ENV['HAWKULARCLIENT_LOG_RESPONSE']

spec/integration/operations_spec.rb

@@ -14,22 +14,47 @@ module Hawkular::Operations::RSpec
     end
 
     it 'should be established' do
-      WebSocketVCR.configure do |c|
-        c.hook_uris = [HOST]
-      end
+      # WebSocketVCR.configure do |c|
+      #   c.hook_uris = [HOST]
+      # end
 
-      WebSocketVCR.record(example, self) do
+      # WebSocketVCR.record(example, self) do
         client = OperationsClient.new(host: HOST,
                                       wait_time: WebSocketVCR.live? ? 1.5 : 0,
                                       credentials: {
                                         username: 'jdoe',
                                         password: 'password'
+                                      },
+                                      options: {
+                                          tenant: 'hawkular'
                                       })
         ws = client.ws
         expect(ws).not_to be nil
         expect(ws.open?).to be true
-      end
-    end
+#      end
+     end
+
+    it 'should be established2' do
+      # WebSocketVCR.configure do |c|
+      #   c.hook_uris = [HOST]
+      # end
+
+      # WebSocketVCR.record(example, self) do
+      ep = URI::HTTP.build(:host => 'acme.org', :port => 42).to_s
+        client = OperationsClient.new(entrypoint: ep,
+                                      wait_time: WebSocketVCR.live? ? 1.5 : 0,
+                                      credentials: {
+                                        username: 'jdoe',
+                                        password: 'password'
+                                      },
+                                      options: {
+                                          tenant: 'hawkular'
+                                      })
+        ws = client.ws
+        expect(ws).not_to be nil
+        expect(ws.open?).to be true
+#      end
+     end
   end
 
   describe 'Operation/Operation', :websocket, vcr: { decode_compressed_response: true } do

spec/spec_helper.rb

@@ -165,7 +165,7 @@ def record(prefix, bindings, explicit_cassette_name, example: nil)
   if ENV['VCR_OFF'] == '1'
     VCR.eject_cassette
     VCR.turn_off!(ignore_cassettes: true)
-    WebSocketVCR.turn_off!
+    WebSocketVCR.turn_off! # TODO this does not work the impl is empty
     WebMock.allow_net_connect!
     puts 'VCR is turned off!'
   end