🎈 perf: Update Classifier rule parameters.

Update Classifier rule parameters.

4 files changed, 124 insertions, 103 deletions

diff --git a/test/classifier_test.py b/test/classifier_test.py
index 9e358da..ff09e3b 100644
--- a/test/classifier_test.py
+++ b/test/classifier_test.py
@@ -119,6 +119,7 @@ devices=veth3,normal
 
 [classifier_rule:0]
 rule_id=1
+ruleset_type=classifier
 dst_ip_addr_v4=172.17.2.100
 dst_ip_mask_v4=32
 action=nf_steering
@@ -129,6 +130,7 @@ vwire_id=0
 
 [classifier_rule:1]
 rule_id=2
+ruleset_type=classifier  
 dst_ip_addr_v4=172.17.2.101
 dst_ip_mask_v4=32
 action=nf_steering
@@ -139,6 +141,7 @@ vwire_id=0
 
 [classifier_rule:2]
 rule_id=3
+ruleset_type=classifier  
 src_ip_addr_v4=172.17.2.102
 src_ip_mask_v4=32
 action=nf_steering
@@ -149,6 +152,7 @@ vwire_id=0
 
 [classifier_rule:3]
 rule_id=4
+ruleset_type=classifier  
 src_ip_addr_v4=172.17.2.103
 src_ip_mask_v4=32
 action=nf_steering
@@ -159,6 +163,7 @@ vwire_id=0
 
 [classifier_rule:4]
 rule_id=5
+ruleset_type=classifier  
 dst_ip_addr_v6=2222::4
 dst_ip_mask_v6=128
 action=nf_steering
@@ -169,6 +174,7 @@ vwire_id=0
 
 [classifier_rule:5]
 rule_id=6
+ruleset_type=classifier  
 dst_ip_addr_v6=2222::5
 dst_ip_mask_v6=128
 action=nf_steering
@@ -179,6 +185,7 @@ vwire_id=0
 
 [classifier_rule:6]
 rule_id=7
+ruleset_type=classifier  
 src_ip_addr_v6=2222::6
 src_ip_mask_v6=128
 action=nf_steering
@@ -189,6 +196,7 @@ vwire_id=0
 
 [classifier_rule:7]
 rule_id=8
+ruleset_type=classifier  
 src_ip_addr_v6=2222::7
 src_ip_mask_v6=128
 action=nf_steering
@@ -349,6 +357,7 @@ class TestForTreeSearch(BaseTest):
             global base_conf
             for i in range(8,128):
                 base_conf += "[classifier_rule:" + str(i) + "]\n"
+                base_conf += "ruleset_type=classifier\n"
                 base_conf += "rule_id=" + str(i+1) + "\n"
                 base_conf += "dst_ip_addr_v4=172.19.2." + str(i) + "\n"
                 base_conf += "dst_ip_mask_v4=32\n"
@@ -358,7 +367,7 @@ class TestForTreeSearch(BaseTest):
                 base_conf += "sid=1000\n"
                 base_conf += "vwire_id=0\n\n"
 
-            print(base_conf)
+            #print(base_conf)
             mrzcpd = Mrzcpd(base_conf)
             mrzcpd.start()
 
@@ -552,6 +561,7 @@ devices=veth1,normal
 
 [classifier_rule:0]
 rule_id=1
+ruleset_type=classifier  
 src_ip_addr_v4=172.17.1.100
 src_ip_mask_v4=32
 dst_ip_addr_v4=172.17.2.100
@@ -569,6 +579,7 @@ action=nf_steering
 
 [classifier_rule:1]
 rule_id=2
+ruleset_type=classifier  
 src_ip_addr_v6=1111::8888
 src_ip_mask_v6=128
 dst_ip_addr_v6=2222::9999
@@ -676,6 +687,7 @@ class FullFieldTreeMatchForVwireTest(BaseTest):
             conf = full_field_match_for_vwire_conf
             for i in range(8,128):
                 conf += "[classifier_rule:" + str(i) + "]\n"
+                conf += "ruleset_type=classifier\n"
                 conf += "rule_id=" + str(i+1) + "\n"
                 conf += "dst_ip_addr_v4=172.19.2." + str(i) + "\n"
                 conf += "dst_ip_mask_v4=32\n"
