trisulrp 1.6.0 → 2.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8c6ed04fc6c3b60455d92770e212ebbc72369797
+  data.tar.gz: f4e1579a31bded5fc98d04777109d5462e0d943f
+SHA512:
+  metadata.gz: 7b4335d948d6cbbaf4c5ce67d6faff6871e25755c9b2d4383458296f1498a2b0c4a34f02d8728edf3003370bdc54b627d2227ea6cf41c7e7d3a12d105080d577
+  data.tar.gz: 02e0aae091a454ac7710500bf33739c0a48955be4d723e7ff9b89f00a10af175bf7f63e93653cec4ee2ebe8e078432994c206a1fd10bf1f9aa5ed4a6e759753f

data/VERSION

@@ -1 +1 @@
-1.6.0
+2.0.1

data/lib/trisulrp/protocol.rb

@@ -181,9 +181,9 @@ module TrisulRP::Protocol
   #
   # <code>
   #
-  #  # create a new command of type KeySessionActivityRequest
-  #  req = TrisulRP::Protocol.mk_request(TRP::Message::Command::KEY_SESS_ACTIVITY_REQUEST,
-  #            :key => target_key ,
+  #  # create a new command of type QuerySessionsRequest
+  #  req = TrisulRP::Protocol.mk_request(TRP::Message::Command::QUERY_SESSIONS_REQUEST,
+  #            :source_ip => .. ,
   #            :time_interval => mk_time_interval(tmarr))
   #
   #  ... now you can use the req object ...
@@ -195,10 +195,10 @@ module TrisulRP::Protocol
   # <code>
   #
   #  # create a new command of type CounterItemRequest
-  #  req =TRP::Message.new(:trp_command => TRP::Message::Command::KEY_SESS_ACTIVITY_REQUEST )
-  #  req.key_session_activity_request = TRP::KeySessionActivityRequest.new( 
-  #            :key =>  target_key ,
-  #                  :time_interval => mk_time_interval(tmarr))
+  #  req =TRP::Message.new(:trp_command => TRP::Message::Command::QUERY_SESSIONS_REQUEST )
+  #  req.query_sessions_request = TRP::QuerySessionsRequest.new( 
+  #            :source_ip =>  ... ,
+  #            :time_interval => mk_time_interval(tmarr))
   #
   #  ... now you can use the req object ...
   #
@@ -254,8 +254,8 @@ module TrisulRP::Protocol
       req.counter_group_info_request = TRP::CounterGroupInfoRequest.new(params)
     when TRP::Message::Command::SESSION_TRACKER_REQUEST
       req.session_tracker_request = TRP::SessionTrackerRequest.new(params)
-    when TRP::Message::Command::KEY_SESS_ACTIVITY_REQUEST
-      req.key_session_activity_request = TRP::KeySessionActivityRequest.new(params)
+    when TRP::Message::Command::QUERY_SESSIONS_REQUEST 
+      req.query_sessions_request = TRP::QuerySessionsRequest.new(params)
     when TRP::Message::Command::GREP_REQUEST
       req.grep_request  = TRP::GrepRequest.new(params)
     when TRP::Message::Command::KEYSPACE_REQUEST
@@ -349,8 +349,8 @@ module TrisulRP::Protocol
         resp.counter_group_info_response 
     when TRP::Message::Command::SESSION_TRACKER_RESPONSE
         resp.session_tracker_response 
-    when TRP::Message::Command::KEY_SESS_ACTIVITY_RESPONSE
-        resp.key_session_activity_response 
+    when TRP::Message::Command::QUERY_SESSIONS_RESPONSE
+        resp.query_sessions_response 
     when TRP::Message::Command::GREP_RESPONSE
         resp.grep_response  
     when TRP::Message::Command::KEYSPACE_RESPONSE

data/lib/trisulrp/trp.pb.rb

@@ -15,6 +15,7 @@ module TRP
   class AlertID < ::ProtocolBuffers::Message; end
   class ResourceID < ::ProtocolBuffers::Message; end
   class CounterGroupDetails < ::ProtocolBuffers::Message; end
