Skip to content

Commit

Permalink
retrieve uuid from endpoint address, use it with service url as devic…
Browse files Browse the repository at this point in the history 
…e id (#630)

* retrieve uuid from endpoint address, use it with service url as device id

Signed-off-by: Johnson Shih <[email protected]>

* update patch version

Signed-off-by: Johnson Shih <[email protected]>

---------

Signed-off-by: Johnson Shih <[email protected]>
  • Loading branch information
@johnsonshih
johnsonshih committed Jul 19, 2023
1 parent af878cd commit db62ed8
Show file tree
Hide file tree
Showing 3 changed files with 187 additions and 62 deletions.
118 changes: 87 additions & 31 deletions discovery-handlers/onvif/src/discovery_handler.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use super::discovery_impl::util;
use super::discovery_utils::{
OnvifQuery, OnvifQueryImpl, ONVIF_DEVICE_IP_ADDRESS_LABEL_ID,
ONVIF_DEVICE_MAC_ADDRESS_LABEL_ID, ONVIF_DEVICE_SERVICE_URL_LABEL_ID,
ONVIF_DEVICE_UUID_LABEL_ID,
};
use akri_discovery_utils::{
discovery::{
Expand Down Expand Up @@ -73,7 +74,7 @@ impl DiscoveryHandler for DiscoveryHandlerImpl {
deserialize_discovery_details(&discover_request.discovery_details)
.map_err(|e| tonic::Status::new(tonic::Code::InvalidArgument, format!("{}", e)))?;
tokio::spawn(async move {
let mut previous_cameras = Vec::new();
let mut previous_cameras = HashMap::new();
let mut filtered_camera_devices = HashMap::new();
loop {
// Before each iteration, check if receiver has dropped
Expand All @@ -98,17 +99,19 @@ impl DiscoveryHandler for DiscoveryHandlerImpl {
.unwrap();
trace!("discover - discovered:{:?}", &latest_cameras);
// Remove cameras that have gone offline
previous_cameras.iter().for_each(|c| {
if !latest_cameras.contains(c) {
previous_cameras.keys().for_each(|c| {
if !latest_cameras.contains_key(c) {
changed_camera_list = true;
filtered_camera_devices.remove(c);
}
});

let futures: Vec<_> = latest_cameras
.iter()
.filter(|c| !previous_cameras.contains(c))
.map(|c| apply_filters(&discovery_handler_config, c, &onvif_query))
.filter(|(k, _)| !previous_cameras.contains_key(*k))
.map(|(uri, uuid)| {
apply_filters(&discovery_handler_config, uri, uuid, &onvif_query)
})
.collect();
let options = futures_util::future::join_all(futures).await;
// Insert newly discovered camera that are not filtered out
Expand Down Expand Up @@ -150,9 +153,13 @@ impl DiscoveryHandler for DiscoveryHandlerImpl {
async fn apply_filters(
discovery_handler_config: &OnvifDiscoveryDetails,
device_service_uri: &str,
device_uuid: &str,
onvif_query: &impl OnvifQuery,
) -> Option<(String, Device)> {
info!("apply_filters - device service url {}", device_service_uri);
info!(
"apply_filters - device service url {}, uuid {}",
device_service_uri, device_uuid
);
let (ip_address, mac_address) = match onvif_query
.get_device_ip_and_mac_address(device_service_uri)
.await
Expand Down Expand Up @@ -184,19 +191,20 @@ async fn apply_filters(
return None;
}

let ip_and_mac_joined = format!("{}-{}", &ip_address, &mac_address);
let service_uri_and_uuid_joined = format!("{}-{}", device_service_uri, device_uuid);
let mut properties = HashMap::new();
properties.insert(
ONVIF_DEVICE_SERVICE_URL_LABEL_ID.to_string(),
device_service_uri.to_string(),
);
properties.insert(ONVIF_DEVICE_UUID_LABEL_ID.into(), device_uuid.to_string());
properties.insert(ONVIF_DEVICE_IP_ADDRESS_LABEL_ID.into(), ip_address);
properties.insert(ONVIF_DEVICE_MAC_ADDRESS_LABEL_ID.into(), mac_address);

Some((
device_service_uri.to_string(),
Device {
id: ip_and_mac_joined,
id: service_uri_and_uuid_joined,
properties,
mounts: Vec::default(),
device_specs: Vec::default(),
Expand Down Expand Up @@ -239,20 +247,20 @@ mod tests {
.returning(move |_| Ok((ip.to_string(), mac.to_string())));
}

fn expected_device(uri: &str, ip: &str, mac: &str) -> (String, Device) {
fn expected_device(uri: &str, uuid: &str, ip: &str, mac: &str) -> (String, Device) {
let mut properties = HashMap::new();
properties.insert(
ONVIF_DEVICE_SERVICE_URL_LABEL_ID.to_string(),
uri.to_string(),
);

properties.insert(ONVIF_DEVICE_UUID_LABEL_ID.into(), uuid.to_string());
properties.insert(ONVIF_DEVICE_IP_ADDRESS_LABEL_ID.into(), ip.to_string());
properties.insert(ONVIF_DEVICE_MAC_ADDRESS_LABEL_ID.into(), mac.to_string());

(
uri.to_string(),
Device {
id: format!("{}-{}", ip, mac),
id: format!("{}-{}", uri, uuid),
properties,
mounts: Vec::default(),
device_specs: Vec::default(),
Expand All @@ -271,6 +279,7 @@ mod tests {
#[tokio::test]
async fn test_apply_filters_no_filters() {
let mock_uri = "device_uri";
let mock_uuid = "device_uuid";
let mock_ip = "mock.ip";
let mock_mac = "mock:mac";

Expand All @@ -290,14 +299,20 @@ mod tests {
scopes: None,
discovery_timeout_seconds: 1,
};
let instance = apply_filters(&onvif_config, mock_uri, &mock).await.unwrap();
let instance = apply_filters(&onvif_config, mock_uri, mock_uuid, &mock)
.await
.unwrap();

assert_eq!(expected_device(mock_uri, mock_ip, mock_mac), instance);
assert_eq!(
expected_device(mock_uri, mock_uuid, mock_ip, mock_mac),
instance
);
}

#[tokio::test]
async fn test_apply_filters_include_ip_exist() {
let mock_uri = "device_uri";
let mock_uuid = "device_uuid";
let mock_ip = "mock.ip";
let mock_mac = "mock:mac";

Expand All @@ -320,14 +335,20 @@ mod tests {
scopes: None,
discovery_timeout_seconds: 1,
};
let instance = apply_filters(&onvif_config, mock_uri, &mock).await.unwrap();
let instance = apply_filters(&onvif_config, mock_uri, mock_uuid, &mock)
.await
.unwrap();

assert_eq!(expected_device(mock_uri, mock_ip, mock_mac), instance);
assert_eq!(
expected_device(mock_uri, mock_uuid, mock_ip, mock_mac),
instance
);
}

#[tokio::test]
async fn test_apply_filters_include_ip_nonexist() {
let mock_uri = "device_uri";
let mock_uuid = "device_uuid";

let mut mock = MockOnvifQuery::new();
configure_scenario(
Expand All @@ -348,14 +369,15 @@ mod tests {
scopes: None,
discovery_timeout_seconds: 1,
};
assert!(apply_filters(&onvif_config, mock_uri, &mock)
assert!(apply_filters(&onvif_config, mock_uri, mock_uuid, &mock)
.await
.is_none());
}

#[tokio::test]
async fn test_apply_filters_include_ip_similar() {
let mock_uri = "device_uri";
let mock_uuid = "device_uuid";

let mut mock = MockOnvifQuery::new();
configure_scenario(
Expand All @@ -376,14 +398,15 @@ mod tests {
scopes: None,
discovery_timeout_seconds: 1,
};
assert!(apply_filters(&onvif_config, mock_uri, &mock)
assert!(apply_filters(&onvif_config, mock_uri, mock_uuid, &mock)
.await
.is_none());
}

#[tokio::test]
async fn test_apply_filters_exclude_ip_nonexist() {
let mock_uri = "device_uri";
let mock_uuid = "device_uuid";
let mock_ip = "mock.ip";
let mock_mac = "mock:mac";

Expand All @@ -406,14 +429,20 @@ mod tests {
scopes: None,
discovery_timeout_seconds: 1,
};
let instance = apply_filters(&onvif_config, mock_uri, &mock).await.unwrap();
let instance = apply_filters(&onvif_config, mock_uri, mock_uuid, &mock)
.await
.unwrap();

assert_eq!(expected_device(mock_uri, mock_ip, mock_mac), instance);
assert_eq!(
expected_device(mock_uri, mock_uuid, mock_ip, mock_mac),
instance
);
}

#[tokio::test]
async fn test_apply_filters_exclude_ip_exist() {
let mock_uri = "device_uri";
let mock_uuid = "device_uuid";
let mock_ip = "mock.ip";

let mut mock = MockOnvifQuery::new();
Expand All @@ -435,14 +464,15 @@ mod tests {
scopes: None,
discovery_timeout_seconds: 1,
};
assert!(apply_filters(&onvif_config, mock_uri, &mock)
assert!(apply_filters(&onvif_config, mock_uri, mock_uuid, &mock)
.await
.is_none());
}

#[tokio::test]
async fn test_apply_filters_exclude_ip_similar() {
let mock_uri = "device_uri";
let mock_uuid = "device_uuid";
let mock_ip = "mock.ip";
let mock_mac = "mock:mac";

Expand All @@ -465,14 +495,20 @@ mod tests {
scopes: None,
discovery_timeout_seconds: 1,
};
let instance = apply_filters(&onvif_config, mock_uri, &mock).await.unwrap();
let instance = apply_filters(&onvif_config, mock_uri, mock_uuid, &mock)
.await
.unwrap();

assert_eq!(expected_device(mock_uri, mock_ip, mock_mac), instance);
assert_eq!(
expected_device(mock_uri, mock_uuid, mock_ip, mock_mac),
instance
);
}

#[tokio::test]
async fn test_apply_filters_include_mac_exist() {
let mock_uri = "device_uri";
let mock_uuid = "device_uuid";
let mock_ip = "mock.ip";
let mock_mac = "mock:mac";

Expand All @@ -495,14 +531,20 @@ mod tests {
scopes: None,
discovery_timeout_seconds: 1,
};
let instance = apply_filters(&onvif_config, mock_uri, &mock).await.unwrap();
let instance = apply_filters(&onvif_config, mock_uri, mock_uuid, &mock)
.await
.unwrap();

assert_eq!(expected_device(mock_uri, mock_ip, mock_mac), instance);
assert_eq!(
expected_device(mock_uri, mock_uuid, mock_ip, mock_mac),
instance
);
}

#[tokio::test]
async fn test_apply_filters_include_mac_nonexist() {
let mock_uri = "device_uri";
let mock_uuid = "device_uuid";

let mut mock = MockOnvifQuery::new();
configure_scenario(
Expand All @@ -523,14 +565,15 @@ mod tests {
scopes: None,
discovery_timeout_seconds: 1,
};
assert!(apply_filters(&onvif_config, mock_uri, &mock)
assert!(apply_filters(&onvif_config, mock_uri, mock_uuid, &mock)
.await
.is_none());
}

#[tokio::test]
async fn test_apply_filters_exclude_mac_nonexist() {
let mock_uri = "device_uri";
let mock_uuid = "device_uuid";
let mock_ip = "mock.ip";
let mock_mac = "mock:mac";

Expand All @@ -553,14 +596,20 @@ mod tests {
scopes: None,
discovery_timeout_seconds: 1,
};
let instance = apply_filters(&onvif_config, mock_uri, &mock).await.unwrap();
let instance = apply_filters(&onvif_config, mock_uri, mock_uuid, &mock)
.await
.unwrap();

assert_eq!(expected_device(mock_uri, mock_ip, mock_mac), instance);
assert_eq!(
expected_device(mock_uri, mock_uuid, mock_ip, mock_mac),
instance
);
}

#[tokio::test]
async fn test_apply_filters_exclude_mac_exist() {
let mock_uri = "device_uri";
let mock_uuid = "device_uuid";
let mock_mac = "mock:mac";

let mut mock = MockOnvifQuery::new();
Expand All @@ -582,14 +631,15 @@ mod tests {
scopes: None,
discovery_timeout_seconds: 1,
};
assert!(apply_filters(&onvif_config, mock_uri, &mock)
assert!(apply_filters(&onvif_config, mock_uri, mock_uuid, &mock)
.await
.is_none());
}

#[tokio::test]
async fn test_apply_filters_include_mac_exist_different_letter_cases() {
let mock_uri = "device_uri";
let mock_uuid = "device_uuid";
let mock_ip = "mock.ip";
let mock_mac = "MocK:Mac";

Expand All @@ -612,14 +662,20 @@ mod tests {
scopes: None,
discovery_timeout_seconds: 1,
};
let instance = apply_filters(&onvif_config, mock_uri, &mock).await.unwrap();
let instance = apply_filters(&onvif_config, mock_uri, mock_uuid, &mock)
.await
.unwrap();

assert_eq!(expected_device(mock_uri, mock_ip, mock_mac), instance);
assert_eq!(
expected_device(mock_uri, mock_uuid, mock_ip, mock_mac),
instance
);
}

#[tokio::test]
async fn test_apply_filters_exclude_mac_exist_different_letter_cases() {
let mock_uri = "device_uri";
let mock_uuid = "device_uuid";
let mock_ip = "mock.ip";
let mock_mac = "MocK:Mac";

Expand All @@ -642,7 +698,7 @@ mod tests {
scopes: None,
discovery_timeout_seconds: 1,
};
assert!(apply_filters(&onvif_config, mock_uri, &mock)
assert!(apply_filters(&onvif_config, mock_uri, mock_uuid, &mock)
.await
.is_none());
}
Expand Down
Loading

0 comments on commit db62ed8

Please sign in to comment.