🧪 test(DPISDN-32): Update PTF test scripts to support loading Classifier Rules from mrglobal.dynamic.conf.

 Update PTF test scripts to support loading Classifier Rules from mrglobal.dynamic.conf.

12 files changed, 150 insertions, 113 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6f19a83..fe8faa8 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -50,7 +50,7 @@ add_test(
     NAME bfd_test
     COMMAND /usr/local/bin/ptf --test-dir ${CMAKE_SOURCE_DIR}/test
     --interface 0@veth0-ptf0
-    etherfabric_test bfdd_test --test-params "source_dir='${CMAKE_SOURCE_DIR}'"
+    bfd_test_for_etherfabric bfd_test_for_bfdd --test-params "source_dir='${CMAKE_SOURCE_DIR}'"
 )
 
 # Add bridge test
@@ -58,7 +58,7 @@ add_test(
     NAME bridge_test
     COMMAND /usr/local/bin/ptf --test-dir ${CMAKE_SOURCE_DIR}/test
     --interface 0@veth0-ptf0 --interface 1@veth1-ptf1 --interface 2@veth2-ptf2 --interface 3@veth3-ptf3
-    unicast_test broadcast_test master_device_test --test-params "source_dir='${CMAKE_SOURCE_DIR}'"
+    bridge_test_unicast bridge_test_broadcast bridge_test_master_device --test-params "source_dir='${CMAKE_SOURCE_DIR}'"
 )
 
 
@@ -67,7 +67,7 @@ add_test(
     NAME classifier_test
     COMMAND /usr/local/bin/ptf --test-dir ${CMAKE_SOURCE_DIR}/test
     --interface 0@veth0-ptf0 --interface 1@veth1-ptf1 --interface 2@veth2-ptf2 --interface 3@veth3-ptf3 --interface 4@veth4-ptf4 --interface 5@veth5-ptf5
-    classifier_base_test full_field_match_test --test-params "source_dir='${CMAKE_SOURCE_DIR}'"
+    classifier_test_base full_field_match_test --test-params "source_dir='${CMAKE_SOURCE_DIR}'"
 )
 
 # Add etherfabric test
diff --git a/test/bfd_test.py b/test/bfd_test.py
index b61f989..049a7f9 100644
--- a/test/bfd_test.py
+++ b/test/bfd_test.py
@@ -72,7 +72,7 @@ sid_end=2000
 """
 
 
-@group("etherfabric_test")
+@group("bfd_test_for_etherfabric")
 class TestForEtherfabric(BaseTest):
     def setUp(self):
         self.dataplane = ptf.dataplane_instance
@@ -83,7 +83,7 @@ class TestForEtherfabric(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(bfd_conf)
+            mrzcpd = Mrzcpd(bfd_conf,"")
             mrzcpd.start()
 
             # Create packet
@@ -120,7 +120,7 @@ class TestForEtherfabric(BaseTest):
 """
 
 
-@group("bfdd_test")
+@group("bfd_test_for_bfdd")
 class TestForBfdd(BaseTest):
     def setUp(self):
         self.dataplane = ptf.dataplane_instance
