trisulrp 1.2.8 → 1.2.9

data/VERSION

@@ -1 +1 @@
-1.2.8
+1.2.9

data/lib/trisulrp/protocol.rb

@@ -75,8 +75,8 @@ module TrisulRP::Protocol
 		resp =TRP::Message.new
 		resp.parse dataarray
 		raise resp.error_response if resp.trp_command == TRP::Message::Command::ERROR_RESPONSE
-		yield resp if block_given?
-		return resp
+		yield unwrap_response(resp) if block_given?
+		return unwrap_response(resp)
 	end
 
 
@@ -105,8 +105,8 @@ module TrisulRP::Protocol
 		req=mk_request(TRP::Message::Command::COUNTER_GROUP_INFO_REQUEST,
       							:counter_group => TrisulRP::Guids::CG_AGGREGATE)
 		get_response(conn,req) do |resp|
-			from_tm =  Time.at(resp.counter_group_info_response.group_details[0].time_interval.from.tv_sec)
-			to_tm =  Time.at(resp.counter_group_info_response.group_details[0].time_interval.to.tv_sec)
+			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)
 		end
 		return [from_tm,to_tm]
   	end
@@ -179,7 +179,7 @@ module TrisulRP::Protocol
 		when TRP::Message::Command::SEARCH_KEYS_REQUEST
 		  req.search_keys_request = TRP::SearchKeysRequest.new(params)
 		when TRP::Message::Command::BULK_COUNTER_ITEM_REQUEST
-		  req.bulk_counter_item_request = TRP::BulkItemRequest.new(params)
+		  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
@@ -216,5 +216,96 @@ module TrisulRP::Protocol
 		return req
 	end
 
+     # Helper to unwrap a response
+	 #
+	 # All protobuf messages used in TRP have a wrapper containing a command_id which identifies
+	 # the type of encapsulated message. This sometimes gets in the way because you have to write
+	 # stuff like
+	 #
+	 # <code>
+	 #
+	 #     response.counter_group_response.blah_blah 
+	 #
+	 #     instead of 
+	 #
+	 #     response.blah_blah
+	 #
+	 # </code>
+	 #
+	 # Read the TRP documentation wiki for a description of each command. 
+	 #
+	 # [resp]	The response 
+	 #
+	 # ==== Typical usage
+	 #
+	 # <code>
+	 #
+	 #  # create a new command of type KeySessionActivityRequest
+     #  req = TrisulRP::Protocol.get_response(...) do |resp|
+	 #  		
+	 #  		# here resp points to the inner response without the wrapper 
+	 #  		# this allows you to write resp.xyz instead of resp.hello_response.xyz 
+	 #
+	 #
+	 #  end
+	 #
+	 # </code>
+	 #
+	 #
+     def unwrap_response(resp)
+		case resp.trp_command
+		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_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::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::COUNTER_GROUP_INFO_RESPONSE
+		  	resp.counter_group_info_response 
+		when TRP::Message::Command::KEY_SESS_ACTIVITY_RESPONSE
+		  	resp.key_session_activity_response 
+		when TRP::Message::Command::GREP_RESPONSE
+		  	resp.grep_response  
+		else
+			raise "Unknown TRP command ID"
+		end
+	end
+
 end
 

data/lib/trisulrp/utils.rb

@@ -35,7 +35,7 @@ module TrisulRP::Utils
 												  :session_ids => all_sids)
 
         TrisulRP::Protocol.get_response(conn,follow_up) do |resp|
-          resp.session_item_response.items.each do |item|
+          resp.items.each do |item|
             print "#{item.session_id.slice_id},#{item.session_id.session_id} "
             print "#{Time.at(item.time_interval.from.tv_sec)} "
             print "#{item.time_interval.to.tv_sec-item.time_interval.from.tv_sec} ".rjust(8)
@@ -72,8 +72,8 @@ module TrisulRP::Utils
 
     	resp = TrisulRP::Protocol.get_response(conn,req)
 
-		if resp.search_keys_response.found_keys.size > 0 
-			resp.search_keys_response.found_keys[0].key
+		if resp.found_keys.size > 0 
+			resp.found_keys[0].key
 		else
 			str
 		end
