Skip to content

fix: StreamURI values not parsed in external rtsp mode#295

Merged
presatish merged 1 commit intoedgexfoundry:mainfrom
EdgeX-Camera-Management:fix-external-mode
Sep 27, 2023
Merged

fix: StreamURI values not parsed in external rtsp mode#295
presatish merged 1 commit intoedgexfoundry:mainfrom
EdgeX-Camera-Management:fix-external-mode

Conversation

@ajcasagrande
Copy link
Copy Markdown
Contributor

@ajcasagrande ajcasagrande commented Sep 21, 2023

If your build fails due to your commit message not passing the build checks, please review the guidelines here: https://github.com/edgexfoundry/edgex-go/blob/main/.github/Contributing.md

PR Checklist

Please check if your PR fulfills the following requirements:

  • I am not introducing a breaking change (if you are, flag in conventional commit message with BREAKING CHANGE: describing the break)
  • I am not introducing a new dependency (add notes below if you are)
  • I have added unit tests for the new feature or bug fix (if not, why?)
  • I have fully tested (add details below) this the new feature or bug fix (if not, why?)
  • [N/A] I have opened a PR for the related docs change (if not, why?)

Testing Instructions

Get code from this pr branch & latest edgex compose main branch

Go to device usb service cmd/res folder, and update configuation.yaml file with below settings
RtspServerMode set to "external"
RtspServerHostName set to remote ip address of system where rtsp server running

Build usb docker image locally with updated configuration file

Go to edgex compose/compose builder, and update add-device-usb-camera.yaml file to use local usb image

from compose builder, run 'make run no-secty ds-usb-camera' - this wills start edgex services and device usb services, also discovers and adds usb cameras to edgex

Execute some generic api like camera info, ensure camera is accessible and it works correctly

Execute ger stream uri, API
Expected behavior: Should give rtsp stream uri with remote ip

New Dependency Instructions (If applicable)

Closes #288

Signed-off-by: Anthony Casagrande <anthony.j.casagrande@intel.com>
@codecov-commenter
Copy link
Copy Markdown

Codecov Report

Merging #295 (f635203) into main (b907ae2) will not change coverage.
The diff coverage is 0.00%.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

@@          Coverage Diff          @@
##            main    #295   +/-   ##
=====================================
  Coverage   4.75%   4.75%           
=====================================
  Files          8       8           
  Lines       1305    1305           
=====================================
  Hits          62      62           
  Misses      1243    1243           
Files Changed Coverage Δ
internal/driver/driver.go 3.21% <0.00%> (ø)

@vyshali-chitikeshi
Copy link
Copy Markdown
Contributor

Validation looks good. Get stream URI gives ip address of RTSP server address as expected. Find attached screenshot.
Screenshot from 2023-09-26 18-30-26

Copy link
Copy Markdown
Contributor

@presatish presatish left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@presatish presatish merged commit e7b533f into edgexfoundry:main Sep 27, 2023
@presatish presatish deleted the fix-external-mode branch September 27, 2023 02:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Get stream URI not picking up rtsp server address from config file with rtsp server mode set to 'external'

4 participants