@@ -798,8 +810,8 @@ max_rules=64
 
 [tera_adapter:0]
 listen_device=veth0
-vlan_ingress=110
-vlan_egress=111
+vlan_int=110
+vlan_ext=111
 mac_flipping=0
 
 [service_lb]
@@ -817,6 +829,7 @@ devices=veth2,normal
 
 [classifier_rule:0]
 rule_id=1
+ruleset_type=classifier  
 src_ip_addr_v4=172.17.1.100
 src_ip_mask_v4=32
 dst_ip_addr_v4=172.17.2.100
@@ -834,6 +847,7 @@ action=nf_steering
 
 [classifier_rule:1]
 rule_id=2
+ruleset_type=classifier  
 src_ip_addr_v6=1111::8888
 src_ip_mask_v6=128
 dst_ip_addr_v6=2222::9999
@@ -931,6 +945,7 @@ class FullFieldTreeMatchForTeraTest(BaseTest):
             conf = full_field_match_for_tera_conf
             for i in range(8,128):
                 conf += "[classifier_rule:" + str(i) + "]\n"
+                conf += "ruleset_type=classifier\n"
                 conf += "rule_id=" + str(i+1) + "\n"
                 conf += "dst_ip_addr_v4=172.19.2." + str(i) + "\n"
                 conf += "dst_ip_mask_v4=32\n"
diff --git a/test/load_balance_test.py b/test/load_balance_test.py
index c2ce853..c8910bc 100644
--- a/test/load_balance_test.py
+++ b/test/load_balance_test.py
@@ -102,6 +102,7 @@ devices=veth0,normal,veth1,normal,veth2,normal
 
 [classifier_rule:0]
 rule_id=1
+ruleset_type=classifier  
 action=nf_steering
 priority=1
 category=0
diff --git a/test/msgpack_test.py b/test/msgpack_test.py
index 87b5b67..2bd4f0e 100644
--- a/test/msgpack_test.py
+++ b/test/msgpack_test.py
@@ -92,6 +92,7 @@ devices=veth2,normal
 
 [classifier_rule:0]
 rule_id=1
+ruleset_type=classifier  
 action=nf_steering
 priority=1
 category=0
@@ -224,6 +225,7 @@ devices=veth2,normal
 
 [classifier_rule:0]
 rule_id=1
+ruleset_type=classifier  
 action=nf_steering
 priority=1
 category=0
@@ -363,6 +365,7 @@ devices=veth-msgpack-tx,normal
 
 [classifier_rule:0]
 rule_id=1
+ruleset_type=classifier  
 action=nf_steering
 priority=1
 category=0
diff --git a/test/tera_test.py b/test/tera_test.py
index 942b7d2..ff16ae1 100644
--- a/test/tera_test.py
+++ b/test/tera_test.py
@@ -76,8 +76,8 @@ sid_end=2000
 
 [tera_adapter:0]
 listen_device=veth0
-vlan_ingress=110
-vlan_egress=111
+vlan_int=110
+vlan_ext=111
 mac_flipping=0
 
 """
@@ -181,8 +181,8 @@ sid_end=2000
 
 [tera_adapter:0]
 listen_device=veth1
-vlan_ingress=110
-vlan_egress=111
+vlan_int=110
+vlan_ext=111
 mac_flipping=1
 
 """
@@ -291,98 +291,98 @@ sid_end=2000
 
 [tera_adapter:0]
 listen_device=veth0
-vlan_ingress=110
-vlan_egress=111
+vlan_int=110
+vlan_ext=111
 mac_flipping=1
 
 [tera_adapter:1]
 listen_device=veth0
-vlan_ingress=112
-vlan_egress=113
+vlan_int=112
+vlan_ext=113
 mac_flipping=1
 
 [tera_adapter:2]
 listen_device=veth0
-vlan_ingress=114
-vlan_egress=115
+vlan_int=114
+vlan_ext=115
 mac_flipping=1
 
 [tera_adapter:3]
 listen_device=veth0
-vlan_ingress=116
-vlan_egress=117
+vlan_int=116
+vlan_ext=117
 mac_flipping=1
 
 [tera_adapter:4]
 listen_device=veth0
-vlan_ingress=118
-vlan_egress=119
+vlan_int=118
+vlan_ext=119
 mac_flipping=1
 
 [tera_adapter:5]
 listen_device=veth0