@@ -131,7 +131,7 @@ class TestForBfdd(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(bfd_conf)
+            mrzcpd = Mrzcpd(bfd_conf,"")
             mrzcpd.start()
 
             """
diff --git a/test/bridge_test.py b/test/bridge_test.py
index 3e450d1..fca9d42 100644
--- a/test/bridge_test.py
+++ b/test/bridge_test.py
@@ -104,7 +104,7 @@ devices=veth0,veth1,veth2,veth3
 """
 
 
-@group("unicast_test")
+@group("bridge_test_unicast")
 class TestForUnicastPkt(BaseTest):
 
     def setUp(self):
@@ -116,7 +116,7 @@ class TestForUnicastPkt(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(bridge_conf)
+            mrzcpd = Mrzcpd(bridge_conf, "")
             mrzcpd.start()
 
             """
@@ -190,7 +190,7 @@ class TestForUnicastPkt(BaseTest):
 """
 
 
-@group("broadcast_test")
+@group("bridge_test_broadcast")
 class TestForBroadcastPkt(BaseTest):
 
     def setUp(self):
@@ -202,7 +202,7 @@ class TestForBroadcastPkt(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(bridge_conf)
+            mrzcpd = Mrzcpd(bridge_conf, "")
             mrzcpd.start()
 
             # Create packet
@@ -232,7 +232,7 @@ class TestForBroadcastPkt(BaseTest):
 """
 
 
-@group("master_device_test")
+@group("bridge_test_master_device")
 class TestForMasterDevice(BaseTest):
     def setUp(self):
         self.dataplane = ptf.dataplane_instance
@@ -243,7 +243,7 @@ class TestForMasterDevice(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(bridge_conf)
+            mrzcpd = Mrzcpd(bridge_conf, "")
             mrzcpd.start()
 
             # Create packet
diff --git a/test/classifier_test.py b/test/classifier_test.py
index ff09e3b..078be5e 100644
--- a/test/classifier_test.py
+++ b/test/classifier_test.py
@@ -5,7 +5,7 @@ from scapy.all import *
 from mrzcpd import Mrzcpd
 from common_pkt import *
 
-base_conf = """
+start_conf_base = """
 [device]
 device=veth0,veth1,veth2,veth3,veth4,veth5
 sz_tunnel=8192
@@ -117,6 +117,10 @@ devices=veth2,normal
 mode=balance
 devices=veth3,normal
 
+"""
+
+dynamic_conf_base = """
+
 [classifier_rule:0]
 rule_id=1
 ruleset_type=classifier
@@ -204,8 +208,6 @@ priority=1
 category=0
 sid=1003
 vwire_id=0
-
-
 """
 """
              +----------------------+   +----------------------+
@@ -234,7 +236,7 @@ vwire_id=0
 """
 
 
-@group("classifier_base_test")
+@group("classifier_test_base")
 class BaseForLinearSearch(BaseTest):
     def setUp(self):
         self.dataplane = ptf.dataplane_instance
@@ -245,7 +247,7 @@ class BaseForLinearSearch(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(base_conf)
+            mrzcpd = Mrzcpd(start_conf_base,dynamic_conf_base)
             mrzcpd.start()
 
             """
@@ -343,7 +345,7 @@ class BaseForLinearSearch(BaseTest):
             mrzcpd.stop()
 
 
-@group("classifier_base_test")
+@group("classifier_test_base")
 class TestForTreeSearch(BaseTest):
     def setUp(self):
         self.dataplane = ptf.dataplane_instance
@@ -354,21 +356,21 @@ class TestForTreeSearch(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            global base_conf
+            global dynamic_conf_base
             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"
-                base_conf += "action=nf_steering\n"
-                base_conf += "priority=1\n"
-                base_conf += "category=0\n"
-                base_conf += "sid=1000\n"
-                base_conf += "vwire_id=0\n\n"
+                dynamic_conf_base += "[classifier_rule:" + str(i) + "]\n"
+                dynamic_conf_base += "ruleset_type=classifier\n"
+                dynamic_conf_base += "rule_id=" + str(i+1) + "\n"
+                dynamic_conf_base += "dst_ip_addr_v4=172.19.2." + str(i) + "\n"
+                dynamic_conf_base += "dst_ip_mask_v4=32\n"
+                dynamic_conf_base += "action=nf_steering\n"
+                dynamic_conf_base += "priority=1\n"
+                dynamic_conf_base += "category=0\n"
+                dynamic_conf_base += "sid=1000\n"
+                dynamic_conf_base += "vwire_id=0\n\n"
 
             #print(base_conf)
-            mrzcpd = Mrzcpd(base_conf)
+            mrzcpd = Mrzcpd(start_conf_base,dynamic_conf_base)
             mrzcpd.start()
 
             """
@@ -467,7 +469,7 @@ class TestForTreeSearch(BaseTest):
 
 category_conf = """Current not support priority"""
 
-full_field_match_for_vwire_conf = """
+start_conf_vwire = """
 [device]
 device=veth0,veth1,veth2,veth3
 sz_tunnel=8192
@@ -559,6 +561,10 @@ devices=veth0,normal
 mode=balance
 devices=veth1,normal
 
+"""
+
+dynamic_conf_full_field_match_for_vwire = """
+
 [classifier_rule:0]
 rule_id=1
 ruleset_type=classifier  
@@ -634,7 +640,7 @@ class FullFieldLinearMatchForVwireTest(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(full_field_match_for_vwire_conf)
+            mrzcpd = Mrzcpd(start_conf_vwire,dynamic_conf_full_field_match_for_vwire)
             mrzcpd.start()
 
             # Check IPv4 for miss
@@ -683,20 +689,20 @@ class FullFieldTreeMatchForVwireTest(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            global full_field_match_for_vwire_conf
-            conf = full_field_match_for_vwire_conf
+            global dynamic_conf_full_field_match_for_vwire
+            dynamic_conf = dynamic_conf_full_field_match_for_vwire
             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"
-                conf += "action=nf_steering\n"
-                conf += "priority=1\n"
-                conf += "category=0\n"
-                conf += "sid=1000\n"
-                conf += "vwire_id=0\n\n"
-            mrzcpd = Mrzcpd(conf)
+                dynamic_conf += "[classifier_rule:" + str(i) + "]\n"
+                dynamic_conf += "ruleset_type=classifier\n"
+                dynamic_conf += "rule_id=" + str(i+1) + "\n"
+                dynamic_conf += "dst_ip_addr_v4=172.19.2." + str(i) + "\n"
+                dynamic_conf += "dst_ip_mask_v4=32\n"
+                dynamic_conf += "action=nf_steering\n"
+                dynamic_conf += "priority=1\n"
+                dynamic_conf += "category=0\n"
+                dynamic_conf += "sid=1000\n"
+                dynamic_conf += "vwire_id=0\n\n"
+            mrzcpd = Mrzcpd(start_conf_vwire,dynamic_conf)
             mrzcpd.start()
 
             # Check IPv4 for miss
@@ -735,7 +741,7 @@ class FullFieldTreeMatchForVwireTest(BaseTest):
             mrzcpd.stop()
 
 
-full_field_match_for_tera_conf = """
+start_conf_tera = """
 [device]
 device=veth0,veth1,veth2
 sz_tunnel=8192
@@ -827,6 +833,9 @@ devices=veth1,normal
 mode=balance
 devices=veth2,normal
 
+"""
+
+dynamic_conf_full_field_match_for_tera = """
 [classifier_rule:0]
 rule_id=1
 ruleset_type=classifier  
@@ -864,6 +873,7 @@ tera_id=0
 action=nf_steering
 
 """
+
 """
              +----------------------+   +----------------------+
              |  IPv4=172.17.2.100   |   |  IPv6=2222::9999     |
@@ -900,7 +910,7 @@ class FullFieldLinearMatchForTeraTest(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(full_field_match_for_tera_conf)
+            mrzcpd = Mrzcpd(start_conf_tera,dynamic_conf_full_field_match_for_tera)
             mrzcpd.start()
 
             # Check IPv4 for miss
@@ -941,20 +951,20 @@ class FullFieldTreeMatchForTeraTest(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            global full_field_match_for_tera_conf
-            conf = full_field_match_for_tera_conf
+            global dynamic_conf_full_field_match_for_tera
+            dynamic_conf = dynamic_conf_full_field_match_for_tera
             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"
-                conf += "action=nf_steering\n"
-                conf += "priority=1\n"
-                conf += "category=0\n"
-                conf += "sid=1000\n"
-                conf += "tera_id=0\n\n"
-            mrzcpd = Mrzcpd(conf)
+                dynamic_conf += "[classifier_rule:" + str(i) + "]\n"
+                dynamic_conf += "ruleset_type=classifier\n"
+                dynamic_conf += "rule_id=" + str(i+1) + "\n"
+                dynamic_conf += "dst_ip_addr_v4=172.19.2." + str(i) + "\n"
+                dynamic_conf += "dst_ip_mask_v4=32\n"
+                dynamic_conf += "action=nf_steering\n"
+                dynamic_conf += "priority=1\n"
+                dynamic_conf += "category=0\n"
+                dynamic_conf += "sid=1000\n"
+                dynamic_conf += "tera_id=0\n\n"
+            mrzcpd = Mrzcpd(start_conf_tera,dynamic_conf)
             mrzcpd.start()
 
             # Check IPv4 for miss
diff --git a/test/endpoint_dev_test.py b/test/endpoint_dev_test.py
index cfc0158..e9fcce5 100644
--- a/test/endpoint_dev_test.py
+++ b/test/endpoint_dev_test.py
@@ -82,7 +82,7 @@ sid_end=2000
 """
 
 @group("icmp_reply_test")
-class MpackSerializeTest(BaseTest):
+class IcmpReplyTest(BaseTest):
     def setUp(self):
         self.dataplane = ptf.dataplane_instance
 
@@ -92,7 +92,7 @@ class MpackSerializeTest(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(icmp_conf)
+            mrzcpd = Mrzcpd(icmp_conf,"")
             mrzcpd.start()
             send_pkt = simple_icmp_packet(eth_dst='00:01:02:03:04:05',eth_src='00:06:07:08:09:0a',ip_src='172.17.16.2', ip_dst='172.17.16.1', icmp_type=8, icmp_code=0,icmp_data='icmp test\n')
             send_packet(self, 0,send_pkt)
diff --git a/test/etherfabric_test.py b/test/etherfabric_test.py
index 563df19..0c9ab26 100644
--- a/test/etherfabric_test.py
+++ b/test/etherfabric_test.py
@@ -90,7 +90,7 @@ class TestForVirtualWireMode(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(conf_for_virtual_wire_mode)
+            mrzcpd = Mrzcpd(conf_for_virtual_wire_mode, "")
             mrzcpd.start()
 
             send_pkt = simple_vxlan_packet(
@@ -187,7 +187,7 @@ class TestForTapMode(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(conf_for_tap_mode)
+            mrzcpd = Mrzcpd(conf_for_tap_mode, "")
             mrzcpd.start()
 
             send_pkt = simple_vxlan_packet(
diff --git a/test/health_check_test.py b/test/health_check_test.py
index 40f23a8..c32f83a 100644
--- a/test/health_check_test.py
+++ b/test/health_check_test.py
@@ -94,7 +94,7 @@ class HealthCheckBaseTest(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(base_conf)
+            mrzcpd = Mrzcpd(base_conf, "")
             mrzcpd.start()
 
             (_, _, rcv_pkt, _) = dp_poll(
diff --git a/test/load_balance_test.py b/test/load_balance_test.py
index c8910bc..78aa758 100644
--- a/test/load_balance_test.py
+++ b/test/load_balance_test.py
@@ -6,7 +6,7 @@ from mrzcpd import Mrzcpd
 from common_pkt import *
 import ptf.mask as mask
 
-lb_base_conf = """
+start_conf = """
 [device]
 device=veth0,veth1,veth2,veth3,veth4
 sz_tunnel=8192
@@ -100,6 +100,9 @@ sid_end=2000
 mode=balance
 devices=veth0,normal,veth1,normal,veth2,normal
 
+"""
+
+dynamic_conf = """
 [classifier_rule:0]
 rule_id=1
 ruleset_type=classifier  
@@ -108,9 +111,9 @@ priority=1
 category=0
 sid=1000
 vwire_id=0
-"""
 
 """
+"""
     +-------+            +-------+         +------------+
     | Vwire |            |  LB   |         |     PTF    |
     +-------+            +-------+   100   +------------+
@@ -134,7 +137,7 @@ class TestForBase(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(lb_base_conf)
+            mrzcpd = Mrzcpd(start_conf,dynamic_conf)
             mrzcpd.start()
 
             # Create packet list
@@ -206,7 +209,7 @@ class TestForOneDevDown(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(lb_base_conf)
+            mrzcpd = Mrzcpd(start_conf,dynamic_conf)
             mrzcpd.start()
 
             # Set veth2 down
diff --git a/test/mrzcpd.py b/test/mrzcpd.py
index 19382e2..90c216e 100644
--- a/test/mrzcpd.py
+++ b/test/mrzcpd.py
@@ -9,15 +9,25 @@ mrzcpd_run_dir = "/var/run/mrzcpd"
 
 
 class Mrzcpd:
-    def __init__(self, conf):
-        self.conf = str(conf)
+    def __init__(self, conf_start,conf_dynamic):
         self.mrzcpd_path = ptf.testutils.test_param_get(
             "source_dir") + "/build/service/mrzcpd"
-        self.conf_path = ptf.testutils.test_param_get(
+        
+        self.conf_start = str(conf_start)
+        self.conf_path_start = ptf.testutils.test_param_get(
             "source_dir") + "/test/mrglobal.conf"
-        self.file = open(self.conf_path, 'w')
-        self.file.write(self.conf)
-        self.file.close()
+        
+        self.conf_dynamic = str(conf_dynamic)
+        self.conf_path_dynamic = ptf.testutils.test_param_get(
+            "source_dir") + "/test/mrglobal.dynamic.conf"
+        
+        self.file_start = open(self.conf_path_start, 'w')
+        self.file_start.write(self.conf_start)
+        self.file_start.close()
+
+        self.file_dynamic = open(self.conf_path_dynamic, 'w')
+        self.file_dynamic.write(self.conf_dynamic)
+        self.file_dynamic.close()
 
     def start(self):
         # Create run dir
@@ -27,7 +37,7 @@ class Mrzcpd:
 
         # Start mrzcpd
         self.mrzcpd_process = subprocess.Popen(
-            [self.mrzcpd_path, "-c", self.conf_path], stdout=subprocess.PIPE)
+            [self.mrzcpd_path, "-c", self.conf_path_start, "-s", self.conf_path_dynamic], stdout=subprocess.PIPE)
 
         # Check mrzcpd status
         start_timeout = 10
diff --git a/test/msgpack_test.py b/test/msgpack_test.py
index 2bd4f0e..261e164 100644
--- a/test/msgpack_test.py
+++ b/test/msgpack_test.py
@@ -7,7 +7,7 @@ from common_pkt import *
 import ptf.mask as mask
 import msgpack
 
-serialize_conf = """
+start_conf_serialize = """
 [device]
 device=veth0,veth1,veth2
 sz_tunnel=8192
@@ -89,6 +89,9 @@ sid_end=2000
 [load_balance:0]
 mode=balance
 devices=veth2,normal
+"""
+
+dynamic_conf_serialize = """
 
 [classifier_rule:0]
 rule_id=1
@@ -121,7 +124,7 @@ class MpackSerializeTest(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(serialize_conf)
+            mrzcpd = Mrzcpd(start_conf_serialize,dynamic_conf_serialize)
             mrzcpd.start()
 
             send_pkt = simple_udp_packet(ip_src="172.17.1.100", ip_dst="172.17.2.200",udp_payload="hello world")
@@ -141,7 +144,7 @@ class MpackSerializeTest(BaseTest):
         finally:
             mrzcpd.stop()
 
-deserialize_conf = """
+start_conf_deserialize = """
 [device]
 device=veth0,veth1,veth2
 sz_tunnel=8192
@@ -223,6 +226,9 @@ sid_end=2000
 mode=balance
 devices=veth2,normal
 
+"""
+
+dynamic_conf_deserialize = """
 [classifier_rule:0]
 rule_id=1
 ruleset_type=classifier  
@@ -231,6 +237,7 @@ priority=1
 category=0
 sid=1000
 vwire_id=0
+
 """
 
 """
@@ -254,7 +261,7 @@ class MpackDeserializeTest(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(deserialize_conf)
+            mrzcpd = Mrzcpd(start_conf_deserialize,dynamic_conf_deserialize)
             mrzcpd.start()
 
             verify_pkt = simple_udp_packet(ip_src="172.17.1.100", ip_dst="172.17.2.200",udp_payload="hello world")
@@ -274,7 +281,7 @@ class MpackDeserializeTest(BaseTest):
         finally:
             mrzcpd.stop()
 
-serialize_and_deserialize_conf = """
+start_conf_serialize_and_deserialize = """
 [device]
 device=veth0,veth1,veth-msgpack-tx,veth-msgpack-rx
 sz_tunnel=8192
@@ -363,6 +370,8 @@ sid_end=2000
 mode=balance
 devices=veth-msgpack-tx,normal
 
+"""
+dynamic_conf_serialize_and_deserialize = """
 [classifier_rule:0]
 rule_id=1
 ruleset_type=classifier  
@@ -371,8 +380,8 @@ priority=1
 category=0
 sid=1000
 vwire_id=0
-"""
 
+"""
 
 """
     +------------+        +-----------------------------------------+
@@ -395,7 +404,7 @@ class MpackSerializeAndDeserializeTest(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(serialize_and_deserialize_conf)
+            mrzcpd = Mrzcpd(start_conf_serialize_and_deserialize,dynamic_conf_serialize_and_deserialize)
             mrzcpd.start()
 
             send_pkt = simple_tcp_packet(
diff --git a/test/tera_test.py b/test/tera_test.py
index ff16ae1..b083791 100644
--- a/test/tera_test.py
+++ b/test/tera_test.py
@@ -6,7 +6,7 @@ from mrzcpd import Mrzcpd
 from common_pkt import *
 import msgpack
 
-tera_disable_mac_flapping = """
+start_conf_disable_mac_flapping = """
 [device]
 device=veth0
 sz_tunnel=8192
@@ -101,7 +101,7 @@ class TestForDisableMacFlapping(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(tera_disable_mac_flapping)
+            mrzcpd = Mrzcpd(start_conf_disable_mac_flapping, "")
             mrzcpd.start()
 
             send_pkt = simple_tcp_packet(eth_dst="02:5A:B0:BE:49:51",eth_src="02:5A:B0:BE:49:52",vlan_vid=110, dl_vlan_enable=True)
@@ -111,7 +111,7 @@ class TestForDisableMacFlapping(BaseTest):
         finally:
             mrzcpd.stop()
 
-tera_enable_mac_flapping = """
+start_conf_enable_mac_flapping = """
 [device]
 device=veth1
 sz_tunnel=8192
@@ -205,7 +205,7 @@ class TestForEnableMacFlapping(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(tera_enable_mac_flapping)
+            mrzcpd = Mrzcpd(start_conf_enable_mac_flapping,"")
             mrzcpd.start()
 
             send_pkt = simple_tcp_packet(eth_dst="02:5A:B0:BE:49:51",eth_src="02:5A:B0:BE:49:52",vlan_vid=110, dl_vlan_enable=True)
@@ -215,7 +215,7 @@ class TestForEnableMacFlapping(BaseTest):
         finally:
             mrzcpd.stop()
 
-tera_multi_entry = """
+start_conf_multi_entry = """
 [device]
 device=veth0,veth1
 sz_tunnel=8192
@@ -404,7 +404,7 @@ class IPv4TestForMultiEntry(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(tera_multi_entry)
+            mrzcpd = Mrzcpd(start_conf_multi_entry,"")
             mrzcpd.start()
 
             send_packets=[]
@@ -440,7 +440,7 @@ class IPv4TestForUnmatchedRules(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(tera_multi_entry)
+            mrzcpd = Mrzcpd(start_conf_multi_entry,"")
             mrzcpd.start()
 
             send_packets=[]
@@ -478,7 +478,7 @@ class IPv6TestForMultiEntry(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(tera_multi_entry)
+            mrzcpd = Mrzcpd(start_conf_multi_entry,"")
             mrzcpd.start()
 
             send_packets=[]
@@ -513,7 +513,7 @@ class IPv6TestForUnmatchedRules(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(tera_multi_entry)
+            mrzcpd = Mrzcpd(start_conf_multi_entry,"")
             mrzcpd.start()
 
             send_packets=[]
@@ -533,7 +533,7 @@ class IPv6TestForUnmatchedRules(BaseTest):
             mrzcpd.stop()
 
 
-tera_with_msgpack = """
+start_conf_with_msgpack = """
 [device]
 device=veth0,veth1
 sz_tunnel=8192
@@ -709,14 +709,6 @@ mac_flipping=1
 mode=balance
 devices=veth1,normal
 
-[classifier_rule:0]
-rule_id=1
-ruleset_type=classifier  
-action=nf_steering
-priority=1
-category=0
-sid=1000
-
 [link_db:0]
 type=2
 traffic_link_id=1000
@@ -797,6 +789,17 @@ type=2
 traffic_link_id=1015
 tera_id=15
 """
+
+dynamic_conf_with_msgpack = """
+[classifier_rule:0]
+rule_id=1
+ruleset_type=classifier  
+action=nf_steering
+priority=1
+category=0
+sid=1000
+"""
+
 """
     +------------+        +------------------------------------------+        +------------+
     |     PTF    |        |                 MRZCPD                   |        |     PTF    |
@@ -814,7 +817,7 @@ class IPv4MpackTestForIToE(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(tera_with_msgpack)
+            mrzcpd = Mrzcpd(start_conf_with_msgpack,dynamic_conf_with_msgpack)
             mrzcpd.start()
 
             send_packets=[]
@@ -850,7 +853,7 @@ class IPv4MpackTestForEToI(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(tera_with_msgpack)
+            mrzcpd = Mrzcpd(start_conf_with_msgpack,dynamic_conf_with_msgpack)
             mrzcpd.start()
 
             send_packets=[]
@@ -886,7 +889,7 @@ class IPv6MpackTestForIToE(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(tera_with_msgpack)
+            mrzcpd = Mrzcpd(start_conf_with_msgpack,dynamic_conf_with_msgpack)
             mrzcpd.start()
 
             send_packets=[]
@@ -922,7 +925,7 @@ class IPv6MpackTestForEToI(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(tera_with_msgpack)
+            mrzcpd = Mrzcpd(start_conf_with_msgpack,dynamic_conf_with_msgpack)
             mrzcpd.start()
 
             send_packets=[]
@@ -949,7 +952,7 @@ class IPv6MpackTestForEToI(BaseTest):
             mrzcpd.stop()
 
 
-tera_with_nf = """
+start_conf_with_nf = """
 [device]
 device=veth0,veth-msgpack-tx,veth-msgpack-rx
 sz_tunnel=8192
@@ -1131,7 +1134,9 @@ mac_flipping=1
 [load_balance:0]
 mode=balance
 devices=veth-msgpack-tx,normal
+"""
 
+dynamic_conf_with_nf = """
 [classifier_rule:0]
 rule_id=1
 ruleset_type=classifier  
@@ -1159,7 +1164,7 @@ class IPv4TestForIToE(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(tera_with_nf)
+            mrzcpd = Mrzcpd(start_conf_with_nf,dynamic_conf_with_nf)
             mrzcpd.start()
 
             send_packets=[]
@@ -1188,7 +1193,7 @@ class IPv4TestForEToI(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(tera_with_nf)
+            mrzcpd = Mrzcpd(start_conf_with_nf,dynamic_conf_with_nf)
             mrzcpd.start()
 
             send_packets=[]
@@ -1217,7 +1222,7 @@ class IPv6TestForIToE(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(tera_with_nf)
+            mrzcpd = Mrzcpd(start_conf_with_nf,dynamic_conf_with_nf)
             mrzcpd.start()
 
             send_packets=[]
@@ -1246,7 +1251,7 @@ class IPv6TestForEToI(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(tera_with_nf)
+            mrzcpd = Mrzcpd(start_conf_with_nf,dynamic_conf_with_nf)
             mrzcpd.start()
 
             send_packets=[]
diff --git a/test/vwire_test.py b/test/vwire_test.py
index 86c73be..8a377e3 100644
--- a/test/vwire_test.py
+++ b/test/vwire_test.py
@@ -5,7 +5,7 @@ from ptf.testutils import *
 from scapy.all import *
 from mrzcpd import Mrzcpd
 
-vwire_conf = """
+start_conf = """
 [device]
 device = veth0,veth1,veth2,veth3,veth4,veth5,veth6,veth7,veth8,veth9,veth10,veth11,veth12,veth13,veth14,veth15,veth16,veth17,veth18,veth19,veth20,veth21,veth22,veth23
 sz_tunnel = 8192
@@ -288,7 +288,7 @@ class TestSendAndReceive(BaseTest):
     def runTest(self):
         try:
             # Init & Start mrzcpd
-            mrzcpd = Mrzcpd(vwire_conf)
+            mrzcpd = Mrzcpd(start_conf,"")
             mrzcpd.start()
 
             # Create packet