trisulrp 2.2.8 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6505de68c0440f698d7998fad817a18231e3aae1
-  data.tar.gz: e89a8c5c31edd5d78cd24596c9db80560a5dded4
+  metadata.gz: 5c2e757a7bc1175c201b874b019355dcc7767195
+  data.tar.gz: 726025203f6357c6d9534a3fcacd96323681a3d8
 SHA512:
-  metadata.gz: e8c87d89c29d4cda79978ecb101e28350a24adb3035187bccb6882bfdd0c949ee1d74272211a7fc16289e03073fe2b2011e7074a2ca1875d52295d6d448740a4
-  data.tar.gz: 367584157cb097aab35cabfbc72bafe038fea6718e993ab702728b5092823ec77f8284d7d6f3dcd50817898c873f7cb6f80fc7be94bd489eec8694aec6a0808e
+  metadata.gz: 879228c4ceffd86ea132bed1c2262351d6d40a373d992761a272ceecee97df0ba32286a66b8e2a951203365dd2a6ddbe3250a37aa464aa320f387345ab5dae7d
+  data.tar.gz: 47ae512ff07dda3f2af5e1db5296f611c4700bdea578150e4596ae70b9b3c282bf661bde4a63933e186040f57870f60b0b6b43b8cfdfb1485159a7c5137ef718

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 # Add dependencies required to use your gem here.
-gem "ruby-protocol-buffers"
+gem "protobuf"
 
 
 # Add dependencies to develop your gem here.
@@ -9,6 +9,6 @@ gem "ruby-protocol-buffers"
 group :development do
   gem "shoulda" 
   gem "bundler"
-  gem "jeweler"
+  gem "juwelier"
   gem "simplecov" 
 end

data/Rakefile

@@ -9,8 +9,8 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "trisulrp"
   gem.homepage = "http://github.com/vivekrajan/trisulrp"
@@ -24,7 +24,7 @@ Jeweler::Tasks.new do |gem|
   #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
-Jeweler::RubygemsDotOrgTasks.new
+Juwelier::RubygemsDotOrgTasks.new
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-2.2.8
+3.1.1

data/lib/trisulrp.rb

@@ -14,10 +14,8 @@ require 'trisulrp/trp.pb'
 require 'trisulrp/guids.rb'
 require 'trisulrp/keys.rb'
 require 'trisulrp/protocol.rb'
-require 'trisulrp/utils.rb'
 
 include TrisulRP::Protocol
 include TrisulRP::Guids
-include TrisulRP::Utils
 include TrisulRP::Keys
 

data/lib/trisulrp/protocol.rb

@@ -6,6 +6,7 @@
 require 'openssl'
 require 'socket'
 require 'time'
+require 'bigdecimal'
 
 begin
 FFI_RZMQ_AVAIL=true
@@ -117,27 +118,6 @@ module TrisulRP::Protocol
   # raises an error if the server returns an ErrorResponse - this contains an error_message field
   # which can tell you what went wrong
   #
-  def get_response(conn,trp_request)
-    outbuf=""
-    outbuf=trp_request.serialize_to_string
-
-	conn.write([outbuf.length].pack("N*"))
-	conn.write(outbuf)
-
-    inbuf=""
-	inbuf = conn.read(4)
-    buflenarr=inbuf.unpack("N*")
-    datalen=buflenarr[0]
-    dataarray=conn.read(datalen)
-    resp =TRP::Message.new
-    resp.parse dataarray
-    if resp.trp_command == TRP::Message::Command::ERROR_RESPONSE
-		print "TRP ErrorResponse: #{resp.error_response.error_message}\n"
-		raise resp.error_response.error_message
-	end
-    yield unwrap_response(resp) if block_given?
-    return unwrap_response(resp)
-  end
 
   # Using ZMQ to Dispatch request to server & get response 
   #
@@ -158,35 +138,61 @@ module TrisulRP::Protocol
   # raises an error if the server returns an ErrorResponse - this contains an error_message field
   # which can tell you what went wrong
   #
-  def get_response_zmq(endpoint, trp_request)
+  def get_response_zmq(endpoint, trp_request, timeout_seconds = -1 )
+
 
     outbuf=""
 
 	# out