+  class SessionDetails < ::ProtocolBuffers::Message; end
   class Message < ::ProtocolBuffers::Message; end
   class HelloRequest < ::ProtocolBuffers::Message; end
   class HelloResponse < ::ProtocolBuffers::Message; end
@@ -37,11 +38,9 @@ module TRP
   class CounterGroupInfoResponse < ::ProtocolBuffers::Message; end
   class SessionItemRequest < ::ProtocolBuffers::Message; end
   class SessionItemResponse < ::ProtocolBuffers::Message; end
-  class TopperSnapshotRequest < ::ProtocolBuffers::Message; end
-  class TopperSnapshotResponse < ::ProtocolBuffers::Message; end
+  class QuerySessionsRequest < ::ProtocolBuffers::Message; end
+  class QuerySessionsResponse < ::ProtocolBuffers::Message; end
   class UpdateKeyRequest < ::ProtocolBuffers::Message; end
-  class KeySessionActivityRequest < ::ProtocolBuffers::Message; end
-  class KeySessionActivityResponse < ::ProtocolBuffers::Message; end
   class SessionTrackerRequest < ::ProtocolBuffers::Message; end
   class SessionTrackerResponse < ::ProtocolBuffers::Message; end
   class SessionGroupRequest < ::ProtocolBuffers::Message; end
@@ -147,6 +146,27 @@ module TRP
     optional :int64, :topper_bucket_size, 5
   end
 
+  class SessionDetails < ::ProtocolBuffers::Message
+    optional :string, :session_key, 1
+    required ::TRP::SessionID, :session_id, 2
+    optional :string, :user_label, 3
+    required ::TRP::TimeInterval, :time_interval, 4
+    required :int64, :state, 5
+    required :int64, :az_bytes, 6
+    required :int64, :za_bytes, 7
+    required :int64, :az_packets, 8
+    required :int64, :za_packets, 9
+    required ::TRP::KeyDetails, :key1A, 10
+    required ::TRP::KeyDetails, :key2A, 11
+    required ::TRP::KeyDetails, :key1Z, 12
+    required ::TRP::KeyDetails, :key2Z, 13
+    required ::TRP::KeyDetails, :protocol, 14
+    optional ::TRP::KeyDetails, :nf_routerid, 15
+    optional ::TRP::KeyDetails, :nf_ifindex_in, 16
+    optional ::TRP::KeyDetails, :nf_ifindex_out, 17
+    optional :string, :tags, 18
+  end
+
   class Message < ::ProtocolBuffers::Message
     # forward declarations
 
@@ -185,8 +205,8 @@ module TRP
       TOPPER_SNAPSHOT_RESPONSE = 31
       UPDATE_KEY_REQUEST = 32
       UPDATE_KEY_RESPONSE = 33
-      KEY_SESS_ACTIVITY_REQUEST = 34
-      KEY_SESS_ACTIVITY_RESPONSE = 35
+      QUERY_SESSIONS_REQUEST = 34
+      QUERY_SESSIONS_RESPONSE = 35
       RING_STATS_REQUEST = 36
       RING_STATS_RESPONSE = 37
       SERVER_STATS_REQUEST = 38
@@ -231,11 +251,9 @@ module TRP
     optional ::TRP::SessionItemResponse, :session_item_response, 23
     optional ::TRP::BulkCounterItemRequest, :bulk_counter_item_request, 24
     optional ::TRP::BulkCounterItemResponse, :bulk_counter_item_response, 25
-    optional ::TRP::TopperSnapshotRequest, :topper_snapshot_request, 28
-    optional ::TRP::TopperSnapshotResponse, :topper_snapshot_response, 29
     optional ::TRP::UpdateKeyRequest, :update_key_request, 30
-    optional ::TRP::KeySessionActivityRequest, :key_session_activity_request, 31
-    optional ::TRP::KeySessionActivityResponse, :key_session_activity_response, 32
+    optional ::TRP::QuerySessionsRequest, :query_sessions_request, 31
+    optional ::TRP::QuerySessionsResponse, :query_sessions_response, 32
     optional ::TRP::SessionTrackerRequest, :session_tracker_request, 33
     optional ::TRP::SessionTrackerResponse, :session_tracker_response, 34
     optional ::TRP::ServerStatsRequest, :server_stats_request, 37
