diff options
| author | yang liu <[email protected]> | 2024-11-27 11:02:30 +0800 |
|---|---|---|
| committer | yang liu <[email protected]> | 2024-11-27 11:02:30 +0800 |
| commit | b7a46d5a93360f4c28ab76687bd9ad22399bdb8e (patch) | |
| tree | 094c88ef2a20aff9ffe768cd0a4bb3b29b58de72 | |
| parent | 1233702e6edf907e8476d3391ad72b24150d04ab (diff) | |
update expected metric
318 files changed, 360 insertions, 536 deletions
diff --git a/tests/service_chaining/sc_decrypted_negate_srcip_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_negate_srcip_fqdn_ssl_mirror_bypass_vlan_none.py index 0ace9a6f8..c94425ba1 100644 --- a/tests/service_chaining/sc_decrypted_negate_srcip_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_negate_srcip_fqdn_ssl_mirror_bypass_vlan_none.py @@ -120,7 +120,7 @@ def run(parameter): } verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 0}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_negate_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_negate_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index cc84d748d..fe45613e2 100644 --- a/tests/service_chaining/sc_decrypted_negate_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_negate_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -29,7 +29,7 @@ def run(parameter): "action": "service_chaining", "and_conditions": [ { - "negate_option": False, + "negate_option": True, "or_conditions": [ { "attribute_name": "ATTR_SOURCE_IP", @@ -120,7 +120,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 0}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_scrip_fqdn_ssl_mirror_block_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_scrip_fqdn_ssl_mirror_block_disabled_vxlan_activeip_bfd.py index 3028851b5..1b5a86cdf 100644 --- a/tests/service_chaining/sc_decrypted_scrip_fqdn_ssl_mirror_block_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_scrip_fqdn_ssl_mirror_block_disabled_vxlan_activeip_bfd.py @@ -120,7 +120,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "百度", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ext_compliance_risk_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ext_compliance_risk_library_fqdn_ssl_mirror_block_vlan_none.py index b53472168..63d6c6567 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ext_compliance_risk_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ext_compliance_risk_library_fqdn_ssl_mirror_block_vlan_none.py @@ -157,7 +157,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "example", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ext_geoip_city_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ext_geoip_city_library_fqdn_ssl_mirror_block_vlan_none.py index 835595c8c..8a9ec4709 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ext_geoip_city_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ext_geoip_city_library_fqdn_ssl_mirror_block_vlan_none.py @@ -151,7 +151,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "example", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ext_internet_service_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ext_internet_service_library_fqdn_ssl_mirror_block_vlan_none.py index a8e10d557..ec40b6d1c 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ext_internet_service_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ext_internet_service_library_fqdn_ssl_mirror_block_vlan_none.py @@ -157,7 +157,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "example", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ext_iprange_geoip_country_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ext_iprange_geoip_country_library_fqdn_ssl_mirror_block_vlan_none.py index c144cb646..065d6e43d 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ext_iprange_geoip_country_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ext_iprange_geoip_country_library_fqdn_ssl_mirror_block_vlan_none.py @@ -151,7 +151,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "example", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ext_iprange_security_threat_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ext_iprange_security_threat_library_fqdn_ssl_mirror_block_vlan_none.py index cad0bf4ae..4aa256003 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ext_iprange_security_threat_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ext_iprange_security_threat_library_fqdn_ssl_mirror_block_vlan_none.py @@ -151,7 +151,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "example", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ext_website_classification_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ext_website_classification_library_fqdn_ssl_mirror_block_vlan_none.py index 86b73e4b0..112836b4c 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ext_website_classification_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ext_website_classification_library_fqdn_ssl_mirror_block_vlan_none.py @@ -157,7 +157,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "example", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_http_url_mirror_bypass_vlan_none.py index 4c72da8a6..fed898981 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_http_url_mirror_bypass_vlan_none.py @@ -141,7 +141,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "ct.cn", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 03e60531f..fc4324bb6 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -141,7 +141,7 @@ def run(parameter): } verification_result = { "excepted_traffic_result": "yumi", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_negate_extport_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_negate_extport_ssl_steer_bypass_vxlan_activeip_bfd.py index 1edc9b27b..bc31505fd 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_negate_extport_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_negate_extport_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -138,7 +138,7 @@ def run(parameter): } verification_result = { "excepted_traffic_result": "baidu", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_negate_intport_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_negate_intport_ssl_mirror_bypass_vlan_none.py index 906af1656..0495df7ba 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_negate_intport_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_negate_intport_ssl_mirror_bypass_vlan_none.py @@ -139,7 +139,7 @@ def run(parameter): } verification_result = { "excepted_traffic_result": "baidu", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vlan_none.py index a7f6dd620..560f7e952 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vlan_none.py @@ -122,7 +122,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_activeip_bfd.py index be673a4f0..a36e9e721 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_activeip_bfd.py @@ -118,7 +118,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "百度", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } # 创建 diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_activeip_none.py index d8cfc04e2..3634328a3 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_activeip_none.py @@ -120,7 +120,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_inactiveip_bfd.py index 2e3949007..b30357db6 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_inactiveip_bfd.py @@ -118,7 +118,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "百度", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } # 创建 diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_inactiveip_none.py index 7b20ef388..68adbf02b 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_inactiveip_none.py @@ -120,7 +120,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "百度", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } # 创建 diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_unavailableip_bfd.py index 89594da82..be6bb313f 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_unavailableip_bfd.py @@ -120,7 +120,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_unavailableip_none.py index 2011f5ccc..09ae999b2 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_block_vxlan_unavailableip_none.py @@ -119,7 +119,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_disabled_vxlan_activeip_bfd.py index 148f6773d..f7d723604 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_disabled_vxlan_activeip_bfd.py @@ -123,7 +123,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vlan_none.py index 4764ffbfd..18ce5c008 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vlan_none.py @@ -121,7 +121,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_activeip_bfd.py index c47bf20f2..693041fdc 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_activeip_bfd.py @@ -120,7 +120,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_activeip_none.py index 8b713bbd2..17b43bced 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_activeip_none.py @@ -119,7 +119,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_bfd.py index 7f9eb6e08..4d98bdf5c 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_bfd.py @@ -120,7 +120,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_none.py index 42a786e38..0af385b24 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_none.py @@ -120,7 +120,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_bfd.py index 6f5837061..83b816c3f 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_bfd.py @@ -120,7 +120,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py index eee126f3b..ae0795ea7 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py @@ -119,7 +119,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vlan_none.py index 44f308316..9a6a6e945 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vlan_none.py @@ -124,7 +124,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "百度", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py index b2d9a68d7..43c9f3770 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py @@ -121,7 +121,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_none.py index ad2f43e9c..6ed26bcb9 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_none.py @@ -123,7 +123,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "百度", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } # 创建 diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py index 833f191cc..c6819771d 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py @@ -121,7 +121,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py index 5f197f875..80d181675 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py @@ -123,7 +123,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_bfd.py index 5747f9dbe..497f70e5d 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_bfd.py @@ -123,7 +123,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_none.py index df35b14a4..8533daef0 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_none.py @@ -122,7 +122,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_disabled_vxlan_activeip_bfd.py index 5e3b152c5..677447dc8 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_disabled_vxlan_activeip_bfd.py @@ -123,7 +123,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vlan_none.py index 1451b5140..9bc241f0a 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vlan_none.py @@ -125,7 +125,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_bfd.py index 33b9ef203..1d8809563 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_bfd.py @@ -121,7 +121,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_none.py index 8d6367087..887cb7667 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_none.py @@ -122,7 +122,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_bfd.py index c19942a91..f59cf81da 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_bfd.py @@ -124,7 +124,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_none.py index fb35053b9..0f34ad382 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_none.py @@ -123,7 +123,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } 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 d97402b36..67194082d 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 @@ -121,7 +121,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_none.py index f787548aa..6d6fdcb4a 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_none.py @@ -123,7 +123,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_disabled_vxlan_activeip_bfd.py index 339529705..a721fea94 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_disabled_vxlan_activeip_bfd.py @@ -119,7 +119,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_activeip_bfd.py index cfe5466bc..af17f668a 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_activeip_bfd.py @@ -119,7 +119,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_activeip_none.py index 0b1bee372..1ccab221b 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_activeip_none.py @@ -118,7 +118,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_inactiveip_bfd.py index e27ef328c..043da118a 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_inactiveip_bfd.py @@ -119,7 +119,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_inactiveip_none.py index f1f1bb0ac..3f112ddd6 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_inactiveip_none.py @@ -120,7 +120,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_unavailableip_bfd.py index a5dbbc706..f29893c03 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_unavailableip_bfd.py @@ -119,7 +119,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_unavailableip_none.py index 1b548ec0c..373823d5c 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_block_vxlan_unavailableip_none.py @@ -119,7 +119,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_disabled_vxlan_activeip_bfd.py index 2c004858e..e33f426d4 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_disabled_vxlan_activeip_bfd.py @@ -117,7 +117,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index 8dc3dd756..4da9d235e 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -120,7 +120,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_none.py index 28775aa40..b7c7b5038 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_activeip_none.py @@ -118,7 +118,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_inactiveip_bfd.py index 53fe31b95..fec58d551 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_inactiveip_bfd.py @@ -119,7 +119,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_inactiveip_none.py index df054cd5a..ca22d4e91 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_inactiveip_none.py @@ -119,7 +119,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_unavailableip_bfd.py index e96fc323b..7b19f31c6 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_unavailableip_bfd.py @@ -119,7 +119,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_unavailableip_none.py index 67acba373..b076ea857 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_bypass_vxlan_unavailableip_none.py @@ -118,7 +118,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_global_bypass_diff_device_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_global_bypass_diff_device_vxlan_activeip_bfd.py index 4ebd7279d..ffb1c8fd5 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_global_bypass_diff_device_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_global_bypass_diff_device_vxlan_activeip_bfd.py @@ -118,7 +118,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_nearby_bypass_diff_device_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_nearby_bypass_diff_device_vxlan_activeip_bfd.py index 62d032d17..085fb18f6 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_nearby_bypass_diff_device_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_nearby_bypass_diff_device_vxlan_activeip_bfd.py @@ -119,7 +119,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_disabled_vxlan_activeip_bfd.py index 27a885178..27e0cb9cd 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_disabled_vxlan_activeip_bfd.py @@ -121,7 +121,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_bfd.py index 97465fa59..80305b001 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_bfd.py @@ -123,7 +123,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_none.py index 583f0c219..74696c73b 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_none.py @@ -122,7 +122,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_bfd.py index 394738eb3..268771931 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_bfd.py @@ -122,7 +122,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_none.py index cdf15857f..9843e286e 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_none.py @@ -121,7 +121,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_bfd.py index f4e777f6b..0a3510eee 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_bfd.py @@ -122,7 +122,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_none.py index 6ebb3fa72..8080ad899 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_block_vxlan_unavailableip_none.py @@ -121,7 +121,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_disabled_vxlan_activeip_bfd.py index efd9a0335..e74d55f9b 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_disabled_vxlan_activeip_bfd.py @@ -122,7 +122,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py index 44f474b3a..59789d9ba 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py @@ -124,7 +124,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_none.py index 56a93abc0..88c73b5de 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_none.py @@ -122,7 +122,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_bfd.py index 8b6c15462..8c61396c2 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_bfd.py @@ -123,7 +123,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_none.py index 53c546bec..d3819db88 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_none.py @@ -124,7 +124,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py index a3275d47f..60f9ab81c 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py @@ -121,7 +121,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py index 4edafb48c..692e19a89 100644 --- a/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_fqdn_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py @@ -122,7 +122,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_int_compliance_risk_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_int_compliance_risk_library_fqdn_ssl_mirror_block_vlan_none.py index 7bb7131d9..bb239fa85 100644 --- a/tests/service_chaining/sc_decrypted_srcip_int_compliance_risk_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_int_compliance_risk_library_fqdn_ssl_mirror_block_vlan_none.py @@ -151,7 +151,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_int_geoip_asn_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_int_geoip_asn_library_fqdn_ssl_mirror_block_vlan_none.py index 37126af45..b887a41dd 100644 --- a/tests/service_chaining/sc_decrypted_srcip_int_geoip_asn_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_int_geoip_asn_library_fqdn_ssl_mirror_block_vlan_none.py @@ -150,7 +150,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_int_geoip_city_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_int_geoip_city_library_fqdn_ssl_mirror_block_vlan_none.py index 0d81872ff..9ee9028d6 100644 --- a/tests/service_chaining/sc_decrypted_srcip_int_geoip_city_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_int_geoip_city_library_fqdn_ssl_mirror_block_vlan_none.py @@ -150,7 +150,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_int_geoip_country_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_int_geoip_country_library_fqdn_ssl_mirror_block_vlan_none.py index cd75bffdd..e6b765465 100644 --- a/tests/service_chaining/sc_decrypted_srcip_int_geoip_country_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_int_geoip_country_library_fqdn_ssl_mirror_block_vlan_none.py @@ -150,7 +150,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_int_internet_service_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_int_internet_service_library_fqdn_ssl_mirror_block_vlan_none.py index a56c8ca2e..bb5ffb119 100644 --- a/tests/service_chaining/sc_decrypted_srcip_int_internet_service_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_int_internet_service_library_fqdn_ssl_mirror_block_vlan_none.py @@ -150,7 +150,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_int_security_threat_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_int_security_threat_library_fqdn_ssl_mirror_block_vlan_none.py index 92267c387..c4a11dc78 100644 --- a/tests/service_chaining/sc_decrypted_srcip_int_security_threat_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_int_security_threat_library_fqdn_ssl_mirror_block_vlan_none.py @@ -150,7 +150,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_int_website_classification_library_fqdn_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_int_website_classification_library_fqdn_ssl_mirror_block_vlan_none.py index cbcc16d9c..00a10e836 100644 --- a/tests/service_chaining/sc_decrypted_srcip_int_website_classification_library_fqdn_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_int_website_classification_library_fqdn_ssl_mirror_block_vlan_none.py @@ -150,7 +150,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_apn_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_negate_apn_fqdn_ssl_mirror_bypass_vlan_none.py index de0c9f6f0..8394e6746 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_apn_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_apn_fqdn_ssl_mirror_bypass_vlan_none.py @@ -141,7 +141,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 0}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_negate_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index dcb7caa35..7bdc3c198 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -140,15 +140,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip.com", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_decrypted", "query_value": ""}, - {"query_field_key": "subscriber_id", "query_value": "test6494"}, - {"query_field_key": "imei", "query_value": "1234567801"}, - {"query_field_key": "imsi", "query_value": "43458960456"}, - {"query_field_key": "apn", "query_value": "www.lyautotest.com"}, - {"query_field_key": "phone_number", "query_value": "12345678901"} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_imei_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_negate_imei_fqdn_ssl_mirror_bypass_vlan_none.py index 72afdd0c5..83cc67fcb 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_imei_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_imei_fqdn_ssl_mirror_bypass_vlan_none.py @@ -49,7 +49,7 @@ def run(parameter): ] }, { - "negate_option": False, + "negate_option": True, "or_conditions": [ { "attribute_name": "ATTR_GTP_IMEI", @@ -142,15 +142,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip.com", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_decrypted", "query_value": ""}, - {"query_field_key": "subscriber_id", "query_value": "test6494"}, - {"query_field_key": "imei", "query_value": "1234567801"}, - {"query_field_key": "imsi", "query_value": "43458960456"}, - {"query_field_key": "apn", "query_value": "www.lyautotest.com"}, - {"query_field_key": "phone_number", "query_value": "12345678901"} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_imei_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_negate_imei_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index 02b7247d6..465a40d71 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_imei_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_imei_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -141,15 +141,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip.com", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_decrypted", "query_value": ""}, - {"query_field_key": "subscriber_id", "query_value": "test6494"}, - {"query_field_key": "imei", "query_value": "1234567801"}, - {"query_field_key": "imsi", "query_value": "43458960456"}, - {"query_field_key": "apn", "query_value": "www.lyautotest.com"}, - {"query_field_key": "phone_number", "query_value": "12345678901"} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_imsi_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_negate_imsi_fqdn_ssl_mirror_bypass_vlan_none.py index 90a684408..832f1b47e 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_imsi_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_imsi_fqdn_ssl_mirror_bypass_vlan_none.py @@ -49,7 +49,7 @@ def run(parameter): ] }, { - "negate_option": False, + "negate_option": True, "or_conditions": [ { "attribute_name": "ATTR_GTP_IMSI", @@ -142,15 +142,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip.com", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_decrypted", "query_value": ""}, - {"query_field_key": "subscriber_id", "query_value": "test6494"}, - {"query_field_key": "imei", "query_value": "1234567801"}, - {"query_field_key": "imsi", "query_value": "43458960456"}, - {"query_field_key": "apn", "query_value": "www.lyautotest.com"}, - {"query_field_key": "phone_number", "query_value": "12345678901"} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_negate_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index 0c502ee2e..7eca114c3 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -49,7 +49,7 @@ def run(parameter): ] }, { - "negate_option": False, + "negate_option": True, "or_conditions": [ { "attribute_name": "ATTR_GTP_IMSI", @@ -141,15 +141,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip.com", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_decrypted", "query_value": ""}, - {"query_field_key": "subscriber_id", "query_value": "test6494"}, - {"query_field_key": "imei", "query_value": "1234567801"}, - {"query_field_key": "imsi", "query_value": "43458960456"}, - {"query_field_key": "apn", "query_value": "www.lyautotest.com"}, - {"query_field_key": "phone_number", "query_value": "12345678901"} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_pn_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_negate_pn_fqdn_ssl_mirror_bypass_vlan_none.py index c105092a4..595940d70 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_pn_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_pn_fqdn_ssl_mirror_bypass_vlan_none.py @@ -142,15 +142,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip.com", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_decrypted", "query_value": ""}, - {"query_field_key": "subscriber_id", "query_value": "test6494"}, - {"query_field_key": "imei", "query_value": "1234567801"}, - {"query_field_key": "imsi", "query_value": "43458960456"}, - {"query_field_key": "apn", "query_value": "www.lyautotest.com"}, - {"query_field_key": "phone_number", "query_value": "12345678901"} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_negate_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index ece183c33..4258ba5e1 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -49,7 +49,7 @@ def run(parameter): ] }, { - "negate_option": False, + "negate_option": True, "or_conditions": [ { "attribute_name": "ATTR_GTP_PHONE_NUMBER", @@ -141,15 +141,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip.com", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_decrypted", "query_value": ""}, - {"query_field_key": "subscriber_id", "query_value": "test6494"}, - {"query_field_key": "imei", "query_value": "1234567801"}, - {"query_field_key": "imsi", "query_value": "43458960456"}, - {"query_field_key": "apn", "query_value": "www.lyautotest.com"}, - {"query_field_key": "phone_number", "query_value": "12345678901"} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_srcport_range_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_negate_srcport_range_mirror_bypass_vlan_none.py index 8d929a25a..7ada0dc1c 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_srcport_range_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_srcport_range_mirror_bypass_vlan_none.py @@ -49,7 +49,7 @@ def run(parameter): ] }, { - "negate_option": False, + "negate_option": True, "or_conditions": [ { "attribute_name": "ATTR_SOURCE_PORT", @@ -112,8 +112,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", - "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_srcport_range_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_negate_srcport_range_steer_bypass_vxlan_activeip_bfd.py index 34aaf9daa..bc6b8d412 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_srcport_range_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_srcport_range_steer_bypass_vxlan_activeip_bfd.py @@ -49,7 +49,7 @@ def run(parameter): ] }, { - "negate_option": False, + "negate_option": True, "or_conditions": [ { "attribute_name": "ATTR_SOURCE_PORT", @@ -111,8 +111,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", - "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_subid_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_negate_subid_fqdn_ssl_mirror_bypass_vlan_none.py index 6a4134e5b..62c031a15 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_subid_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_subid_fqdn_ssl_mirror_bypass_vlan_none.py @@ -49,7 +49,7 @@ def run(parameter): ] }, { - "negate_option": False, + "negate_option": True, "or_conditions": [ { "attribute_name": "ATTR_SUBSCRIBER_ID", @@ -140,15 +140,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip.com", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_decrypted", "query_value": ""}, - {"query_field_key": "subscriber_id", "query_value": "test6494"}, - {"query_field_key": "imei", "query_value": "1234567801"}, - {"query_field_key": "imsi", "query_value": "43458960456"}, - {"query_field_key": "apn", "query_value": "www.lyautotest.com"}, - {"query_field_key": "phone_number", "query_value": "12345678901"} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_decrypted_srcip_negate_subid_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_negate_subid_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index a753a9136..1943b85d5 100644 --- a/tests/service_chaining/sc_decrypted_srcip_negate_subid_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_negate_subid_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -49,7 +49,7 @@ def run(parameter): ] }, { - "negate_option": False, + "negate_option": True, "or_conditions": [ { "attribute_name": "ATTR_SUBSCRIBER_ID", @@ -139,7 +139,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip.com", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_decrypted", "query_value": ""}, {"query_field_key": "subscriber_id", "query_value": "test6494"}, diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_block_vlan_none.py index b0582f991..d8c0a3022 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_block_vlan_none.py @@ -103,7 +103,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "百度", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_block_vxlan_activeip_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_block_vxlan_activeip_none.py index 0bfa5c991..a8a3f4157 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_block_vxlan_activeip_none.py @@ -101,7 +101,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "百度", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_bypass_disabled_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_bypass_disabled_vlan_none.py index 0e8295506..2b1acea54 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_bypass_disabled_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_bypass_disabled_vlan_none.py @@ -100,7 +100,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "百度", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_bypass_vlan_none.py index 544276211..0733f95f6 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_bypass_vlan_none.py @@ -102,7 +102,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "百度", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_global_bypass_diff_device_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_global_bypass_diff_device_vlan_none.py index bdf6c57c3..5ab865a18 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_global_bypass_diff_device_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_global_bypass_diff_device_vlan_none.py @@ -102,7 +102,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "百度", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_nearby_bypass_diff_device_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_nearby_bypass_diff_device_vlan_none.py index 26e6def49..bab6a270e 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_nearby_bypass_diff_device_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_nearby_bypass_diff_device_vlan_none.py @@ -102,7 +102,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "百度", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_disabled_vxlan_activeip_bfd.py index 8b0d5d59f..26d6e2907 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_disabled_vxlan_activeip_bfd.py @@ -102,7 +102,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "百度", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py index c1399fcfd..bbdfac4c5 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py @@ -103,7 +103,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "百度", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py index fe06b1d3e..b93b43b54 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py @@ -99,7 +99,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "百度", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py index 7173c75c6..aaf4e7941 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py @@ -107,7 +107,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "百度", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_bypass_vlan_none.py index b9015d02a..650e3f84e 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_mirror_redispatch_bypass_vlan_none.py @@ -107,7 +107,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "百度", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_steer_bypass_vxlan_inactiveip_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_steer_bypass_vxlan_inactiveip_none.py index d03a958e5..34a1fa33a 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_steer_bypass_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_steer_bypass_vxlan_inactiveip_none.py @@ -100,7 +100,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py index 2e3c54be9..ab7d4de46 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py @@ -105,7 +105,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py index 80d9a1127..3850588af 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_unavailableip_bfd.py @@ -103,7 +103,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py index 04ad441d5..3c6f333de 100644 --- a/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_ssl_steer_redispatch_bypass_vxlan_unavailableip_none.py @@ -105,7 +105,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_subid_fqdn_ssl_mirror_bypass_vlan_none.py index 1956cb88c..fbcd5be9f 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_fqdn_ssl_mirror_bypass_vlan_none.py @@ -140,7 +140,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip.com", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_decrypted", "query_value": ""}, {"query_field_key": "subscriber_id", "query_value": "test6494"}, diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_subid_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index e721e489d..9757d56e4 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -139,7 +139,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [{"query_field_key": "sc_rsp_decrypted", "query_value": ""}] } diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_imei_apn_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_subid_imei_apn_fqdn_ssl_mirror_bypass_vlan_none.py index 75419aaa3..92132af3a 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_imei_apn_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_imei_apn_fqdn_ssl_mirror_bypass_vlan_none.py @@ -177,7 +177,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip.com", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_decrypted", "query_value": ""}, {"query_field_key": "subscriber_id", "query_value": "test6494"}, diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_imei_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_subid_imei_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index dd2990676..24ac5ff95 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_imei_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_imei_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -172,7 +172,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip.com", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_decrypted", "query_value": ""}, {"query_field_key": "subscriber_id", "query_value": "test6494"}, diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_imsi_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_subid_imsi_fqdn_ssl_mirror_bypass_vlan_none.py index 0f36f8acf..950627538 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_imsi_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_imsi_fqdn_ssl_mirror_bypass_vlan_none.py @@ -159,7 +159,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip.com", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_decrypted", "query_value": ""}, {"query_field_key": "subscriber_id", "query_value": "test6494"}, diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_subid_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index f5b780e3b..c1b002f92 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_imsi_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -153,7 +153,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip.com", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_decrypted", "query_value": ""}, {"query_field_key": "subscriber_id", "query_value": "test6494"}, diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_pn_apn_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_subid_pn_apn_fqdn_ssl_mirror_bypass_vlan_none.py index cc92314a9..a1ada941f 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_pn_apn_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_pn_apn_fqdn_ssl_mirror_bypass_vlan_none.py @@ -177,7 +177,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip.com", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_decrypted", "query_value": ""}, {"query_field_key": "subscriber_id", "query_value": "test6494"}, diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_pn_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_subid_pn_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index d4685ab44..853af4ee8 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_pn_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_pn_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -171,7 +171,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip.com", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_decrypted", "query_value": ""}, {"query_field_key": "subscriber_id", "query_value": "test6494"}, diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_pn_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_decrypted_srcip_subid_pn_fqdn_ssl_mirror_bypass_vlan_none.py index 7a1e52cd5..5e4b2c20d 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_pn_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_pn_fqdn_ssl_mirror_bypass_vlan_none.py @@ -159,7 +159,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip.com", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_decrypted", "query_value": ""}, {"query_field_key": "subscriber_id", "query_value": "test6494"}, diff --git a/tests/service_chaining/sc_decrypted_srcip_subid_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_decrypted_srcip_subid_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index 8c3f9281f..8395484a3 100644 --- a/tests/service_chaining/sc_decrypted_srcip_subid_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_decrypted_srcip_subid_pn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -153,7 +153,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "vip.com", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_decrypted", "query_value": ""}, {"query_field_key": "subscriber_id", "query_value": "test6494"}, diff --git a/tests/service_chaining/sc_raw_dstip_dstport_range_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_dstip_dstport_range_mirror_bypass_vlan_none.py index a37489c14..32be63dfd 100644 --- a/tests/service_chaining/sc_raw_dstip_dstport_range_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_dstip_dstport_range_mirror_bypass_vlan_none.py @@ -117,7 +117,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_dstip_dstport_range_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_dstip_dstport_range_steer_bypass_vxlan_activeip_bfd.py index eb9d73e32..131bc07c3 100644 --- a/tests/service_chaining/sc_raw_dstip_dstport_range_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_dstip_dstport_range_steer_bypass_vxlan_activeip_bfd.py @@ -116,7 +116,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_dstip_external_port_range_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_dstip_external_port_range_mirror_bypass_vlan_none.py index 9ac7b644b..a90bd98f5 100644 --- a/tests/service_chaining/sc_raw_dstip_external_port_range_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_dstip_external_port_range_mirror_bypass_vlan_none.py @@ -137,7 +137,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_dstip_external_port_range_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_dstip_external_port_range_steer_bypass_vxlan_activeip_bfd.py index 2318f2b44..1354a6cd6 100644 --- a/tests/service_chaining/sc_raw_dstip_external_port_range_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_dstip_external_port_range_steer_bypass_vxlan_activeip_bfd.py @@ -116,7 +116,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_imsi_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_imsi_fqdn_http_url_mirror_bypass_vlan_none.py index 28b232462..3fda6bdc3 100644 --- a/tests/service_chaining/sc_raw_imsi_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_imsi_fqdn_http_url_mirror_bypass_vlan_none.py @@ -147,7 +147,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_imsi_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_imsi_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 703bc4dc3..70c8a8309 100644 --- a/tests/service_chaining/sc_raw_imsi_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_imsi_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -146,7 +146,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_multiple_port_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_multiple_port_steer_bypass_vxlan_activeip_bfd.py index b77f54cbb..bc2e3e84f 100644 --- a/tests/service_chaining/sc_raw_multiple_port_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_multiple_port_steer_bypass_vxlan_activeip_bfd.py @@ -149,7 +149,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_negate_apn_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_negate_apn_fqdn_ssl_mirror_bypass_vlan_none.py index 806904358..1965e39a7 100644 --- a/tests/service_chaining/sc_raw_negate_apn_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_negate_apn_fqdn_ssl_mirror_bypass_vlan_none.py @@ -128,19 +128,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_raw", "query_value": ""}, - {"query_field_key": "sent_pkts", "query_value": ""}, - {"query_field_key": "received_pkts", "query_value": ""}, - {"query_field_key": "sent_bytes", "query_value": ""}, - {"query_field_key": "received_bytes", "query_value": ""}, - {"query_field_key": "subscriber_id", "query_value": "test2425"}, - {"query_field_key": "imei", "query_value": "1234567802"}, - {"query_field_key": "imsi", "query_value": "43458960458"}, - {"query_field_key": "apn", "query_value": "www.lyrawautotest.com"}, - {"query_field_key": "phone_number", "query_value": "12345678902"} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 if parameter["initiation_method"] == "ui": diff --git a/tests/service_chaining/sc_raw_negate_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_negate_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index 51cfcdf53..ad37a01c8 100644 --- a/tests/service_chaining/sc_raw_negate_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_negate_apn_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -29,7 +29,7 @@ def run(parameter): "action": "service_chaining", "and_conditions": [ { - "negate_option": False, + "negate_option": True, "or_conditions": [ { "attribute_name": "ATTR_GTP_APN", @@ -126,19 +126,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_raw", "query_value": ""}, - {"query_field_key": "sent_pkts", "query_value": ""}, - {"query_field_key": "received_pkts", "query_value": ""}, - {"query_field_key": "sent_bytes", "query_value": ""}, - {"query_field_key": "received_bytes", "query_value": ""}, - {"query_field_key": "subscriber_id", "query_value": "test2425"}, - {"query_field_key": "imei", "query_value": "1234567802"}, - {"query_field_key": "imsi", "query_value": "43458960458"}, - {"query_field_key": "apn", "query_value": "www.lyrawautotest.com"}, - {"query_field_key": "phone_number", "query_value": "12345678902"} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 if parameter["initiation_method"] == "ui": diff --git a/tests/service_chaining/sc_raw_negate_imei_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_negate_imei_fqdn_http_url_mirror_bypass_vlan_none.py index 5e9b80842..844ff62ee 100644 --- a/tests/service_chaining/sc_raw_negate_imei_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_negate_imei_fqdn_http_url_mirror_bypass_vlan_none.py @@ -147,19 +147,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_raw", "query_value": ""}, - {"query_field_key": "sent_pkts", "query_value": ""}, - {"query_field_key": "received_pkts", "query_value": ""}, - {"query_field_key": "sent_bytes", "query_value": ""}, - {"query_field_key": "received_bytes", "query_value": ""}, - {"query_field_key": "subscriber_id", "query_value": "test2425"}, - {"query_field_key": "imei", "query_value": "1234567802"}, - {"query_field_key": "imsi", "query_value": "43458960458"}, - {"query_field_key": "apn", "query_value": "www.lyrawautotest.com"}, - {"query_field_key": "phone_number", "query_value": "12345678902"} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_raw_negate_imei_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_negate_imei_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 2e1611aee..58b8d0ff4 100644 --- a/tests/service_chaining/sc_raw_negate_imei_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_negate_imei_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -146,19 +146,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_raw", "query_value": ""}, - {"query_field_key": "sent_pkts", "query_value": ""}, - {"query_field_key": "received_pkts", "query_value": ""}, - {"query_field_key": "sent_bytes", "query_value": ""}, - {"query_field_key": "received_bytes", "query_value": ""}, - {"query_field_key": "subscriber_id", "query_value": "test2425"}, - {"query_field_key": "imei", "query_value": "1234567802"}, - {"query_field_key": "imsi", "query_value": "43458960458"}, - {"query_field_key": "apn", "query_value": "www.lyrawautotest.com"}, - {"query_field_key": "phone_number", "query_value": "12345678902"} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_raw_negate_imsi_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_negate_imsi_fqdn_http_url_mirror_bypass_vlan_none.py index 2376b0d1c..c1c872cd6 100644 --- a/tests/service_chaining/sc_raw_negate_imsi_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_negate_imsi_fqdn_http_url_mirror_bypass_vlan_none.py @@ -148,19 +148,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_raw", "query_value": ""}, - {"query_field_key": "sent_pkts", "query_value": ""}, - {"query_field_key": "received_pkts", "query_value": ""}, - {"query_field_key": "sent_bytes", "query_value": ""}, - {"query_field_key": "received_bytes", "query_value": ""}, - {"query_field_key": "subscriber_id", "query_value": "test2425"}, - {"query_field_key": "imei", "query_value": "1234567802"}, - {"query_field_key": "imsi", "query_value": "43458960458"}, - {"query_field_key": "apn", "query_value": "www.lyrawautotest.com"}, - {"query_field_key": "phone_number", "query_value": "12345678902"} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_raw_negate_imsi_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_negate_imsi_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index bfe370fb5..4156ebaa5 100644 --- a/tests/service_chaining/sc_raw_negate_imsi_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_negate_imsi_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -29,7 +29,7 @@ def run(parameter): "action": "service_chaining", "and_conditions": [ { - "negate_option": False, + "negate_option": True, "or_conditions": [ { "attribute_name": "ATTR_GTP_IMSI", @@ -146,19 +146,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_raw", "query_value": ""}, - {"query_field_key": "sent_pkts", "query_value": ""}, - {"query_field_key": "received_pkts", "query_value": ""}, - {"query_field_key": "sent_bytes", "query_value": ""}, - {"query_field_key": "received_bytes", "query_value": ""}, - {"query_field_key": "subscriber_id", "query_value": "test2425"}, - {"query_field_key": "imei", "query_value": "1234567802"}, - {"query_field_key": "imsi", "query_value": "43458960458"}, - {"query_field_key": "apn", "query_value": "www.lyrawautotest.com"}, - {"query_field_key": "phone_number", "query_value": "12345678902"} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_raw_negate_pn_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_negate_pn_fqdn_http_url_mirror_bypass_vlan_none.py index a0f93658e..67c4bb9ab 100644 --- a/tests/service_chaining/sc_raw_negate_pn_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_negate_pn_fqdn_http_url_mirror_bypass_vlan_none.py @@ -29,7 +29,7 @@ def run(parameter): "action": "service_chaining", "and_conditions": [ { - "negate_option": False, + "negate_option": True, "or_conditions": [ { "attribute_name": "ATTR_GTP_PHONE_NUMBER", @@ -147,19 +147,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_raw", "query_value": ""}, - {"query_field_key": "sent_pkts", "query_value": ""}, - {"query_field_key": "received_pkts", "query_value": ""}, - {"query_field_key": "sent_bytes", "query_value": ""}, - {"query_field_key": "received_bytes", "query_value": ""}, - {"query_field_key": "subscriber_id", "query_value": "test2425"}, - {"query_field_key": "imei", "query_value": "1234567802"}, - {"query_field_key": "imsi", "query_value": "43458960458"}, - {"query_field_key": "apn", "query_value": "www.lyrawautotest.com"}, - {"query_field_key": "phone_number", "query_value": "12345678902"} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_raw_negate_pn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_negate_pn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index dc89f95b7..af541e739 100644 --- a/tests/service_chaining/sc_raw_negate_pn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_negate_pn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -146,19 +146,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_raw", "query_value": ""}, - {"query_field_key": "sent_pkts", "query_value": ""}, - {"query_field_key": "received_pkts", "query_value": ""}, - {"query_field_key": "sent_bytes", "query_value": ""}, - {"query_field_key": "received_bytes", "query_value": ""}, - {"query_field_key": "subscriber_id", "query_value": "test2425"}, - {"query_field_key": "imei", "query_value": "1234567802"}, - {"query_field_key": "imsi", "query_value": "43458960458"}, - {"query_field_key": "apn", "query_value": "www.lyrawautotest.com"}, - {"query_field_key": "phone_number", "query_value": "12345678902"} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_raw_negate_srcip_dstip_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_negate_srcip_dstip_fqdn_ssl_mirror_bypass_vlan_none.py index 46bcd72f0..a0692b7c7 100644 --- a/tests/service_chaining/sc_raw_negate_srcip_dstip_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_negate_srcip_dstip_fqdn_ssl_mirror_bypass_vlan_none.py @@ -150,14 +150,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_raw", "query_value": ""}, - {"query_field_key": "sent_pkts", "query_value": ""}, - {"query_field_key": "received_pkts", "query_value": ""}, - {"query_field_key": "sent_bytes", "query_value": ""}, - {"query_field_key": "received_bytes", "query_value": ""} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_raw_negate_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_negate_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index 76b017689..1dd99ed84 100644 --- a/tests/service_chaining/sc_raw_negate_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_negate_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -106,8 +106,8 @@ def run(parameter): "return_data": 1, "name": "steer_bypass_vxlan_activeip_bfd", "type": 1, - "load_balance_method": "hash-innermost-int-ip", - "load_balance_localization": "nearby", + "load_balance_method": "hash-innermost-int-ip", + "load_balance_localization": "nearby", "failure_action": "bypass", "service_func_profiles":[ { @@ -149,14 +149,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_raw", "query_value": ""}, - {"query_field_key": "sent_pkts", "query_value": ""}, - {"query_field_key": "received_pkts", "query_value": ""}, - {"query_field_key": "sent_bytes", "query_value": ""}, - {"query_field_key": "received_bytes", "query_value": ""} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_raw_negate_subid_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_negate_subid_fqdn_http_url_mirror_bypass_vlan_none.py index 25b717a49..e92a6651a 100644 --- a/tests/service_chaining/sc_raw_negate_subid_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_negate_subid_fqdn_http_url_mirror_bypass_vlan_none.py @@ -29,7 +29,7 @@ def run(parameter): "action": "service_chaining", "and_conditions": [ { - "negate_option": False, + "negate_option": True, "or_conditions": [ { "attribute_name": "ATTR_SUBSCRIBER_ID", @@ -145,19 +145,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_raw", "query_value": ""}, - {"query_field_key": "sent_pkts", "query_value": ""}, - {"query_field_key": "received_pkts", "query_value": ""}, - {"query_field_key": "sent_bytes", "query_value": ""}, - {"query_field_key": "received_bytes", "query_value": ""}, - {"query_field_key": "subscriber_id", "query_value": "test2425"}, - {"query_field_key": "imei", "query_value": "1234567802"}, - {"query_field_key": "imsi", "query_value": "43458960458"}, - {"query_field_key": "apn", "query_value": "www.lyrawautotest.com"}, - {"query_field_key": "phone_number", "query_value": "12345678902"} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_raw_negate_subid_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_negate_subid_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 3edffd6ad..e6ef01110 100644 --- a/tests/service_chaining/sc_raw_negate_subid_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_negate_subid_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -29,7 +29,7 @@ def run(parameter): "action": "service_chaining", "and_conditions": [ { - "negate_option": False, + "negate_option": True, "or_conditions": [ { "attribute_name": "ATTR_SUBSCRIBER_ID", @@ -144,19 +144,8 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", - "expected_log": [ - {"query_field_key": "sc_rsp_raw", "query_value": ""}, - {"query_field_key": "sent_pkts", "query_value": ""}, - {"query_field_key": "received_pkts", "query_value": ""}, - {"query_field_key": "sent_bytes", "query_value": ""}, - {"query_field_key": "received_bytes", "query_value": ""}, - {"query_field_key": "subscriber_id", "query_value": "test2425"}, - {"query_field_key": "imei", "query_value": "1234567802"}, - {"query_field_key": "imsi", "query_value": "43458960458"}, - {"query_field_key": "apn", "query_value": "www.lyrawautotest.com"}, - {"query_field_key": "phone_number", "query_value": "12345678902"} - ] + "expected_metric": {"hits": 0}, + "expected_log": [] } # 创建 diff --git a/tests/service_chaining/sc_raw_pn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_pn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 642f00d78..949b36d94 100644 --- a/tests/service_chaining/sc_raw_pn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_pn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -146,7 +146,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_rtp_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_rtp_mirror_bypass_vlan_none.py index 58e69fcec..775bd906a 100644 --- a/tests/service_chaining/sc_raw_rtp_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_rtp_mirror_bypass_vlan_none.py @@ -92,7 +92,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""} ] diff --git a/tests/service_chaining/sc_raw_rtp_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_rtp_steer_bypass_vxlan_activeip_bfd.py index b578b94ac..0a36276ff 100644 --- a/tests/service_chaining/sc_raw_rtp_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_rtp_steer_bypass_vxlan_activeip_bfd.py @@ -91,7 +91,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""} ] diff --git a/tests/service_chaining/sc_raw_scrip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_scrip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py index f7c3c4f74..4ada4da1d 100644 --- a/tests/service_chaining/sc_raw_scrip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_raw_scrip_dstip_fqdn_ssl_mirror_bypass_vxlan_unavailableip_none.py @@ -148,7 +148,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_src_compliance_risk_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_src_compliance_risk_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index cf7d50bcb..4bb95661d 100644 --- a/tests/service_chaining/sc_raw_src_compliance_risk_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_src_compliance_risk_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -182,7 +182,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_src_geoip_asn_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_src_geoip_asn_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index df59c9480..d3ceb7e74 100644 --- a/tests/service_chaining/sc_raw_src_geoip_asn_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_src_geoip_asn_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -181,7 +181,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_src_geoip_city_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_src_geoip_city_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index e6278ccc1..df60230bb 100644 --- a/tests/service_chaining/sc_raw_src_geoip_city_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_src_geoip_city_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -176,7 +176,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_src_geoip_country_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_src_geoip_country_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 453a74a79..efe50ab82 100644 --- a/tests/service_chaining/sc_raw_src_geoip_country_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_src_geoip_country_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -180,7 +180,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_src_internet_service_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_src_internet_service_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index abc9f633b..3e51d37e9 100644 --- a/tests/service_chaining/sc_raw_src_internet_service_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_src_internet_service_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -182,7 +182,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_src_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_src_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 6d13e417e..1617026c2 100644 --- a/tests/service_chaining/sc_raw_src_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_src_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -175,7 +175,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_src_security_threat_library_iprange_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_src_security_threat_library_iprange_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 980df2d23..c7589e99f 100644 --- a/tests/service_chaining/sc_raw_src_security_threat_library_iprange_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_src_security_threat_library_iprange_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -175,7 +175,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_src_website_classification_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_src_website_classification_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 89071c0cf..0ace6a631 100644 --- a/tests/service_chaining/sc_raw_src_website_classification_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_src_website_classification_library_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -180,7 +180,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dst_compliance_risk_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dst_compliance_risk_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index da1fbf999..0d260e716 100644 --- a/tests/service_chaining/sc_raw_srcip_dst_compliance_risk_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dst_compliance_risk_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -175,7 +175,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dst_geoip_asn_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dst_geoip_asn_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 554a78daf..980a6aa98 100644 --- a/tests/service_chaining/sc_raw_srcip_dst_geoip_asn_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dst_geoip_asn_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -175,7 +175,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dst_geoip_city_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dst_geoip_city_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index d62a607f5..c1e29f208 100644 --- a/tests/service_chaining/sc_raw_srcip_dst_geoip_city_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dst_geoip_city_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -175,7 +175,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dst_geoip_country_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dst_geoip_country_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 19eefccf7..4f84318e4 100644 --- a/tests/service_chaining/sc_raw_srcip_dst_geoip_country_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dst_geoip_country_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -175,7 +175,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dst_internet_service_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dst_internet_service_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 7524de35f..45873e8b3 100644 --- a/tests/service_chaining/sc_raw_srcip_dst_internet_service_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dst_internet_service_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -175,7 +175,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dst_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dst_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index a977f27ad..a933100da 100644 --- a/tests/service_chaining/sc_raw_srcip_dst_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dst_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -175,7 +175,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dst_security_threat_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dst_security_threat_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index a591f556a..4a5c0aacb 100644 --- a/tests/service_chaining/sc_raw_srcip_dst_security_threat_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dst_security_threat_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -175,7 +175,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dst_website_classification_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dst_website_classification_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index 3e757469c..46cded137 100644 --- a/tests/service_chaining/sc_raw_srcip_dst_website_classification_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dst_website_classification_library_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -176,7 +176,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_dns_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_dns_mirror_bypass_vlan_none.py index a742ac6fd..d18f264d6 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_dns_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_dns_mirror_bypass_vlan_none.py @@ -132,7 +132,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_dns_qname_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_dns_qname_mirror_bypass_vlan_none.py index 76f849e76..923cb75cd 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_dns_qname_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_dns_qname_mirror_bypass_vlan_none.py @@ -150,7 +150,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_dns_qname_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_dns_qname_steer_bypass_vxlan_activeip_bfd.py index 4082c64c1..1a0f3c8da 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_dns_qname_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_dns_qname_steer_bypass_vxlan_activeip_bfd.py @@ -149,7 +149,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_dns_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_dns_steer_bypass_vxlan_activeip_bfd.py index 928f6a988..9fe278871 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_dns_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_dns_steer_bypass_vxlan_activeip_bfd.py @@ -131,7 +131,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_category_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_category_library_http_url_steer_bypass_vxlan_activeip_bfd.py index be2cad377..a2ec6d20e 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_category_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_category_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -177,7 +177,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_geoip_city_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_geoip_city_library_http_url_steer_bypass_vxlan_activeip_bfd.py index 80b7a36a8..dd4b71dc5 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_geoip_city_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_geoip_city_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -176,7 +176,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py index ea40beaa8..9fc647703 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -176,7 +176,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_security_threat_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_security_threat_library_http_url_steer_bypass_vxlan_activeip_bfd.py index 8835b0e7b..f5cd38a86 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_security_threat_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_exact_fqdn_security_threat_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -176,7 +176,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_all_ipproto_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_all_ipproto_http_url_steer_bypass_vxlan_activeip_bfd.py index d5337cd55..2211b8406 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_all_ipproto_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_all_ipproto_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -177,7 +177,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_all_ipproto_quic_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_all_ipproto_quic_steer_bypass_vxlan_activeip_bfd.py index 54e2c4310..75e0398b0 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_all_ipproto_quic_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_all_ipproto_quic_steer_bypass_vxlan_activeip_bfd.py @@ -160,7 +160,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_http_url_mirror_bypass_vlan_none.py index 1a65df32a..4b9bc796a 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_http_url_mirror_bypass_vlan_none.py @@ -168,7 +168,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index a3706f569..1cd3dacdc 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -167,7 +167,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ipprototcp_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ipprototcp_http_url_mirror_bypass_vlan_none.py index 5b2ab3d18..4cb0cb563 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ipprototcp_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ipprototcp_http_url_mirror_bypass_vlan_none.py @@ -178,7 +178,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ipprototcp_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ipprototcp_http_url_steer_bypass_vxlan_activeip_bfd.py index 43557d3f9..c8351f7c3 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ipprototcp_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ipprototcp_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -177,7 +177,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py index c61f8f765..945f28831 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -183,7 +183,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_extport_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_extport_ssl_mirror_bypass_vlan_none.py index 17b4dc673..87094524b 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_extport_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_extport_ssl_mirror_bypass_vlan_none.py @@ -167,7 +167,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_extport_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_extport_ssl_steer_bypass_vxlan_activeip_bfd.py index 37b197796..e9db3ec9e 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_extport_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_extport_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -166,7 +166,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_intport_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_intport_ssl_mirror_bypass_vlan_none.py index df545c7bc..5f48880a6 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_intport_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_intport_ssl_mirror_bypass_vlan_none.py @@ -167,7 +167,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_intport_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_intport_ssl_steer_bypass_vxlan_activeip_bfd.py index df545c7bc..5f48880a6 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_intport_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_negate_intport_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -167,7 +167,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_quic_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_quic_mirror_bypass_vlan_none.py index 77f42c2b6..2909b58fa 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_quic_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_quic_mirror_bypass_vlan_none.py @@ -149,7 +149,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_quic_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_quic_steer_bypass_vxlan_activeip_bfd.py index 556c365ed..5ca4ef460 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_quic_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_quic_steer_bypass_vxlan_activeip_bfd.py @@ -148,7 +148,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_false_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_false_mirror_bypass_vlan_none.py index 136c21478..9789e3a22 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_false_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_false_mirror_bypass_vlan_none.py @@ -160,7 +160,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_false_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_false_steer_bypass_vxlan_activeip_bfd.py index 1021af574..639084518 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_false_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_false_steer_bypass_vxlan_activeip_bfd.py @@ -159,7 +159,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_true_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_true_mirror_bypass_vlan_none.py index f6224ae06..ef1e78162 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_true_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_true_mirror_bypass_vlan_none.py @@ -160,7 +160,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_true_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_true_steer_bypass_vxlan_activeip_bfd.py index 2f20ee5d5..75821d3fa 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_true_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_ech_true_steer_bypass_vxlan_activeip_bfd.py @@ -159,7 +159,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_esni_false_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_esni_false_mirror_bypass_vlan_none.py index e755b694a..c3d4e10d1 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_esni_false_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_esni_false_mirror_bypass_vlan_none.py @@ -160,7 +160,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "trex", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_esni_false_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_esni_false_steer_bypass_vxlan_activeip_bfd.py index ca2dfd130..d2cab0b15 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_esni_false_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_esni_false_steer_bypass_vxlan_activeip_bfd.py @@ -159,7 +159,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "trex", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_disabled_vxlan_activeip_bfd.py index 2ac4caa96..7f937730d 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_disabled_vxlan_activeip_bfd.py @@ -147,7 +147,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_activeip_bfd.py index d98f99383..9be08ecde 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_activeip_bfd.py @@ -145,7 +145,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_activeip_none.py index 60ba46f63..f5544e470 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_activeip_none.py @@ -147,7 +147,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_inactiveip_bfd.py index aee331f4a..356975934 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_inactiveip_bfd.py @@ -144,7 +144,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_inactiveip_none.py index aae6534c5..577317fb5 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_block_vxlan_inactiveip_none.py @@ -146,7 +146,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vlan_none.py index e1b26c8b8..ad28a8927 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vlan_none.py @@ -150,7 +150,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_activeip_bfd.py index a972d42e8..8455a67d3 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_activeip_bfd.py @@ -144,7 +144,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_activeip_none.py index 8cbd5afc2..6523c879a 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_activeip_none.py @@ -149,7 +149,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_none.py index 1a9d6be29..aef17ce1b 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_bypass_vxlan_inactiveip_none.py @@ -147,7 +147,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 144c268f2..b7d2a2ed7 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 @@ -141,7 +141,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 411e5226e..ed87dea65 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 @@ -143,7 +143,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_global_bypass_diff_device_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_global_bypass_diff_device_vlan_none.py index e0c7d8219..a17405201 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_global_bypass_diff_device_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_global_bypass_diff_device_vlan_none.py @@ -148,7 +148,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_nearby_bypass_diff_device_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_nearby_bypass_diff_device_vlan_none.py index 322988c0b..b44ae5a4a 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_nearby_bypass_diff_device_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_nearby_bypass_diff_device_vlan_none.py @@ -147,7 +147,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_disabled_vxlan_activeip_bfd.py index cf3591ee4..9b402ad75 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_disabled_vxlan_activeip_bfd.py @@ -152,7 +152,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vlan_none.py index 251c7baef..efea4196c 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vlan_none.py @@ -4,6 +4,7 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath( import time import pytz from datetime import datetime +from support.ui_utils.element_position.map_element_position_library import replace_paras from support.ui_utils.workpath import workdir from support.ui_utils.ui_client import UIClient from support.api_utils.api_client import APIClient @@ -41,7 +42,7 @@ def run(parameter): "items": [ { "op": "add", - "ip": "10.64.224.25", + "ip": "10.64.224.3", "interval": "0-65535" } ] @@ -153,7 +154,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, @@ -267,13 +268,14 @@ if __name__ == '__main__': "api_server": "http://192.168.44.72", "initiation_method": "api", "env": "tsgx", - "vsys_id": 11, + "vsys": 5, "is_log": 1, "root_path": "C:/automation_project/tsg_test", "path": "C:/automation_project/tsg_test/tests/ui", "module_name": "service_chaining", "test_case_name": "" } + parameter = replace_paras(parameter) run(parameter) """ # 在测试文件的当前路径执行如下命令执行测试用例： diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py index 4cb7e2f44..17818b457 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_bfd.py @@ -152,7 +152,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_none.py index 0594f0b8a..f1c020a10 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_activeip_none.py @@ -149,7 +149,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py index 26c455337..dbd8f0f2a 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_bfd.py @@ -152,7 +152,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py index ad877a22e..1f38779d5 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_inactiveip_none.py @@ -152,7 +152,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 212cb9073..3d5b3304f 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 @@ -145,7 +145,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_none.py index c67aaa1fc..09ed5d29b 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_block_vxlan_unavailableip_none.py @@ -152,7 +152,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_disabled_vxlan_activeip_bfd.py index 1dd966703..1086d2258 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_disabled_vxlan_activeip_bfd.py @@ -153,7 +153,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vlan_none.py index 2a16f4625..35918f2d3 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vlan_none.py @@ -154,7 +154,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_bfd.py index c44f64d4a..0254ef498 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_bfd.py @@ -153,7 +153,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_none.py index a53e3e79f..ac874d306 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_activeip_none.py @@ -153,7 +153,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_bfd.py index 4018bec5f..3c1237fda 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_bfd.py @@ -153,7 +153,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_none.py index b4a2c1c2f..eb90d95e1 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_inactiveip_none.py @@ -153,7 +153,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_bfd.py index 75ef6d1c1..d628bc889 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_bfd.py @@ -153,7 +153,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_none.py index 0c6e19f98..f33e650c9 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_mirror_redispatch_bypass_vxlan_unavailableip_none.py @@ -153,7 +153,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_no_sni_false_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_no_sni_false_mirror_bypass_vlan_none.py index 5926f7fb8..7ca91f24e 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_no_sni_false_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_no_sni_false_mirror_bypass_vlan_none.py @@ -160,7 +160,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_no_sni_false_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_no_sni_false_steer_bypass_vxlan_activeip_bfd.py index a20ac7a0f..3f2129095 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_no_sni_false_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_no_sni_false_steer_bypass_vxlan_activeip_bfd.py @@ -159,7 +159,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_activeip_bfd.py index 310b395e3..087c7d278 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_activeip_bfd.py @@ -146,7 +146,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_activeip_none.py index 854c4bdeb..144e346be 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_activeip_none.py @@ -146,7 +146,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 967e28e5f..7b56bb6a7 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 @@ -140,7 +140,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_inactiveip_none.py index 5a47eda37..68833670a 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_block_vxlan_inactiveip_none.py @@ -146,7 +146,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 da31d5eb5..105e371de 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 @@ -139,7 +139,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 7b3dea6f4..ca2ad4654 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 @@ -143,7 +143,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index 66c18d036..0c27bba5c 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -149,7 +149,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_none.py index 2eef4327a..513bb9cf1 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_none.py @@ -146,7 +146,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 cc2980502..f44aacd3d 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 @@ -140,7 +140,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_inactiveip_none.py index fc28bfc8f..59c7b14e1 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_bypass_vxlan_inactiveip_none.py @@ -146,7 +146,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 aa26258f4..d1e1257e2 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 @@ -137,7 +137,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 45c9c3ba0..507cc244e 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 @@ -144,7 +144,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_bfd.py index 391da2b54..c8b617320 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_bfd.py @@ -144,7 +144,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_none.py index 853dd755b..a1a60af89 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_activeip_none.py @@ -149,7 +149,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 a119f5db2..4d97ea328 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 @@ -143,7 +143,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_none.py index cc28fd136..ef9db3894 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_block_vxlan_inactiveip_none.py @@ -149,7 +149,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 61c823c26..0a5498b38 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 @@ -144,7 +144,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 fcda06409..183dea0d8 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 @@ -146,7 +146,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py index d77910bbf..d0850bb37 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_bfd.py @@ -144,7 +144,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_none.py index c445255da..cf3a3f7eb 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_activeip_none.py @@ -150,7 +150,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 ace9c7c14..6fffdfff4 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 @@ -144,7 +144,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_none.py index b91280a32..3b4e4762f 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_fqdn_ssl_steer_redispatch_bypass_vxlan_inactiveip_none.py @@ -150,7 +150,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 1a2ef188e..63ae19965 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 @@ -146,7 +146,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 b3e412d78..bf73c730c 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 @@ -147,7 +147,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ftp_account_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_ftp_account_mirror_bypass_vlan_none.py index 4ecbb094f..1344af48b 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ftp_account_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ftp_account_mirror_bypass_vlan_none.py @@ -147,7 +147,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ftp_account_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_ftp_account_steer_bypass_vxlan_activeip_bfd.py index 9dc0e9606..f3c7eb3f3 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ftp_account_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ftp_account_steer_bypass_vxlan_activeip_bfd.py @@ -144,7 +144,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ipprototcp_ftp_account_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_ipprototcp_ftp_account_steer_bypass_vxlan_activeip_bfd.py index 1ee0d2042..59cf265d5 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ipprototcp_ftp_account_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ipprototcp_ftp_account_steer_bypass_vxlan_activeip_bfd.py @@ -155,7 +155,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ipprotoudp_dns_qname_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_ipprotoudp_dns_qname_steer_bypass_vxlan_activeip_bfd.py index e9f03afdc..842b56e2e 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ipprotoudp_dns_qname_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ipprotoudp_dns_qname_steer_bypass_vxlan_activeip_bfd.py @@ -159,7 +159,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_mail_from_to_account_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_mail_from_to_account_mirror_bypass_vlan_none.py index 59803acb3..11e3376f2 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_mail_from_to_account_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_mail_from_to_account_mirror_bypass_vlan_none.py @@ -186,7 +186,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_mail_from_to_account_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_mail_from_to_account_steer_bypass_vxlan_activeip_bfd.py index 44759a7a9..a87e5b22c 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_mail_from_to_account_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_mail_from_to_account_steer_bypass_vxlan_activeip_bfd.py @@ -180,7 +180,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_mirror_block_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_mirror_block_vxlan_activeip_none.py index 1fe1caf1b..8f7a4cb4b 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_mirror_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_mirror_block_vxlan_activeip_none.py @@ -118,7 +118,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_disabled_vxlan_activeip_bfd.py index 9a0a173c4..3174b6376 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_disabled_vxlan_activeip_bfd.py @@ -116,7 +116,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_vxlan_activeip_bfd.py index 433be475c..9f64ba0c1 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_vxlan_activeip_bfd.py @@ -116,7 +116,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_vxlan_activeip_none.py index 97bc9c3ff..c1b217ec0 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_mirror_bypass_vxlan_activeip_none.py @@ -118,7 +118,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_multiple_port_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_multiple_port_mirror_bypass_vlan_none.py index 204f72a7f..9967f3282 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_multiple_port_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_multiple_port_mirror_bypass_vlan_none.py @@ -190,7 +190,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_negate_dstport_dns_qname_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_negate_dstport_dns_qname_mirror_bypass_vlan_none.py index ef23bc416..e50f6af13 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_negate_dstport_dns_qname_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_negate_dstport_dns_qname_mirror_bypass_vlan_none.py @@ -167,7 +167,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_negate_dstport_dns_qname_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_negate_dstport_dns_qname_steer_bypass_vxlan_activeip_bfd.py index f6c70f6de..fb7eaaf15 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_negate_dstport_dns_qname_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_negate_dstport_dns_qname_steer_bypass_vxlan_activeip_bfd.py @@ -166,7 +166,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_negate_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_negate_fqdn_ssl_mirror_bypass_vlan_none.py index d511bb3da..00ae85056 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_negate_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_negate_fqdn_ssl_mirror_bypass_vlan_none.py @@ -150,7 +150,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_negate_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_negate_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index ee82369bd..8b6755c88 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_negate_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_negate_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -149,7 +149,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_openvpn_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_openvpn_mirror_bypass_vlan_none.py index d0cc72d9d..745d2b739 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_openvpn_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_openvpn_mirror_bypass_vlan_none.py @@ -132,7 +132,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_openvpn_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_openvpn_steer_bypass_vxlan_activeip_bfd.py index cf82f828e..c2a5e2fa8 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_openvpn_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_openvpn_steer_bypass_vxlan_activeip_bfd.py @@ -131,7 +131,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_quic_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_quic_mirror_bypass_vlan_none.py index 02accf0e6..33fb31809 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_quic_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_quic_mirror_bypass_vlan_none.py @@ -131,7 +131,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_quic_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_quic_steer_bypass_vxlan_activeip_bfd.py index 41ec03379..2bb325abb 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_quic_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_quic_steer_bypass_vxlan_activeip_bfd.py @@ -130,7 +130,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_rdp_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_rdp_mirror_bypass_vlan_none.py index 9ee68d66a..fdd0eb4f9 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_rdp_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_rdp_mirror_bypass_vlan_none.py @@ -132,7 +132,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_rdp_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_rdp_steer_bypass_vxlan_activeip_bfd.py index 4e49a48f7..76fb405ed 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_rdp_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_rdp_steer_bypass_vxlan_activeip_bfd.py @@ -131,7 +131,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_esni_true_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_esni_true_mirror_bypass_vlan_none.py index 97946f0a0..886db334a 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_esni_true_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_esni_true_mirror_bypass_vlan_none.py @@ -142,7 +142,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_esni_true_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_esni_true_steer_bypass_vxlan_activeip_bfd.py index d7c2c8bdb..96e5420eb 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_esni_true_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_esni_true_steer_bypass_vxlan_activeip_bfd.py @@ -141,7 +141,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vlan_none.py index 5a0f47fcf..1a5a1add9 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vlan_none.py @@ -130,7 +130,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 3280b573c..3455c3ad7 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 @@ -122,7 +122,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_activeip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_activeip_none.py index 5f326d327..eea1a8a24 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_activeip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_activeip_none.py @@ -128,7 +128,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 a3daf21e1..92a589aa6 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 @@ -122,7 +122,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_inactiveip_none.py index 23f7186db..78c079aae 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_block_vxlan_inactiveip_none.py @@ -129,7 +129,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 03d2fb5f6..cc7fd93d0 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 @@ -119,7 +119,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, 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 96aef28d0..aa4093f58 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 @@ -125,7 +125,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_bypass_disabled_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_bypass_disabled_vlan_none.py index 8fb1cc925..838e3822a 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_bypass_disabled_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_bypass_disabled_vlan_none.py @@ -130,7 +130,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_bypass_vlan_none.py index 35d4450b9..ce00e0842 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_mirror_bypass_vlan_none.py @@ -132,7 +132,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_no_sni_true_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_no_sni_true_mirror_bypass_vlan_none.py index bea8f999d..f250bb816 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_no_sni_true_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_no_sni_true_mirror_bypass_vlan_none.py @@ -142,7 +142,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_ssl_no_sni_true_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_ssl_no_sni_true_steer_bypass_vxlan_activeip_bfd.py index e5e0746b5..e636514bf 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_ssl_no_sni_true_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_ssl_no_sni_true_steer_bypass_vxlan_activeip_bfd.py @@ -141,7 +141,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_steer_bypass_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_steer_bypass_disabled_vxlan_activeip_bfd.py index b1931d8c4..d153c17d5 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_steer_bypass_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_steer_bypass_disabled_vxlan_activeip_bfd.py @@ -115,7 +115,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_steer_bypass_vxlan_activeip_bfd.py index 2e6a04db7..42820e307 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_steer_bypass_vxlan_activeip_bfd.py @@ -112,7 +112,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_compliance_risk_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_compliance_risk_library_http_url_steer_bypass_vxlan_activeip_bfd.py index 0d2faeacd..c31fe77be 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_compliance_risk_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_compliance_risk_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -176,7 +176,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_geoip_asn_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_geoip_asn_library_http_url_steer_bypass_vxlan_activeip_bfd.py index 0b3144b9f..bdf4fffc1 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_geoip_asn_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_geoip_asn_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -183,7 +183,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_internet_geoip_country_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_internet_geoip_country_library_http_url_steer_bypass_vxlan_activeip_bfd.py index 68255b385..41732d811 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_internet_geoip_country_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_internet_geoip_country_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -177,7 +177,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_internet_service_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_internet_service_library_http_url_steer_bypass_vxlan_activeip_bfd.py index ef572af18..92f71829d 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_internet_service_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_internet_service_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -176,7 +176,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py index f2f77a622..87f688ddd 100644 --- a/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstip_suff_fqdn_library_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -182,7 +182,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstport_external_port_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstport_external_port_steer_bypass_vxlan_activeip_bfd.py index 4b2ac568b..49c3b2692 100644 --- a/tests/service_chaining/sc_raw_srcip_dstport_external_port_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstport_external_port_steer_bypass_vxlan_activeip_bfd.py @@ -135,7 +135,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstport_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstport_mirror_bypass_vlan_none.py index 9da43e349..7f90b275f 100644 --- a/tests/service_chaining/sc_raw_srcip_dstport_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstport_mirror_bypass_vlan_none.py @@ -119,7 +119,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstport_range_external_port_range_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_dstport_range_external_port_range_mirror_bypass_vlan_none.py index 06fc31675..460931e47 100644 --- a/tests/service_chaining/sc_raw_srcip_dstport_range_external_port_range_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_dstport_range_external_port_range_mirror_bypass_vlan_none.py @@ -137,7 +137,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dstport_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_dstport_steer_bypass_vxlan_activeip_bfd.py index fea8c531a..f02df52f4 100644 --- a/tests/service_chaining/sc_raw_srcip_dstport_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dstport_steer_bypass_vxlan_activeip_bfd.py @@ -118,7 +118,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_dtsip_mirror_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_dtsip_mirror_bypass_vxlan_inactiveip_bfd.py index 022edf249..7469ff8aa 100644 --- a/tests/service_chaining/sc_raw_srcip_dtsip_mirror_bypass_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_dtsip_mirror_bypass_vxlan_inactiveip_bfd.py @@ -113,7 +113,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_fqdn_ipprototcp_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_fqdn_ipprototcp_ssl_steer_bypass_vxlan_activeip_bfd.py index 9b04a6923..0aa47f42e 100644 --- a/tests/service_chaining/sc_raw_srcip_fqdn_ipprototcp_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_fqdn_ipprototcp_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -137,7 +137,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_block_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_block_disabled_vxlan_activeip_bfd.py index 7196b7774..6e5b4c2f0 100644 --- a/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_block_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_block_disabled_vxlan_activeip_bfd.py @@ -128,7 +128,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_bypass_disabled_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_bypass_disabled_vxlan_activeip_bfd.py index ac753b0ac..0263e52ac 100644 --- a/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_bypass_disabled_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_bypass_disabled_vxlan_activeip_bfd.py @@ -127,7 +127,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_global_bypass_diff_device_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_global_bypass_diff_device_vxlan_activeip_bfd.py index 5561aca30..fde2a8c8c 100644 --- a/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_global_bypass_diff_device_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_global_bypass_diff_device_vxlan_activeip_bfd.py @@ -125,7 +125,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_nearby_bypass_diff_device_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_nearby_bypass_diff_device_vxlan_activeip_bfd.py index 69cd0ec60..ccb48bfe4 100644 --- a/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_nearby_bypass_diff_device_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_fqdn_ssl_steer_nearby_bypass_diff_device_vxlan_activeip_bfd.py @@ -124,7 +124,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_internal_port_range_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_internal_port_range_mirror_bypass_vlan_none.py index 27aced842..855a5c353 100644 --- a/tests/service_chaining/sc_raw_srcip_internal_port_range_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_internal_port_range_mirror_bypass_vlan_none.py @@ -118,7 +118,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_internal_port_range_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_internal_port_range_steer_bypass_vxlan_activeip_bfd.py index bbb11978b..5763c79ed 100644 --- a/tests/service_chaining/sc_raw_srcip_internal_port_range_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_internal_port_range_steer_bypass_vxlan_activeip_bfd.py @@ -117,7 +117,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_inactiveip_bfd.py index ab3b6a08e..8a199d407 100644 --- a/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_inactiveip_bfd.py @@ -101,7 +101,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_inactiveip_none.py index 9ca741638..4846f7166 100644 --- a/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_inactiveip_none.py @@ -129,7 +129,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_unavailableip_bfd.py index bda3d1819..2afb209af 100644 --- a/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_unavailableip_bfd.py @@ -101,7 +101,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_unavailableip_none.py index a9ad32da1..e4497d01c 100644 --- a/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_raw_srcip_mirror_block_vxlan_unavailableip_none.py @@ -101,7 +101,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_mirror_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_mirror_bypass_vxlan_unavailableip_bfd.py index 5fc0002d2..8840cb1f7 100644 --- a/tests/service_chaining/sc_raw_srcip_mirror_bypass_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_mirror_bypass_vxlan_unavailableip_bfd.py @@ -99,7 +99,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_mirror_redispatch_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_mirror_redispatch_block_vxlan_inactiveip_bfd.py index d6d7dd64e..f749f9d94 100644 --- a/tests/service_chaining/sc_raw_srcip_mirror_redispatch_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_mirror_redispatch_block_vxlan_inactiveip_bfd.py @@ -104,7 +104,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_negate_dstip_fqdn_ssl_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_negate_dstip_fqdn_ssl_mirror_bypass_vlan_none.py index 0b2b2157e..7c3fe8e27 100644 --- a/tests/service_chaining/sc_raw_srcip_negate_dstip_fqdn_ssl_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_negate_dstip_fqdn_ssl_mirror_bypass_vlan_none.py @@ -150,7 +150,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_negate_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_negate_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py index 56a9e4859..5cd556fd2 100644 --- a/tests/service_chaining/sc_raw_srcip_negate_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_negate_dstip_fqdn_ssl_steer_bypass_vxlan_activeip_bfd.py @@ -149,7 +149,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_negate_srcport_range_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcip_negate_srcport_range_mirror_bypass_vlan_none.py index 2970c5569..149c5f122 100644 --- a/tests/service_chaining/sc_raw_srcip_negate_srcport_range_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcip_negate_srcport_range_mirror_bypass_vlan_none.py @@ -119,7 +119,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_negate_srcport_range_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcip_negate_srcport_range_steer_bypass_vxlan_activeip_bfd.py index 2970c5569..149c5f122 100644 --- a/tests/service_chaining/sc_raw_srcip_negate_srcport_range_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_negate_srcport_range_steer_bypass_vxlan_activeip_bfd.py @@ -119,7 +119,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_inactiveip_bfd.py index cf47f6c6e..f93332d14 100644 --- a/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_inactiveip_bfd.py @@ -99,7 +99,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_inactiveip_none.py b/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_inactiveip_none.py index 3a92b9f72..ecaf71fb8 100644 --- a/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_inactiveip_none.py +++ b/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_inactiveip_none.py @@ -99,7 +99,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_unavailableip_bfd.py index a83b665a0..f4e9fc752 100644 --- a/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_unavailableip_bfd.py @@ -99,7 +99,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_unavailableip_none.py index b1e33a00d..488a328fb 100644 --- a/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_raw_srcip_steer_block_vxlan_unavailableip_none.py @@ -99,7 +99,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_inactiveip_bfd.py index b84345fc0..2c4caa9bc 100644 --- a/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_inactiveip_bfd.py @@ -99,7 +99,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_unavailableip_bfd.py b/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_unavailableip_bfd.py index 61b637162..c0d680a0e 100644 --- a/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_unavailableip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_unavailableip_bfd.py @@ -99,7 +99,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_unavailableip_none.py b/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_unavailableip_none.py index c6af9d4df..1fa714676 100644 --- a/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_unavailableip_none.py +++ b/tests/service_chaining/sc_raw_srcip_steer_bypass_vxlan_unavailableip_none.py @@ -99,7 +99,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_steer_redispatch_block_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_steer_redispatch_block_vxlan_inactiveip_bfd.py index 3383dcdac..d156bbb4b 100644 --- a/tests/service_chaining/sc_raw_srcip_steer_redispatch_block_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_steer_redispatch_block_vxlan_inactiveip_bfd.py @@ -102,7 +102,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcip_steer_redispatch_bypass_vxlan_inactiveip_bfd.py b/tests/service_chaining/sc_raw_srcip_steer_redispatch_bypass_vxlan_inactiveip_bfd.py index c0742c45e..6ad0e5bdb 100644 --- a/tests/service_chaining/sc_raw_srcip_steer_redispatch_bypass_vxlan_inactiveip_bfd.py +++ b/tests/service_chaining/sc_raw_srcip_steer_redispatch_bypass_vxlan_inactiveip_bfd.py @@ -103,7 +103,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcport_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcport_mirror_bypass_vlan_none.py index b7e7c8fd5..7fe8f46c6 100644 --- a/tests/service_chaining/sc_raw_srcport_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcport_mirror_bypass_vlan_none.py @@ -98,7 +98,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcport_range_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_srcport_range_mirror_bypass_vlan_none.py index 4f85e0614..b763d46dc 100644 --- a/tests/service_chaining/sc_raw_srcport_range_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_srcport_range_mirror_bypass_vlan_none.py @@ -98,7 +98,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcport_range_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcport_range_steer_bypass_vxlan_activeip_bfd.py index 887ab007f..9a188cd73 100644 --- a/tests/service_chaining/sc_raw_srcport_range_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcport_range_steer_bypass_vxlan_activeip_bfd.py @@ -105,7 +105,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_srcport_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_srcport_steer_bypass_vxlan_activeip_bfd.py index 5f5843f64..473138348 100644 --- a/tests/service_chaining/sc_raw_srcport_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_srcport_steer_bypass_vxlan_activeip_bfd.py @@ -93,7 +93,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_subid_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_subid_fqdn_http_url_mirror_bypass_vlan_none.py index aa0f592f5..58f0a5819 100644 --- a/tests/service_chaining/sc_raw_subid_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_subid_fqdn_http_url_mirror_bypass_vlan_none.py @@ -145,7 +145,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_subid_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_subid_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index d451b5b4f..a34873741 100644 --- a/tests/service_chaining/sc_raw_subid_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_subid_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -144,7 +144,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_subid_imei_apn_fqdn_http_url_mirror_bypass_vlan_none.py b/tests/service_chaining/sc_raw_subid_imei_apn_fqdn_http_url_mirror_bypass_vlan_none.py index 65bb629ca..6eef4892a 100644 --- a/tests/service_chaining/sc_raw_subid_imei_apn_fqdn_http_url_mirror_bypass_vlan_none.py +++ b/tests/service_chaining/sc_raw_subid_imei_apn_fqdn_http_url_mirror_bypass_vlan_none.py @@ -182,7 +182,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, diff --git a/tests/service_chaining/sc_raw_subid_imei_apn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py b/tests/service_chaining/sc_raw_subid_imei_apn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py index daa933df0..0e70ec19b 100644 --- a/tests/service_chaining/sc_raw_subid_imei_apn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py +++ b/tests/service_chaining/sc_raw_subid_imei_apn_fqdn_http_url_steer_bypass_vxlan_activeip_bfd.py @@ -181,7 +181,7 @@ def run(parameter): verification_result = { "excepted_traffic_result": "", - "expected_metric": "", + "expected_metric": {"hits": 1}, "expected_log": [ {"query_field_key": "sc_rsp_raw", "query_value": ""}, {"query_field_key": "sent_pkts", "query_value": ""}, |