-    outbuf=trp_request.serialize_to_string
+   outbuf=trp_request.encode
 	ctx=ZMQ::Context.new
 	sock = ctx.socket(ZMQ::REQ)
+
+  # time out for context termination
+  sock.setsockopt(ZMQ::LINGER, 5*1_000)
+
+	# Initialize a poll set
+	poller = ZMQ::Poller.new
+	poller.register(sock, ZMQ::POLLIN)
+  
+
 	sock.connect(endpoint)
 	sock.send_string(outbuf)
 
-
-	#in 
-	dataarray=""
-	sock.recv_string(dataarray)
-    resp =TRP::Message.new
-    resp.parse dataarray
-    if resp.trp_command == TRP::Message::Command::ERROR_RESPONSE
-		print "TRP ErrorResponse: #{resp.error_response.error_message}\n"
-		sock.close
+	ret = poller.poll(timeout_seconds * 1_000 )
+	  if  ret == -1 
+			sock.close
+			ctx.terminate 
+			raise "zeromq poll error #{endpoint} " 
+	  end
+	  if  ret == 0 
+			sock.close
+			ctx.terminate 
+			raise "no registerted sockets #{endpoint} " 
+	  end
+
+	poller.readables.each do |rsock|
+
+		#in 
+		dataarray=""
+		rsock.recv_string(dataarray)
+		resp =TRP::Message.new
+		resp.decode dataarray
+		if resp.trp_command.to_i == TRP::Message::Command::ERROR_RESPONSE
+			print "TRP ErrorResponse: #{resp.error_response.error_message}\n"
+			rsock.close
+			ctx.terminate 
+			raise resp.error_response.error_message
+		end
+
+		rsock.close
 		ctx.terminate 
-		raise resp.error_response.error_message
-	end
-
-	sock.close
-	ctx.terminate 
+    unwrap_resp = unwrap_response(resp)
+    unwrap_resp.instance_variable_set("@trp_resp_command_id",resp.trp_command.to_i)
+		yield unwrap_resp if block_given?
+		return unwrap_resp
 
-    yield unwrap_response(resp) if block_given?
-    return unwrap_response(resp)
+    end
 
   end
 
@@ -215,8 +221,8 @@ module TrisulRP::Protocol
   def get_available_time(conn)
     
     from_tm=to_tm=nil
-    req=mk_request(TRP::Message::Command::COUNTER_GROUP_INFO_REQUEST,
-                    :counter_group => TrisulRP::Guids::CG_AGGREGATE)
+    req=mk_request(TRP::Message::Command::TIMESLICES_REQUEST,
+                    :get_total_window => true )
 
 	if conn.is_a?(String)
 		resp = get_response_zmq(conn,req) 
@@ -225,8 +231,8 @@ module TrisulRP::Protocol
 	end 
 
 
-    from_tm =  Time.at(resp.group_details[0].time_interval.from.tv_sec)
-    to_tm =  Time.at(resp.group_details[0].time_interval.to.tv_sec)
+    from_tm =  Time.at(resp.total_window.from.tv_sec)
+    to_tm =  Time.at(resp.total_window.to.tv_sec)
 
     return [from_tm,to_tm]
 
@@ -242,11 +248,54 @@ module TrisulRP::Protocol
   #
   def mk_time_interval(tmarr)
     tint=TRP::TimeInterval.new
-    tint.from=TRP::Timestamp.new(:tv_sec => tmarr[0].tv_sec, :tv_usec => 0)
-    tint.to=TRP::Timestamp.new(:tv_sec => tmarr[1].tv_sec, :tv_usec => 0)
+	if ( tmarr[0].is_a? Integer)
+		tint.from=TRP::Timestamp.new(:tv_sec => tmarr[0], :tv_usec => 0)
+		tint.to=TRP::Timestamp.new(:tv_sec => tmarr[1], :tv_usec => 0)
+	elsif (tmarr[0].is_a? Time)
+		tint.from=TRP::Timestamp.new(:tv_sec => tmarr[0].tv_sec, :tv_usec => 0)
+		tint.to=TRP::Timestamp.new(:tv_sec => tmarr[1].tv_sec, :tv_usec => 0)
+	end
+
     return  tint
   end
 