@@ -106,8 +106,7 @@ module TrisulRP::Utils
 
 
 
-	TrisulRP::Protocol.get_response(conn,follow_up) do | resp2 |
-         resp=resp2.alert_item_response
+	TrisulRP::Protocol.get_response(conn,follow_up) do | resp |
          resolv_candidates = resp.items.collect { |item| [item.source_ip, item.source_port, item.destination_ip, item.destination_port,item.sigid]  }
          resolv_arr = resolv_candidates.transpose
          sip_names   = TrisulRP::Keys.get_labels_for_keys(conn,TrisulRP::Guids::CG_HOST, resolv_arr[0])

data/test/cginfo.rb

@@ -0,0 +1,33 @@
+# Trisul Remote Protocol TRP Demo script
+#
+# Counter Group Info
+#
+# Prints information about all supported coutner  groups on a trisul instance
+#
+require 'trisulrp'
+
+include TrisulRP::Protocol
+include TrisulRP::Utils
+
+
+raise "Usage : cginfo host port" unless ARGV.length==2
+
+
+TrisulRP::Protocol.connect(ARGV.shift,ARGV.shift,"Demo_Client.crt","Demo_Client.key") do |conn|
+
+    req =TrisulRP::Protocol.mk_request(TRP::Message::Command::COUNTER_GROUP_INFO_REQUEST,
+										:counter_group => "{C51B48D4-7876-479E-B0D9-BD9EFF03CE2E}" )
+
+    TrisulRP::Protocol.get_response(conn,req) do |resp|
+          resp.group_details.each do |group_detail|
+				start_time= Time.at(group_detail.time_interval.from.tv_sec)
+				end_time=Time.at(group_detail.time_interval.to.tv_sec)
+
+				p "Name = " + group_detail.name
+				p "GUID = " + group_detail.guid
+
+		  end
+    end
+
+end 
+

data/test/test_alerts.rb

@@ -24,7 +24,7 @@ class TestTrisulrp < Test::Unit::TestCase
 										:time_interval => mk_time_interval(tm_arr))
 
       TrisulRP::Protocol.get_response(conn,req) do |resp|
-	  	print_alert_details(conn,resp.alert_group_response.alerts)
+	  	print_alert_details(conn,resp.alerts)
       end
     end
   end

data/test/test_cap.rb

@@ -26,8 +26,7 @@ class TestCap < Test::Unit::TestCase
 									:filter_expression  => expr)
 					)
 
-    TrisulRP::Protocol.get_response(conn,req) do |resp|
-          fdr=resp.filtered_datagram_response
+    TrisulRP::Protocol.get_response(conn,req) do |fdr|
           p "Number of bytes = #{fdr.num_bytes}\n"
           p "Number of pkts  = #{fdr.num_datagrams}\n"
           p "Hash            = #{fdr.sha1}\n"
@@ -52,8 +51,7 @@ class TestCap < Test::Unit::TestCase
 									:session_id  => target_sess)
 					)
 
-    TrisulRP::Protocol.get_response(conn,req) do |resp|
-          fdr=resp.filtered_datagram_response
+    TrisulRP::Protocol.get_response(conn,req) do |fdr|
           p "Number of bytes = #{fdr.num_bytes}\n"
           p "Number of pkts  = #{fdr.num_datagrams}\n"
           p "Hash            = #{fdr.sha1}\n"
@@ -78,8 +76,7 @@ class TestCap < Test::Unit::TestCase
 									:alert_id  => target_alert)
 					)
 
-    TrisulRP::Protocol.get_response(conn,req) do |resp|
-          fdr=resp.filtered_datagram_response
+    TrisulRP::Protocol.get_response(conn,req) do |fdr|
           p "Number of bytes = #{fdr.num_bytes}\n"
           p "Number of pkts  = #{fdr.num_datagrams}\n"
           p "Hash            = #{fdr.sha1}\n"
@@ -105,8 +102,7 @@ class TestCap < Test::Unit::TestCase
 									:resource_id  => target)
 					)
 