@@ -418,48 +436,43 @@ module TRP
     optional :string, :session_group, 2, :default => "{99A78737-4B41-4387-8F31-8077DB917336}"
     repeated :string, :session_keys, 3
     repeated ::TRP::SessionID, :session_ids, 4
+    optional :bool, :resolve_keys, 5, :default => true
   end
 
   class SessionItemResponse < ::ProtocolBuffers::Message
-    # forward declarations
-    class Item < ::ProtocolBuffers::Message; end
-
-    # nested messages
-    class Item < ::ProtocolBuffers::Message
-      optional :string, :session_key, 1
-      optional ::TRP::SessionID, :session_id, 2
-      optional :string, :user_label, 3
-      required ::TRP::TimeInterval, :time_interval, 4
-      required :int64, :state, 5
-      required :int64, :az_bytes, 6
-      required :int64, :za_bytes, 7
-      required ::TRP::KeyDetails, :key1A, 8
-      required ::TRP::KeyDetails, :key2A, 9
-      required ::TRP::KeyDetails, :key1Z, 10
-      required ::TRP::KeyDetails, :key2Z, 11
-    end
-
     optional :int64, :context, 1, :default => 0
     required :string, :session_group, 2
-    repeated ::TRP::SessionItemResponse::Item, :items, 3
+    repeated ::TRP::SessionDetails, :sessions, 3
   end
 
-  class TopperSnapshotRequest < ::ProtocolBuffers::Message
+  class QuerySessionsRequest < ::ProtocolBuffers::Message
     optional :int64, :context, 1, :default => 0
-    required :string, :counter_group, 2
-    required :int64, :meter, 3
-    required ::TRP::TimeInterval, :Time, 4
-    required :int64, :maxitems, 5
-  end
-
-  class TopperSnapshotResponse < ::ProtocolBuffers::Message
+    optional :string, :session_group, 2, :default => "{99A78737-4B41-4387-8F31-8077DB917336}"
+    required ::TRP::TimeInterval, :time_interval, 3
+    optional :string, :key, 4
+    optional :string, :source_ip, 5
+    optional :string, :source_port, 6
+    optional :string, :dest_ip, 7
+    optional :string, :dest_port, 8
+    optional :string, :any_ip, 9
+    optional :string, :any_port, 10
+    optional :string, :ip_pair, 11
+    optional :string, :protocol, 12
+    optional :string, :flowtag, 13
+    optional :string, :nf_routerid, 14
+    optional :string, :nf_ifindex_in, 15
+    optional :string, :nf_ifindex_out, 16
+    optional :string, :subnet_24, 17
+    optional :string, :subnet_16, 18
+    optional :int64, :maxitems, 19, :default => 100
+    optional :int64, :volume_filter, 20, :default => 0
+    optional :bool, :resolve_keys, 21, :default => true
+  end
+
+  class QuerySessionsResponse < ::ProtocolBuffers::Message
     optional :int64, :context, 1
-    required :string, :counter_group, 2
-    required :int64, :meter, 3
-    required ::TRP::Timestamp, :time, 4
-    required :int64, :window_secs, 5
-    required :string, :keys, 6
-    required :string, :labels, 7
+    required :string, :session_group, 2
+    repeated ::TRP::SessionDetails, :sessions, 3
   end
 
   class UpdateKeyRequest < ::ProtocolBuffers::Message
@@ -470,23 +483,6 @@ module TRP
     optional :string, :description, 6
   end
 
-  class KeySessionActivityRequest < ::ProtocolBuffers::Message
-    optional :int64, :context, 1, :default => 0
-    optional :string, :session_group, 2, :default => "{99A78737-4B41-4387-8F31-8077DB917336}"
-    required :string, :key, 3
-    optional :string, :key2, 4
-    optional :int64, :maxitems, 5, :default => 100
-    optional :int64, :volume_filter, 6, :default => 0
-    optional :int64, :duration_filter, 7, :default => 0
-    required ::TRP::TimeInterval, :time_interval, 8
-  end
-
-  class KeySessionActivityResponse < ::ProtocolBuffers::Message
-    optional :int64, :context, 1
-    required :string, :session_group, 2
-    repeated ::TRP::SessionID, :sessions, 3
-  end
-
   class SessionTrackerRequest < ::ProtocolBuffers::Message
     optional :int64, :context, 1, :default => 0
     optional :string, :session_group, 2, :default => "{99A78737-4B41-4387-8F31-8077DB917336}"