+  # Helper to allow assinging string to KeyT field
+  #
+  # instead of  
+  # ..{ :source_ip => TRP::KeyT.new( :label => val ) } 
+  #
+  # you can do
+  # ..{ :source_ip => val } 
+  # 
+  def fix_TRP_Fields(msg, params)
+
+	ti = params[:time_interval]
+	if ti.is_a? Array
+		params[:time_interval] = mk_time_interval(ti)
+	end
+
+  	params.each do |k,v|
+		f = msg.get_field(k)
+		if v.is_a? String 
+			if f.is_a? Protobuf::Field::MessageField and f.type_class.to_s == "TRP::KeyT"
+				params[k] = TRP::KeyT.new( :label => v )
+			elsif f.is_a? Protobuf::Field::Int64Field 
+				params[k] = v.to_i
+			elsif f.is_a? Protobuf::Field::StringField and f.rule == :repeated  
+				params[k] = v.split(',') 
+            elsif f.is_a? Protobuf::Field::BoolField
+				params[k] = ( v == "true")
+			end
+        elsif v.is_a? BigDecimal  or v.is_a? Float 
+			if f.is_a? Protobuf::Field::Int64Field 
+			    params[k] = v.to_i
+            end
+		end
+
+	end
+
+  end
+
   # Helper to create a TRP request object
   #
   # Read the TRP documentation wiki for a description of each command. 
@@ -282,67 +331,107 @@ module TrisulRP::Protocol
   # </code>
   #
   #
-  def mk_request(cmd_id,params={})
-    req = TRP::Message.new(:trp_command => cmd_id)
+  def mk_request(cmd_id,in_params={})
+   params  =in_params.dup
+   opts = {:trp_command=> cmd_id}
+   if params.has_key?(:destination_node)
+     opts[:destination_node] = params.delete(:destination_node)
+   end
+   if params.has_key?(:probe_id)
+     opts[:probe_id] = params.delete(:probe_id)
+   end
+   if params.has_key?(:run_async)
+     opts[:run_async] = params.delete(:run_async)
+   end
+    req = TRP::Message.new(opts)
     case cmd_id
     when TRP::Message::Command::HELLO_REQUEST
+	  fix_TRP_Fields( TRP::HelloRequest, params)
       req.hello_request = TRP::HelloRequest.new(params)
-    when TRP::Message::Command::COUNTER_GROUP_REQUEST
-      req.counter_group_request = TRP::CounterGroupRequest.new(params)
+    when TRP::Message::Command::COUNTER_GROUP_TOPPER_REQUEST
+	  fix_TRP_Fields( TRP::CounterGroupTopperRequest, params)
+      req.counter_group_topper_request = TRP::CounterGroupTopperRequest.new(params)
     when TRP::Message::Command::COUNTER_ITEM_REQUEST
+	  fix_TRP_Fields( TRP::CounterItemRequest, params)
       req.counter_item_request = TRP::CounterItemRequest.new(params)
-    when TRP::Message::Command::RELEASE_RESOURCE_REQUEST
-      req.release_resource_request = TRP::ReleaseResourceRequest.new(params)
-    when TRP::Message::Command::CONTROLLED_COUNTER_GROUP_REQUEST
-      req.controlled_counter_group_request = TRP::ControlledCounterGroupRequest.new(params)
-    when TRP::Message::Command::FILTERED_DATAGRAMS_REQUEST
-      req.filtered_datagram_request = TRP::FilteredDatagramRequest.new(params)
-    when TRP::Message::Command::CONTROLLED_CONTEXT_REQUEST
-      req.controlled_context_request = TRP::ControlledContextRequest.new(params)
+    when TRP::Message::Command::PCAP_REQUEST
+	  fix_TRP_Fields( TRP::PcapRequest, params)
+      req.pcap_request = TRP::PcapRequest.new(params)
     when TRP::Message::Command::SEARCH_KEYS_REQUEST
+	  fix_TRP_Fields( TRP::SearchKeysRequest, params)
       req.search_keys_request = TRP::SearchKeysRequest.new(params)
