Fix incorrect Onvif filter

Signed-off-by: Jean-Benoit Paux <9682558+jbpaux@users.noreply.github.com>
project-akri · May 31, 2023 · 10bca52 · 10bca52
1 parent 33c85fc
commit 10bca52
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 1 deletion.
diff --git a/discovery-handlers/onvif/src/discovery_handler.rs b/discovery-handlers/onvif/src/discovery_handler.rs
@@ -350,6 +350,34 @@ mod tests {
             .is_none());
     }
 
+    #[tokio::test]
+    async fn test_apply_filters_include_ip_similar() {
+        let mock_uri = "device_uri";
+
+        let mut mock = MockOnvifQuery::new();
+        configure_scenario(
+            &mut mock,
+            Some(IpAndMac {
+                mock_uri,
+                mock_ip: "mock.ip",
+                mock_mac: "mock:mac",
+            }),
+        );
+
+        let onvif_config = OnvifDiscoveryDetails {
+            ip_addresses: Some(FilterList {
+                action: FilterType::Include,
+                items: vec!["mock.i".to_string()],
+            }),
+            mac_addresses: None,
+            scopes: None,
+            discovery_timeout_seconds: 1,
+        };
+        assert!(apply_filters(&onvif_config, mock_uri, &mock)
+            .await
+            .is_none());
+    }
+
     #[tokio::test]
     async fn test_apply_filters_exclude_ip_nonexist() {
         let mock_uri = "device_uri";
@@ -409,6 +437,36 @@ mod tests {
             .is_none());
     }
 
+    #[tokio::test]
+    async fn test_apply_filters_exclude_ip_similar() {
+        let mock_uri = "device_uri";
+        let mock_ip = "mock.ip";
+        let mock_mac = "mock:mac";
+
+        let mut mock = MockOnvifQuery::new();
+        configure_scenario(
+            &mut mock,
+            Some(IpAndMac {
+                mock_uri,
+                mock_ip,
+                mock_mac,
+            }),
+        );
+
+        let onvif_config = OnvifDiscoveryDetails {
+            ip_addresses: Some(FilterList {
+                action: FilterType::Exclude,
+                items: vec!["mock.i".to_string()],
+            }),
+            mac_addresses: None,
+            scopes: None,
+            discovery_timeout_seconds: 1,
+        };
+        let instance = apply_filters(&onvif_config, mock_uri, &mock).await.unwrap();
+
+        assert_eq!(expected_device(mock_uri, mock_ip, mock_mac), instance);
+    }
+
     #[tokio::test]
     async fn test_apply_filters_include_mac_exist() {
         let mock_uri = "device_uri";

diff --git a/discovery-handlers/onvif/src/discovery_impl.rs b/discovery-handlers/onvif/src/discovery_impl.rs
@@ -242,7 +242,7 @@ pub mod util {
             .filter(|pattern| {
                 filter_against
                     .iter()
-                    .filter(|filter_against_item| filter_against_item.contains(*pattern))
+                    .filter(|filter_against_item| filter_against_item == pattern)
                     .count()
                     > 0
             })