data/lib/trisulrp/trp.proto

@@ -1,7 +1,7 @@
 // Trisul Remote Protocol (TRP) definition
 // Based on Google Protocol Buffers
 // (c) 2010-11, Unleash Networks (http://www.unleashnetworks.com)
-// $Rev: 5966 $
+// $Rev: 6513 $
 package TRP;
 
 message Timestamp  {
@@ -60,6 +60,28 @@ message CounterGroupDetails {
     optional int64          topper_bucket_size=5;
 }
 
+message SessionDetails  {
+	optional string         session_key=1;
+	required SessionID      session_id=2;
+	optional string         user_label=3;
+	required TimeInterval   time_interval=4;
+	required int64          state=5;
+	required int64          az_bytes=6;
+	required int64          za_bytes=7;
+	required int64          az_packets=8;
+	required int64          za_packets=9;
+	required KeyDetails     key1A=10;
+	required KeyDetails     key2A=11;
+	required KeyDetails     key1Z=12;
+	required KeyDetails     key2Z=13;
+	required KeyDetails     protocol=14;
+	optional KeyDetails     nf_routerid=15;
+	optional KeyDetails     nf_ifindex_in=16;
+	optional KeyDetails     nf_ifindex_out=17;
+	optional string		    tags=18;
+}
+
+
 enum AuthLevel {
     ADMIN=1;
     BASIC_USER=2;
@@ -115,8 +137,8 @@ message Message {
                     TOPPER_SNAPSHOT_RESPONSE=31;                      
                     UPDATE_KEY_REQUEST=32;                            
                     UPDATE_KEY_RESPONSE=33;                           
-                    KEY_SESS_ACTIVITY_REQUEST=34;                     
-                    KEY_SESS_ACTIVITY_RESPONSE=35;
+                    QUERY_SESSIONS_REQUEST=34;                     
+                    QUERY_SESSIONS_RESPONSE=35;
                     RING_STATS_REQUEST=36;          
                     RING_STATS_RESPONSE=37;                     
                     SERVER_STATS_REQUEST=38;                    
@@ -161,11 +183,11 @@ message Message {
     optional SessionItemResponse session_item_response=23;
     optional BulkCounterItemRequest bulk_counter_item_request=24;
     optional BulkCounterItemResponse bulk_counter_item_response=25;
-    optional TopperSnapshotRequest topper_snapshot_request=28; 
-    optional TopperSnapshotResponse topper_snapshot_response=29;
+    // optional TopperSnapshotRequest topper_snapshot_request=28; 
+    // optional TopperSnapshotResponse topper_snapshot_response=29;
     optional UpdateKeyRequest update_key_request=30;
-    optional KeySessionActivityRequest key_session_activity_request=31;
-    optional KeySessionActivityResponse key_session_activity_response=32;
+    optional QuerySessionsRequest query_sessions_request=31;
+    optional QuerySessionsResponse  query_sessions_response=32;
     optional SessionTrackerRequest session_tracker_request=33;
     optional SessionTrackerResponse session_tracker_response=34;
     optional ServerStatsRequest server_stats_request=37;
@@ -385,51 +407,50 @@ message SessionItemRequest{
     optional string         session_group=2[default="{99A78737-4B41-4387-8F31-8077DB917336}"];
     repeated string         session_keys=3;
     repeated SessionID      session_ids=4;
+	optional bool			resolve_keys=5[default=true];
 }
 
 ////////////////////////////////////
 // SessionItemResponse
 message SessionItemResponse{
-    optional int64          context=1[default=0];            
-    required string         session_group=2;
-
-    message Item {
-        optional string         session_key=1;
-        optional SessionID      session_id=2;
-        optional string         user_label=3;
-        required TimeInterval   time_interval=4;
-        required int64          state=5;
-        required int64          az_bytes=6;
-        required int64          za_bytes=7;
-        required KeyDetails     key1A=8;
-        required KeyDetails     key2A=9;
-        required KeyDetails     key1Z=10;
-        required KeyDetails     key2Z=11;
-    }
-
-    repeated Item           items=3;
+    optional int64          	context=1[default=0];            
+    required string         	session_group=2;
+    repeated SessionDetails     sessions=3;
 }
-///////////////////////////////////////////
-/// TopperSnapshotRequest
-message TopperSnapshotRequest{
+///////////////////////////////////
+// QuerySessions - any of the fields can be filled
+// 				   all the fields filled are treated as AND criteria 
+message QuerySessionsRequest {
     optional int64          context=1[default=0];
-    required string         counter_group=2;
-    required int64          meter=3;
-    required TimeInterval   Time=4;
-    required int64          maxitems=5;
+    optional string         session_group=2[default="{99A78737-4B41-4387-8F31-8077DB917336}"];
+    required TimeInterval   time_interval=3;
+    optional string         key=4;
+	optional string			source_ip=5;
+	optional string			source_port=6;
+	optional string			dest_ip=7;
+	optional string			dest_port=8;
+	optional string			any_ip=9;
+	optional string			any_port=10;
+	optional string			ip_pair=11;
+	optional string			protocol=12;
+	optional string			flowtag=13;
+	optional string			nf_routerid=14;
+	optional string			nf_ifindex_in=15;
+	optional string			nf_ifindex_out=16;
+	optional string			subnet_24=17;
+	optional string			subnet_16=18;
+
+    optional int64          maxitems=19[default=100];
+    optional int64          volume_filter=20[default=0];
+	optional bool			resolve_keys=21[default=true];
 }
 
-
-///////////////////////////////////////////
-// TopperSnapshotResponse
-message TopperSnapshotResponse{
-    optional int64          context=1;
-    required string         counter_group=2;
-    required int64          meter=3;
-    required Timestamp      time=4;
-    required int64          window_secs=5;
-    required string         keys=6;
-    required string         labels=7;
+/////////////////////////////////////
+// QuerySessionsResponse 
+message QuerySessionsResponse {
+    optional int64          	context=1;
+    required string         	session_group=2;
+    repeated SessionDetails     sessions=3;
 }
 
 //////////////////////////////////////////////
@@ -443,27 +464,6 @@ message UpdateKeyRequest{
     optional string         description=6;
 }
 
-///////////////////////////////////
-// KeySessionActivityrequest
-message KeySessionActivityRequest{
-    optional int64          context=1[default=0];
-    optional string         session_group=2[default="{99A78737-4B41-4387-8F31-8077DB917336}"];
-    required string         key=3;
-    optional string         key2=4;
-    optional int64          maxitems=5[default=100];
-    optional int64          volume_filter=6[default=0];
-    optional int64          duration_filter=7[default=0];
-    required TimeInterval   time_interval=8;
-}
-
-/////////////////////////////////////
-// KeySessionActivityResponse
-message KeySessionActivityResponse{
-    optional int64          context=1;
-    required string         session_group=2;
-    repeated SessionID      sessions=3;
-}
-
 /////////////////////////////////////
 // SessionTrackerRequest
 message SessionTrackerRequest {

data/trisulrp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "trisulrp"
-  s.version = "1.6.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["vivek"]
-  s.date = "2013-12-13"
+  s.date = "2014-04-11"
   s.description = "This gem deals about the trisul remote protocol"
   s.email = "vivek_rajagopal@yahoo.com"
   s.extra_rdoc_files = [
@@ -49,11 +49,11 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/vivekrajan/trisulrp"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.0.14"
   s.summary = "trisul trp"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ruby-protocol-buffers>, [">= 0"])

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: trisulrp
 version: !ruby/object:Gem::Version
-  version: 1.6.0
-  prerelease: 
+  version: 2.0.1
 platform: ruby
 authors:
 - vivek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-protocol-buffers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-protocol-buffers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.5
 description: This gem deals about the trisul remote protocol
@@ -146,29 +133,25 @@ files:
 homepage: http://github.com/vivekrajan/trisulrp
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4500533550725413693
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: trisul trp
 test_files: []