-    when TRP::Message::Command::BULK_COUNTER_ITEM_REQUEST
-      req.bulk_counter_item_request = TRP::BulkCounterItemRequest.new(params)
-    when TRP::Message::Command:: CGMONITOR_REQUEST
-      req.cgmonitor_request = TRP::CgmonitorRequest.new(params)
-    when TRP::Message::Command::TOPPER_SNAPSHOT_REQUEST
-      req.topper_snapshot_request = TRP::TopperSnapshotRequest.new(params)
     when TRP::Message::Command::UPDATE_KEY_REQUEST
+	  fix_TRP_Fields( TRP::UpdateKeyRequest, params)
       req.update_key_request = TRP::UpdateKeyRequest.new(params)
-    when TRP::Message::Command::RING_STATS_REQUEST
-      req.ring_stats_request = TRP::RingStatsRequest.new(params)
-    when TRP::Message::Command::SERVER_STATS_REQUEST
-      req.server_stats_request = TRP::ServerStatsRequest.new(params)
-    when TRP::Message::Command::SESSION_ITEM_REQUEST
-      req.session_item_request = TRP::SessionItemRequest.new(params)
-    when TRP::Message::Command::SESSION_GROUP_REQUEST
-      req.session_group_request = TRP::SessionGroupRequest.new(params)
-    when TRP::Message::Command::ALERT_ITEM_REQUEST
-      req.alert_item_request = TRP::AlertItemRequest.new(params)
-    when TRP::Message::Command::ALERT_GROUP_REQUEST
-      req.alert_group_request = TRP::AlertGroupRequest.new(params)
-    when TRP::Message::Command::RESOURCE_ITEM_REQUEST
-      req.resource_item_request = TRP::ResourceItemRequest.new(params)
-    when TRP::Message::Command::RESOURCE_GROUP_REQUEST
-      req.resource_group_request = TRP::ResourceGroupRequest.new(params)
-    when TRP::Message::Command::KEY_LOOKUP_REQUEST
-      req.key_lookup_request = TRP::KeyLookupRequest.new(params)
+    when TRP::Message::Command::PROBE_STATS_REQUEST
+	  fix_TRP_Fields( TRP::ProbeStatsRequest, params)
+      req.probe_stats_request = TRP::ProbeStatsRequest.new(params)
+    when TRP::Message::Command::QUERY_ALERTS_REQUEST
+	  fix_TRP_Fields( TRP::QueryAlertsRequest, params)
+      req.query_alerts_request = TRP::QueryAlertsRequest.new(params)
+    when TRP::Message::Command::QUERY_RESOURCES_REQUEST
+	  fix_TRP_Fields( TRP::QueryResourcesRequest, params)
+      req.query_resources_request = TRP::QueryResourcesRequest.new(params)
     when TRP::Message::Command::COUNTER_GROUP_INFO_REQUEST
+	  fix_TRP_Fields( TRP::CounterGroupInfoRequest, params)
       req.counter_group_info_request = TRP::CounterGroupInfoRequest.new(params)
     when TRP::Message::Command::SESSION_TRACKER_REQUEST
+	  fix_TRP_Fields( TRP::SessionTrackerRequest, params)
       req.session_tracker_request = TRP::SessionTrackerRequest.new(params)
     when TRP::Message::Command::QUERY_SESSIONS_REQUEST 
+	  fix_TRP_Fields( TRP::QuerySessionsRequest, params)
       req.query_sessions_request = TRP::QuerySessionsRequest.new(params)
     when TRP::Message::Command::GREP_REQUEST
+	  fix_TRP_Fields( TRP::GrepRequest, params)
       req.grep_request  = TRP::GrepRequest.new(params)
     when TRP::Message::Command::KEYSPACE_REQUEST
-      req.keyspace_request  = TRP::KeySpaceRequest.new(params)
+	  fix_TRP_Fields( TRP::KeySpaceRequest, params)
+      req.key_space_request  = TRP::KeySpaceRequest.new(params)
     when TRP::Message::Command::TOPPER_TREND_REQUEST