-vlan_ingress=120
-vlan_egress=121
+vlan_int=120
+vlan_ext=121
 mac_flipping=1
 
 [tera_adapter:6]
 listen_device=veth0
-vlan_ingress=122
-vlan_egress=123
+vlan_int=122
+vlan_ext=123
 mac_flipping=1
 
 [tera_adapter:7]
 listen_device=veth0
-vlan_ingress=124
-vlan_egress=125
+vlan_int=124
+vlan_ext=125
 mac_flipping=1
 
 [tera_adapter:8]
 listen_device=veth0
-vlan_ingress=126
-vlan_egress=127
+vlan_int=126
+vlan_ext=127
 mac_flipping=1
 
 [tera_adapter:9]
 listen_device=veth0
-vlan_ingress=128
-vlan_egress=129
+vlan_int=128
+vlan_ext=129
 mac_flipping=1
 
 [tera_adapter:10]
 listen_device=veth0
-vlan_ingress=130
-vlan_egress=131
+vlan_int=130
+vlan_ext=131
 mac_flipping=1
 
 [tera_adapter:11]
 listen_device=veth0
-vlan_ingress=132
-vlan_egress=133
+vlan_int=132
+vlan_ext=133
 mac_flipping=1
 
 [tera_adapter:12]
 listen_device=veth0
-vlan_ingress=134
-vlan_egress=135
+vlan_int=134
+vlan_ext=135
 mac_flipping=1
 
 [tera_adapter:13]
 listen_device=veth0
-vlan_ingress=136
-vlan_egress=137
+vlan_int=136
+vlan_ext=137
 mac_flipping=1
 
 [tera_adapter:14]
 listen_device=veth0
-vlan_ingress=138
-vlan_egress=139
+vlan_int=138
+vlan_ext=139
 mac_flipping=1
 
 [tera_adapter:15]
 listen_device=veth0
-vlan_ingress=140
-vlan_egress=141
+vlan_int=140
+vlan_ext=141
 mac_flipping=1
 """
 """
@@ -610,98 +610,98 @@ sid_end=2000
 
 [tera_adapter:0]
 listen_device=veth0
-vlan_ingress=110
-vlan_egress=111
+vlan_int=110
+vlan_ext=111
 mac_flipping=1
 
 [tera_adapter:1]
 listen_device=veth0
-vlan_ingress=112
-vlan_egress=113
+vlan_int=112
+vlan_ext=113
 mac_flipping=1
 
 [tera_adapter:2]
 listen_device=veth0
-vlan_ingress=114
-vlan_egress=115
+vlan_int=114
+vlan_ext=115
 mac_flipping=1
 
 [tera_adapter:3]
 listen_device=veth0
-vlan_ingress=116
-vlan_egress=117
+vlan_int=116
+vlan_ext=117
 mac_flipping=1
 
 [tera_adapter:4]
 listen_device=veth0
-vlan_ingress=118
-vlan_egress=119
+vlan_int=118
+vlan_ext=119
 mac_flipping=1
 
 [tera_adapter:5]
 listen_device=veth0
-vlan_ingress=120
-vlan_egress=121
+vlan_int=120
+vlan_ext=121
 mac_flipping=1
 
 [tera_adapter:6]
 listen_device=veth0
-vlan_ingress=122
-vlan_egress=123
+vlan_int=122
+vlan_ext=123
 mac_flipping=1
 
 [tera_adapter:7]
 listen_device=veth0
-vlan_ingress=124
-vlan_egress=125
+vlan_int=124
+vlan_ext=125
 mac_flipping=1
 
 [tera_adapter:8]
 listen_device=veth0
-vlan_ingress=126
-vlan_egress=127
+vlan_int=126
+vlan_ext=127
 mac_flipping=1
 
 [tera_adapter:9]
 listen_device=veth0
-vlan_ingress=128
-vlan_egress=129
+vlan_int=128
+vlan_ext=129
 mac_flipping=1
 
 [tera_adapter:10]
 listen_device=veth0
-vlan_ingress=130
-vlan_egress=131
+vlan_int=130
+vlan_ext=131
 mac_flipping=1
 
 [tera_adapter:11]
 listen_device=veth0
-vlan_ingress=132
-vlan_egress=133
+vlan_int=132
+vlan_ext=133
 mac_flipping=1
 
 [tera_adapter:12]
 listen_device=veth0