-    TrisulRP::Protocol.get_response(conn,req) do |resp|
-          fdr=resp.filtered_datagram_response
+    TrisulRP::Protocol.get_response(conn,req) do |fdr|
           p "Number of bytes = #{fdr.num_bytes}\n"
           p "Number of pkts  = #{fdr.num_datagrams}\n"
           p "Hash            = #{fdr.sha1}\n"

data/test/test_grep.rb

@@ -22,7 +22,7 @@ class TestTrisulrp < Test::Unit::TestCase
 
     TrisulRP::Protocol.get_response(conn,req) do |resp|
 
-		print_session_details(conn,resp.grep_response.sessions)
+		print_session_details(conn,resp.sessions)
 
     end
 

data/test/test_key_flows.rb

@@ -26,7 +26,7 @@ class TestTrisulrp < Test::Unit::TestCase
 										  :time_interval => mk_time_interval(tmarr))
 
     TrisulRP::Protocol.get_response(@conn,req) do |resp|
-		print_session_details(@conn,resp.key_session_activity_response.sessions)
+		print_session_details(@conn,resp.sessions)
     end
 
   end
@@ -45,7 +45,7 @@ class TestTrisulrp < Test::Unit::TestCase
 										  :time_interval => mk_time_interval(tmarr))
 
     TrisulRP::Protocol.get_response(@conn,req) do |resp|
-		print_session_details(@conn,resp.key_session_activity_response.sessions)
+		print_session_details(@conn,resp.sessions)
     end
 
   end

data/test/test_resources.rb

@@ -25,7 +25,7 @@ class TestTrisulrp < Test::Unit::TestCase
       TrisulRP::Protocol.get_response(conn,req) do |resp|
 
 	     	# matching resource ids
-        resource_ids = resp.resource_group_response.resources.collect do   |res|
+        resource_ids = resp.resources.collect do   |res|
           TRP::ResourceID.new(:slice_id => res.slice_id, :resource_id => res.resource_id)
         end
 
@@ -33,8 +33,7 @@ class TestTrisulrp < Test::Unit::TestCase
           :context => 0, :resource_group => TrisulRP::Guids::RG_DNS,
           :resource_ids => resource_ids)
 
-        TrisulRP::Protocol.get_response(conn,follow_up) do | resp2 |
-          resp=resp2.resource_item_response
+        TrisulRP::Protocol.get_response(conn,follow_up) do | resp |
           resp.items.each do |item|
             print "#{Time.at(item.time.tv_sec)} "
             print "#{item.source_ip}".ljust(28)

data/trisulrp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{trisulrp}
-  s.version = "1.2.8"
+  s.version = "1.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["vivek"]
-  s.date = %q{2011-02-22}
+  s.date = %q{2011-03-06}
   s.description = %q{This gem deals about the trisul remote protocol}
   s.email = %q{vivek_rajagopal@yahoo.com}
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "lib/trisulrp/utils.rb",
     "test/Demo_Client.crt",
     "test/Demo_Client.key",
+    "test/cginfo.rb",
     "test/helper.rb",
     "test/test_alerts.rb",
     "test/test_cap.rb",
@@ -50,6 +51,7 @@ Gem::Specification.new do |s|
   s.summary = %q{trisul trp}
   s.test_files = [
     "examples/strp.rb",
+    "test/cginfo.rb",
     "test/helper.rb",
     "test/test_alerts.rb",
     "test/test_cap.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 8
-  version: 1.2.8
+  - 9
+  version: 1.2.9
 platform: ruby
 authors: 
 - vivek
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 +05:30
+date: 2011-03-06 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -129,6 +129,7 @@ files:
 - lib/trisulrp/utils.rb
 - test/Demo_Client.crt
 - test/Demo_Client.key
+- test/cginfo.rb
 - test/helper.rb
 - test/test_alerts.rb
 - test/test_cap.rb
@@ -152,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -371857393
+      hash: 918382383
       segments: 
       - 0
       version: "0"
@@ -173,6 +174,7 @@ specification_version: 3
 summary: trisul trp
 test_files: 
 - examples/strp.rb
+- test/cginfo.rb
 - test/helper.rb
 - test/test_alerts.rb
 - test/test_cap.rb