update sc case

20 files changed, 101 insertions, 23 deletions

diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_bfd.py
index 90afb1353..df98ef962 100644
--- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_bfd.py
+++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_bfd.py
@@ -99,7 +99,10 @@ def run(parameter):
                                     "value": "group-xxg-tsgx",
                                     "tag": "device_group"
                                 },
-                            "connectivity": "VXLAN-G:3.3.3.46",
+                                "connectivity": {
+                                    "method": "vxlan_g",
+                                    "dest_ip" : "3.3.3.48"
+                                },
                                 "health_check": {
                                     "method": "bfd",
                                     "interval_ms": 10,
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_bfd.py
index aa040675c..94acdec4a 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_bfd.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_bfd.py
@@ -115,7 +115,10 @@ def run(parameter):
                                     "value": "group-xxg-tsgx",
                                     "tag": "device_group"
                                 },
-                            "connectivity": "VXLAN-G:22.22.22.22",
+                                "connectivity": {
+                                    "method": "vxlan_g",
+                                    "dest_ip" : "3.3.3.48"
+                                },
                                 "health_check": {
                                     "method": "bfd",
                                     "interval_ms": 10,
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py
index e7691bc35..ac441b7d2 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py
@@ -115,7 +115,10 @@ def run(parameter):
                                     "value": "group-xxg-tsgx",
                                     "tag": "device_group"
                                 },
-                            "connectivity": "VXLAN-G:22.22.22.22",
+                                "connectivity": {
+                                    "method": "vxlan_g",
+                                    "dest_ip" : "3.3.3.48"
+                                },
                                 "health_check": {
                                     "method": "none",
                                     "interval_ms": 200,
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_bfd.py
index 153f39230..2778a3827 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_bfd.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_bfd.py
@@ -119,7 +119,10 @@ def run(parameter):
                                     "value": "group-xxg-tsgx",
                                     "tag": "device_group"
                                 },
-                            "connectivity": "VXLAN-G:6.6.6.30",
+                                "connectivity": {
+                                    "method": "vxlan_g",
+                                    "dest_ip" : "3.3.3.48"
+                                },
                                 "health_check": {
                                     "method": "bfd",
                                     "interval_ms": 10,
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_inactiveip_bfd.py
index 4f72b4e83..56407d148 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_inactiveip_bfd.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_inactiveip_bfd.py
@@ -119,7 +119,11 @@ def run(parameter):
                                     "method": "vxlan_g",
                                     "dest_ip" : "2.2.2.55"
                                 },
-                            "health_check": "BFD:200:5",
+                                "health_check": {
+                                    "method": "bfd",
+                                    "interval_ms": 200,
+                                    "retires": 5
+                                }
                             }
                         ]
                     }
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_unavailableip_bfd.py
index f866b0b55..58bfcae70 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_unavailableip_bfd.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_unavailableip_bfd.py
@@ -115,8 +115,15 @@ def run(parameter):
                                     "value": "group-xxg-tsgx",
                                     "tag": "device_group"
                                 },
-                            "connectivity": "VXLAN-G:183.183.183.183",
-                            "health_check": "BFD:200:5",
+                                "connectivity": {
+                                    "method": "vxlan_g",
+                                    "dest_ip" : "3.3.3.48"
+                                },
+                                "health_check": {
+                                    "method": "bfd",
+                                    "interval_ms": 200,
+                                    "retires": 5
+                                }
                             }
                         ]
                     }
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_unavailableip_none.py
index 8e995d84a..963cc7b76 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_unavailableip_none.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_unavailableip_none.py
@@ -115,7 +115,10 @@ def run(parameter):
                                     "value": "group-xxg-tsgx",
                                     "tag": "device_group"
                                 },
-                            "connectivity": "VXLAN-G:5.6.8.3",
+                                "connectivity": {
+                                    "method": "vxlan_g",
+                                    "dest_ip" : "3.3.3.48"
+                                },
                                 "health_check": {
                                     "method": "none",
                                     "interval_ms": 200,
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_inactiveip_bfd.py
index 1ee825d14..d798e685e 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_inactiveip_bfd.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_inactiveip_bfd.py
@@ -119,7 +119,11 @@ def run(parameter):
                                     "method": "vxlan_g",
                                     "dest_ip" : "2.2.2.55"
                                 },
-                            "health_check": "BFD:200:5",
+                                "health_check": {
+                                    "method": "bfd",
+                                    "interval_ms": 200,
+                                    "retires": 5
+                                }
                             }
                         ]
                     }
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_unavailableip_bfd.py
index 76c91b9da..8bb629924 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_unavailableip_bfd.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_unavailableip_bfd.py
@@ -115,8 +115,15 @@ def run(parameter):
                                     "value": "group-xxg-tsgx",
                                     "tag": "device_group"
                                 },
-                            "connectivity": "VXLAN-G:11.24.28.10",
-                            "health_check": "BFD:200:5",
+                                "connectivity": {
+                                    "method": "vxlan_g",
+                                    "dest_ip" : "3.3.3.48"
+                                },
+                                "health_check": {
+                                    "method": "bfd",
+                                    "interval_ms": 200,
+                                    "retires": 5
+                                }
                             }
                         ]
                     }
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_unavailableip_none.py
index b4b2bd7a7..53658d9eb 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_unavailableip_none.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_unavailableip_none.py
@@ -116,7 +116,10 @@ def run(parameter):
                                     "value": "group-xxg-tsgx",
                                     "tag": "device_group"
                                 },