+	  fix_TRP_Fields( TRP::TopperTrendRequest, params)
       req.topper_trend_request  = TRP::TopperTrendRequest.new(params)
-    when TRP::Message::Command::QUERY_PDP_REQUEST 
-      req.query_pdp_request = TRP::QueryPDPRequest.new(params)
     when TRP::Message::Command::STAB_PUBSUB_CTL 
+	  fix_TRP_Fields( TRP::SubscribeCtl, params)
       req.subscribe_ctl = TRP::SubscribeCtl.new(params)
+    when TRP::Message::Command::TIMESLICES_REQUEST 
+	  fix_TRP_Fields( TRP::TimeSlicesRequest, params)
+      req.time_slices_request = TRP::TimeSlicesRequest.new(params)
+    when TRP::Message::Command::DELETE_ALERTS_REQUEST 
+	  fix_TRP_Fields( TRP::DeleteAlertsRequest, params)
+      req.delete_alerts_request = TRP::DeleteAlertsRequest.new(params)
+    when TRP::Message::Command::QUERY_FTS_REQUEST 
+	  fix_TRP_Fields( TRP::QueryFTSRequest, params)
+      req.query_fts_request = TRP::QueryFTSRequest.new(params)
+    when TRP::Message::Command::METRICS_SUMMARY_REQUEST
+	  fix_TRP_Fields( TRP::MetricsSummaryRequest, params)
+      req.metrics_summary_request = TRP::MetricsSummaryRequest.new(params)
+    when TRP::Message::Command::CONTEXT_INFO_REQUEST
+	  fix_TRP_Fields( TRP::ContextInfoRequest, params)
+      req.context_info_request = TRP::ContextInfoRequest.new(params)
+    when TRP::Message::Command::CONTEXT_CONFIG_REQUEST
+	  fix_TRP_Fields( TRP::ContextConfigRequest, params)
+      req.context_config_request = TRP::ContextConfigRequest.new(params)
+    when TRP::Message::Command::PCAP_SLICES_REQUEST
+	  fix_TRP_Fields( TRP::PcapSlicesRequest, params)
+      req.pcap_slices_request = TRP::PcapSlicesRequest.new(params)
+    when TRP::Message::Command::LOG_REQUEST
+	  fix_TRP_Fields( TRP::LogRequest, params)
+      req.log_request = TRP::LogRequest.new(params)
+    when TRP::Message::Command::CONTEXT_START_REQUEST
+	  fix_TRP_Fields( TRP::ContextStartRequest, params)
+      req.context_start_request = TRP::ContextStartRequest.new(params)
+    when TRP::Message::Command::CONTEXT_STOP_REQUEST
+	  fix_TRP_Fields( TRP::ContextStopRequest, params)
+      req.context_stop_request = TRP::ContextStopRequest.new(params)
+    when TRP::Message::Command::DOMAIN_REQUEST
+	  fix_TRP_Fields( TRP::DomainRequest, params)
+      req.domain_request = TRP::DomainRequest.new(params)
+    when TRP::Message::Command::ASYNC_REQUEST
+	  fix_TRP_Fields( TRP::AsyncRequest, params)
+      req.async_request = TRP::AsyncRequest.new(params)
+    when TRP::Message::Command::NODE_CONFIG_REQUEST
+	  fix_TRP_Fields( TRP::NodeConfigRequest, params)
+      req.node_config_request = TRP::NodeConfigRequest.new(params)
     else
       raise "Unknown TRP command ID"
     end
@@ -385,49 +474,27 @@ module TrisulRP::Protocol
   #
   #
   def unwrap_response(resp)
-    case resp.trp_command
+    case resp.trp_command.to_i
     when TRP::Message::Command::HELLO_RESPONSE
       resp.hello_response
-    when TRP::Message::Command::COUNTER_GROUP_RESPONSE
-      resp.counter_group_response
+    when TRP::Message::Command::COUNTER_GROUP_TOPPER_RESPONSE
+      resp.counter_group_topper_response
     when TRP::Message::Command::COUNTER_ITEM_RESPONSE
       resp.counter_item_response
     when TRP::Message::Command::OK_RESPONSE
       resp.ok_response