-vlan_ingress=134
-vlan_egress=135
+vlan_int=134
+vlan_ext=135
 mac_flipping=1
 
 [tera_adapter:13]
 listen_device=veth0
-vlan_ingress=136
-vlan_egress=137
+vlan_int=136
+vlan_ext=137
 mac_flipping=1
 
 [tera_adapter:14]
 listen_device=veth0
-vlan_ingress=138
-vlan_egress=139
+vlan_int=138
+vlan_ext=139
 mac_flipping=1
 
 [tera_adapter:15]
 listen_device=veth0
-vlan_ingress=140
-vlan_egress=141
+vlan_int=140
+vlan_ext=141
 mac_flipping=1
 
 # load balance
@@ -711,6 +711,7 @@ devices=veth1,normal
 
 [classifier_rule:0]
 rule_id=1
+ruleset_type=classifier  
 action=nf_steering
 priority=1
 category=0
@@ -1032,98 +1033,98 @@ sid_end=2000
 
 [tera_adapter:0]
 listen_device=veth0
-vlan_ingress=110
-vlan_egress=111
+vlan_int=110
+vlan_ext=111
 mac_flipping=1
 
 [tera_adapter:1]
 listen_device=veth0
-vlan_ingress=112
-vlan_egress=113
+vlan_int=112
+vlan_ext=113
 mac_flipping=1
 
 [tera_adapter:2]
 listen_device=veth0
-vlan_ingress=114
-vlan_egress=115
+vlan_int=114
+vlan_ext=115
 mac_flipping=1
 
 [tera_adapter:3]
 listen_device=veth0
-vlan_ingress=116
-vlan_egress=117
+vlan_int=116
+vlan_ext=117
 mac_flipping=1
 
 [tera_adapter:4]
 listen_device=veth0
-vlan_ingress=118
-vlan_egress=119
+vlan_int=118
+vlan_ext=119
 mac_flipping=1
 
 [tera_adapter:5]
 listen_device=veth0
-vlan_ingress=120
-vlan_egress=121
+vlan_int=120
+vlan_ext=121
 mac_flipping=1
 
 [tera_adapter:6]
 listen_device=veth0
-vlan_ingress=122
-vlan_egress=123
+vlan_int=122
+vlan_ext=123
 mac_flipping=1
 
 [tera_adapter:7]
 listen_device=veth0
-vlan_ingress=124
-vlan_egress=125
+vlan_int=124
+vlan_ext=125
 mac_flipping=1
 
 [tera_adapter:8]
 listen_device=veth0
-vlan_ingress=126
-vlan_egress=127
+vlan_int=126
+vlan_ext=127
 mac_flipping=1
 
 [tera_adapter:9]
 listen_device=veth0
-vlan_ingress=128
-vlan_egress=129
+vlan_int=128
+vlan_ext=129
 mac_flipping=1
 
 [tera_adapter:10]
 listen_device=veth0
-vlan_ingress=130
-vlan_egress=131
+vlan_int=130
+vlan_ext=131
 mac_flipping=1
 
 [tera_adapter:11]
 listen_device=veth0
-vlan_ingress=132
-vlan_egress=133
+vlan_int=132
+vlan_ext=133
 mac_flipping=1
 
 [tera_adapter:12]
 listen_device=veth0
-vlan_ingress=134
-vlan_egress=135
+vlan_int=134
+vlan_ext=135
 mac_flipping=1
 
 [tera_adapter:13]
 listen_device=veth0
-vlan_ingress=136
-vlan_egress=137
+vlan_int=136
+vlan_ext=137
 mac_flipping=1
 
 [tera_adapter:14]
 listen_device=veth0
-vlan_ingress=138
-vlan_egress=139
+vlan_int=138
+vlan_ext=139
 mac_flipping=1
 
 [tera_adapter:15]
 listen_device=veth0
-vlan_ingress=140
-vlan_egress=141
+vlan_int=140
+vlan_ext=141
 mac_flipping=1
 
 # load balance
@@ -1133,6 +1134,7 @@ devices=veth-msgpack-tx,normal
 
 [classifier_rule:0]
 rule_id=1
+ruleset_type=classifier  
 action=nf_steering
 priority=1
 category=0