-                            "connectivity": "VXLAN-G:11.24.28.10",
+                                "connectivity": {
+                                    "method": "vxlan_g",
+                                    "dest_ip" : "3.3.3.48"
+                                },
                                 "health_check": {
                                     "method": "none",
                                     "interval_ms": 200,
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_bfd.py
index 6d937ded1..8abf25f8d 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_bfd.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_bfd.py
@@ -122,7 +122,11 @@ def run(parameter):
                                     "method": "vxlan_g",
                                     "dest_ip" : "2.2.2.55"
                                 },
-                            "health_check": "BFD:200:5",
+                                "health_check": {
+                                    "method": "bfd",
+                                    "interval_ms": 200,
+                                    "retires": 5
+                                }
                             }
                         ]
                     }
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_bfd.py
index 02cd5e0a7..22c3a9a47 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_bfd.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_bfd.py
@@ -118,7 +118,10 @@ def run(parameter):
                                     "value": "group-xxg-tsgx",
                                     "tag": "device_group"
                                 },
-                            "connectivity": "VXLAN-G:6.6.6.6",
+                                "connectivity": {
+                                    "method": "vxlan_g",
+                                    "dest_ip" : "3.3.3.48"
+                                },
                                 "health_check": {
                                     "method": "bfd",
                                     "interval_ms": 10,
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_none.py
index f18607a31..d62eb9f6d 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_none.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_none.py
@@ -118,7 +118,10 @@ def run(parameter):
                                     "value": "group-xxg-tsgx",
                                     "tag": "device_group"
                                 },
-                            "connectivity": "VXLAN-G:4.6.1.5",
+                                "connectivity": {
+                                    "method": "vxlan_g",
+                                    "dest_ip" : "3.3.3.48"
+                                },
                                 "health_check": {
                                     "method": "none",
                                     "interval_ms": 200,
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_bfd.py
index 395920001..2627b5881 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_bfd.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_bfd.py
@@ -123,7 +123,11 @@ def run(parameter):
                                     "method": "vxlan_g",
                                     "dest_ip" : "2.2.2.55"
                                 },
-                            "health_check": "BFD:200:5",
+                                "health_check": {
+                                    "method": "bfd",
+                                    "interval_ms": 200,
+                                    "retires": 5
+                                }
                             }
                         ]
                     }
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py
index 4ed9911e9..4adc530ff 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py
@@ -120,7 +120,10 @@ def run(parameter):
                                     "value": "group-xxg-tsgx",
                                     "tag": "device_group"
                                 },
-                            "connectivity": "VXLAN-G:6.6.6.8",
+                                "connectivity": {
+                                    "method": "vxlan_g",
+                                    "dest_ip" : "3.3.3.48"
+                                },
                                 "health_check": {
                                     "method": "bfd",
                                     "interval_ms": 60000,
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py
index 5069a6214..fc789ff92 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py
@@ -119,7 +119,10 @@ def run(parameter):
                                     "value": "group-xxg-tsgx",
                                     "tag": "device_group"
                                 },
-                            "connectivity": "VXLAN-G:6.6.6.10",
+                                "connectivity": {
+                                    "method": "vxlan_g",
+                                    "dest_ip" : "3.3.3.48"
+                                },
                                 "health_check": {
                                     "method": "none",
                                     "interval_ms": 200,
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_activeip_bfd.py
index 06d7594a8..f1347a19a 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_activeip_bfd.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_activeip_bfd.py
@@ -101,7 +101,11 @@ def run(parameter):
                                     "method": "vxlan_g",
                                     "dest_ip" : "2.2.2.53"
                                 }, 
-                            "health_check": "BFD:200:5",
+                                "health_check": {
+                                    "method": "bfd",
+                                    "interval_ms": 200,
+                                    "retires": 5
+                                }
                             }
                         ]
                     }
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_inactiveip_bfd.py
index 70d7f55d8..ae0b78d18 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_inactiveip_bfd.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_inactiveip_bfd.py
@@ -101,7 +101,11 @@ def run(parameter):
                                     "method": "vxlan_g",
                                     "dest_ip" : "2.2.2.55"
                                 },
-                            "health_check": "BFD:200:5",
+                                "health_check": {
+                                    "method": "bfd",
+                                    "interval_ms": 200,
+                                    "retires": 5
+                                }
                             }
                         ]
                     }
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_unavailableip_bfd.py
index 10360bc46..81ba665cb 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_unavailableip_bfd.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_unavailableip_bfd.py
@@ -97,8 +97,15 @@ def run(parameter):
                                     "value": "group-xxg-tsgx",
                                     "tag": "device_group"
                                 },
-                            "connectivity": "VXLAN-G:5.6.3.2",
-                            "health_check": "BFD:200:5",
+                                "connectivity": {
+                                    "method": "vxlan_g",
+                                    "dest_ip" : "3.3.3.48"
+                                },
+                                "health_check": {
+                                    "method": "bfd",
+                                    "interval_ms": 200,
+                                    "retires": 5
+                                }
                             }
                         ]
                     }
diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_unavailableip_none.py
index 476dd916a..04fbb59e8 100644
--- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_unavailableip_none.py
+++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_unavailableip_none.py
@@ -97,7 +97,10 @@ def run(parameter):
                                     "value": "group-xxg-tsgx",
                                     "tag": "device_group"
                                 },
-                            "connectivity": "VXLAN-G:5.6.3.4",
+                                "connectivity": {
+                                    "method": "vxlan_g",
+                                    "dest_ip" : "3.3.3.48"
+                                },
                                 "health_check": {
                                     "method": "none",
                                     "interval_ms": 200,