-    when TRP::Message::Command::CONTROLLED_COUNTER_GROUP_RESPONSE
-      resp.controlled_counter_group_response
-    when TRP::Message::Command::FILTERED_DATAGRAMS_RESPONSE
-      resp.filtered_datagram_response
-    when TRP::Message::Command::CONTROLLED_CONTEXT_RESPONSE
-      resp.controlled_context_response
+    when TRP::Message::Command::PCAP_RESPONSE
+      resp.pcap_response
     when TRP::Message::Command::SEARCH_KEYS_RESPONSE
       resp.search_keys_response
-    when TRP::Message::Command::BULK_COUNTER_ITEM_RESPONSE
-        resp.bulk_counter_item_response 
-    when TRP::Message::Command:: CGMONITOR_RESPONSE
-        resp.cgmonitor_response 
-    when TRP::Message::Command::TOPPER_SNAPSHOT_RESPONSE
-      resp.topper_snapshot_response
     when TRP::Message::Command::UPDATE_KEY_RESPONSE
       resp.update_key_response 
-    when TRP::Message::Command::RING_STATS_RESPONSE
-        resp.ring_stats_response 
-    when TRP::Message::Command::SERVER_STATS_RESPONSE
-        resp.server_stats_response 
-    when TRP::Message::Command::SESSION_ITEM_RESPONSE
-        resp.session_item_response 
-    when TRP::Message::Command::SESSION_GROUP_RESPONSE
-        resp.session_group_response 
-    when TRP::Message::Command::ALERT_ITEM_RESPONSE
-        resp.alert_item_response 
-    when TRP::Message::Command::ALERT_GROUP_RESPONSE
-        resp.alert_group_response 
-    when TRP::Message::Command::RESOURCE_ITEM_RESPONSE
-        resp.resource_item_response 
-    when TRP::Message::Command::RESOURCE_GROUP_RESPONSE
-        resp.resource_group_response 
-    when TRP::Message::Command::KEY_LOOKUP_RESPONSE
-        resp.key_lookup_response 
+    when TRP::Message::Command::PROBE_STATS_RESPONSE
+        resp.probe_stats_response 
+    when TRP::Message::Command::QUERY_ALERTS_RESPONSE
+        resp.query_alerts_response 
+    when TRP::Message::Command::QUERY_RESOURCES_RESPONSE
+        resp.query_resources_response 
     when TRP::Message::Command::COUNTER_GROUP_INFO_RESPONSE
         resp.counter_group_info_response 
     when TRP::Message::Command::SESSION_TRACKER_RESPONSE
@@ -437,13 +504,30 @@ module TrisulRP::Protocol
     when TRP::Message::Command::GREP_RESPONSE
         resp.grep_response  
     when TRP::Message::Command::KEYSPACE_RESPONSE
-        resp.keyspace_response  
+        resp.key_space_response  
     when TRP::Message::Command::TOPPER_TREND_RESPONSE
         resp.topper_trend_response  
-    when TRP::Message::Command::QUERY_PDP_RESPONSE
-        resp.query_pdp_response 
+    when TRP::Message::Command::QUERY_FTS_RESPONSE
+        resp.query_fts_response 
+    when TRP::Message::Command::TIMESLICES_RESPONSE
+        resp.time_slices_response 
+    when TRP::Message::Command::METRICS_SUMMARY_RESPONSE
+        resp.metrics_summary_response  
+    when TRP::Message::Command::CONTEXT_INFO_RESPONSE
+        resp.context_info_response
+    when TRP::Message::Command::CONTEXT_CONFIG_RESPONSE
+        resp.context_config_response
+    when TRP::Message::Command::LOG_RESPONSE
+        resp.log_response
+    when TRP::Message::Command::DOMAIN_RESPONSE
+        resp.domain_response
+    when TRP::Message::Command::NODE_CONFIG_RESPONSE
+        resp.node_config_response
+    when TRP::Message::Command::ASYNC_RESPONSE
+        resp.async_response
     else
-      raise "Unknown TRP command ID"
+     
+      raise "#{resp.trp_commandi.to_i} Unknown TRP command ID"
     end
   end
 end