Merge pull request #59 from eggqq007/master

third-party plugin inject flows

Author: eggqq007

src/tests/test_smoke_lr.sh

@@ -25,7 +25,7 @@ port_add hv1 lsp-portA || exit_test
 port_add hv2 lsp-portB || exit_test
 
 prev_LS=LS-A
-max_lr_num=20 # we cannot make it 50 or bigger, because the ovs may treat the packet as a recircle packet
+max_lr_num=15 # we cannot make it 50 or bigger, because the ovs may treat the packet as a recircle packet
 last_subnet_id=$((max_lr_num+1))
 i=1
 while [ $i -le $max_lr_num ]; do
@@ -63,8 +63,8 @@ packet=`build_icmp_request 000006080703 000006080601 $ip_src $ip_dst $ttl 528d 8
 inject_pkt hv1 lsp-portA "$packet" || exit_test
 wait_for_packet # wait for packet
 
-ttl=ea
-expect_pkt=`build_icmp_request 0000060805${mac_hex} 000006080704 $ip_src $ip_dst $ttl 668d 8510`
+ttl=ef
+expect_pkt=`build_icmp_request 0000060805${mac_hex} 000006080704 $ip_src $ip_dst $ttl 618d 8510`
 real_pkt=`get_tx_pkt hv2 lsp-portB`
 verify_pkt $expect_pkt $real_pkt || exit_test
 
@@ -74,8 +74,8 @@ ttl=fe
 packet=`build_icmp_request 000006080703 000006080601 $ip_src $ip_dst $ttl 528f 8510`
 inject_pkt hv1 lsp-portA "$packet" || exit_test
 wait_for_packet # wait for packet
-ttl=eb
-expect_pkt=`build_icmp_response 000006080601 000006080703 $ip_dst $ip_src $ttl 658f 8d10`
+ttl=f0
+expect_pkt=`build_icmp_response 000006080601 000006080703 $ip_dst $ip_src $ttl 608f 8d10`
 real_pkt=`get_tx_pkt hv1 lsp-portA`
 verify_pkt $expect_pkt $real_pkt || exit_test
 

src/tuplenet/lcp/action.py

@@ -98,6 +98,8 @@
         Action_mod_nw_dst:'mod_nw_dst:{}',
         Action_mod_nw_ttl:'mod_nw_ttl:{}',
         Action_dec_ttl:'dec_ttl',
+        Action_mod_tp_dst:'mod_tp_dst:{}',
+        Action_mod_tp_src:'mod_tp_src:{}',
 
         Action_resubmit:'resubmit({},{})',
         Action_resubmit_table:'resubmit(,{})',

src/tuplenet/lcp/flow_common.py

@@ -2,12 +2,13 @@
 TABLE_CONVERT_PHY_LOGICAL = 0
 # LSP pipeline
 TABLE_LSP_TRACE_INGRESS_IN = 1
-TABLE_LSP_INGRESS_ARP_CONTROLLER = 2
-TABLE_LSP_INGRESS_ARP_RESPONSE = 3
-TABLE_LSP_INGRESS_UNTUNNEL = 4
-TABLE_LSP_INGRESS_LOOKUP_DST_PORT = 5
-TABLE_LSP_INGRESS_OUTPUT_DST_PORT = 6
-TABLE_LSP_TRACE_INGRESS_OUT = 6 # same to TABLE_LSP_INGRESS_OUTPUT_DST_PORT
+TABLE_LSP_INGRESS_PROCESS_EXT_LOGIC = 2
+TABLE_LSP_INGRESS_ARP_CONTROLLER = 3
+TABLE_LSP_INGRESS_ARP_RESPONSE = 4
+TABLE_LSP_INGRESS_UNTUNNEL = 5
+TABLE_LSP_INGRESS_LOOKUP_DST_PORT = 6
+TABLE_LSP_INGRESS_OUTPUT_DST_PORT = 7
+TABLE_LSP_TRACE_INGRESS_OUT = 7 # same to TABLE_LSP_INGRESS_OUTPUT_DST_PORT
 
 TABLE_LSP_TRACE_EGRESS_IN = 20
 TABLE_LSP_EGRESS_JUDGE_LOOPBACK = 21
@@ -53,6 +54,9 @@
 TABLE_SEARCH_IP_MAC = 100
 TABLE_DROP_PACKET = 101
 
+# third-party table
+TABLE_THIRD_PARTY = 201
+
 flows_note_array = ['lsp_lookup_dst_port',
                     'lsp_output_dst_port',
                     'lsp_pushout_packet',
@@ -95,6 +99,7 @@
                     'pipeline_forward',
                     'redirect_other_chassis',
                     'output_pkt',
+                    'process_third_logic',
                    ]
 
 START_IDX = 10
@@ -112,6 +117,7 @@ def flows_idx2note(idx):
 table_note_dict = {
     TABLE_CONVERT_PHY_LOGICAL:'TABLE_CONVERT_PHY_LOGICAL',
     TABLE_LSP_TRACE_INGRESS_IN:'TABLE_LSP_TRACE_INGRESS_IN',
+    TABLE_LSP_INGRESS_PROCESS_EXT_LOGIC:'TABLE_LSP_INGRESS_PROCESS_EXT_LOGIC',
     TABLE_LSP_INGRESS_ARP_RESPONSE:'TABLE_LSP_INGRESS_ARP_RESPONSE',
     TABLE_LSP_INGRESS_ARP_CONTROLLER:'TABLE_LSP_INGRESS_ARP_CONTROLLER',
     TABLE_LSP_INGRESS_UNTUNNEL:'TABLE_LSP_INGRESS_UNTUNNEL',
@@ -143,4 +149,5 @@ def flows_idx2note(idx):
     TABLE_OUTPUT_PKT:'TABLE_OUTPUT_PKT',
     TABLE_SEARCH_IP_MAC:'TABLE_SEARCH_IP_MAC',
     TABLE_DROP_PACKET:'TABLE_DROP_PACKET',
+    TABLE_THIRD_PARTY:'TABLE_THIRD_PARTY',
 }

src/tuplenet/lcp/lflow.py

@@ -220,7 +220,7 @@ def init_build_flows_clause(options):
                 (Match == Match1 + Match2)
                 )
 
-    # build const trace flow for in first stage of lsp ingress
+    # build const trace flow in first stage of lsp ingress
     build_flows_lsp(Table, Priority, Match, Action) <= (
                 (Table == TABLE_LSP_TRACE_INGRESS_IN) &
                 action.load(0, NXM_Reg(REG_DST_IDX), Action1) &
@@ -253,6 +253,27 @@ def init_build_flows_clause(options):
                 (Action == Action1 + Action2)
                 )
 
+    # build const flows to forward packet to third party table
+    build_flows_lsp(Table, Priority, Match, Action) <= (
+                (Table == TABLE_LSP_INGRESS_PROCESS_EXT_LOGIC) &
+                (Priority == 0) &
+                match.match_none(Match) &
+                action.resubmit_table(TABLE_THIRD_PARTY, Action1) &
+                action.note(flows_note2idx('process_third_logic'), Action2) &
+                (Action == Action1 + Action2)
+                )
+
+    build_flows_lsp(Table, Priority, Match, Action) <= (
+                (Table == TABLE_THIRD_PARTY) &
+                (Priority == 0) &
+                match.match_none(Match) &
+                action.resubmit_table(TABLE_LSP_INGRESS_PROCESS_EXT_LOGIC+1, Action1) &
+                action.note(flows_note2idx('process_third_logic'), Action2) &
+                (Action == Action1 + Action2)
+                )
+
+    # build trace flow in end stage of lsp egress
+    # build trace flow in end stage of lsp egress
     # build trace flow in end stage of lsp egress
     # because the end stage of lsp egress has no uniq path, so
     # we have to add similar flows(simliar to regular flow) to trace
@@ -452,6 +473,7 @@ def init_build_flows_clause(options):
                 (Action == Action1 + Action2 + Action3)
                 )
 
+
 #---------------------const drop table--------------------------------
     build_flows_drop(Table, Priority, Match, Action) <= (
                 (Priority == 0) &
@@ -469,3 +491,4 @@ def init_build_flows_clause(options):
                 action.note(flows_note2idx('pkt_trace_drop_packet'), Action2) &
                 (Action == Action1 + Action2)
                 )
+

src/tuplenet/lcp/lsp_ingress.py

@@ -12,6 +12,7 @@
 pyDatalog.create_terms('lsp_lookup_dst_port')
 pyDatalog.create_terms('lsp_arp_controller')
 pyDatalog.create_terms('lsp_arp_response')
+pyDatalog.create_terms('lsp_process_third_logic')
 pyDatalog.create_terms('lsp_untunnel_deliver')
 pyDatalog.create_terms('_lsp_remote_lsp_changed, _lsp_lrp_ls_changed')
 

src/tuplenet/lcp/match.py

@@ -28,6 +28,9 @@
 pyDatalog.create_terms('arp_proto')
 pyDatalog.create_terms('arp_tpa')
 pyDatalog.create_terms('arp_op')
+pyDatalog.create_terms('tcp_proto')
+pyDatalog.create_terms('tcp_dstport')
+pyDatalog.create_terms('tcp_srcport')
 
 pyDatalog.create_terms('icmp_proto, icmp_type, icmp_code')
 
@@ -90,6 +93,12 @@ def init_match_clause():
 
     icmp_code(X, Y) <= (Y == [(ICMP_CODE_IDX, X)])
 
+    tcp_proto(X) <= (X == [(TCP_PROTO_IDX, )])
+
+    tcp_dstport(X, Y) <= (Y == [(TCP_DST_IDX, X)])
+
+    tcp_srcport(X, Y) <= (Y == [(TCP_SRC_IDX, X)])
+
 def convert_flags(flags):
     # e.g flag = 1 means it occupies the first bit
     # and flag = 4 means it occupies the third bit

src/tuplenet/tp_utils/pipe.py

@@ -48,6 +48,8 @@ def read_debug_pipe(param):
                 logger.exception("hit error in debug pipe, err:%s", err)
 
     try:
+        if os.path.exists(DEBUG_PIPE_PATH):
+            os.remove(DEBUG_PIPE_PATH)
         sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
         sock.bind(addr)
     except Exception as err: