Merge pull request #297806 from dominicbetts/release-2504-aio-media

AIO 2504: Media and ONVIF connector updates

Author: prmerger-automator[bot]

articles/iot-operations/discover-manage-assets/howto-use-media-connector.md

@@ -38,10 +38,13 @@ A camera connected to your network and accessible from your Azure IoT Operations
 
 ## Deploy the media server
 
-If you're using the media connector to stream live video, you need to install your own media server. To deploy a sample media server to use with the media connector, run the following command:
+If you're using the media connector to stream live video, you need to install your own media server. To deploy a sample media server to use with the media connector, run the following commands:
 
 ```console
-kubectl create namespace media-server --dry-run=client -o yaml | kubectl apply -f - & kubectl apply -f https://raw.githubusercontent.com/Azure-Samples/explore-iot-operations/refs/heads/main/samples/media-connector-invoke-test/media-server/media-server-deployment.yaml --validate=false & kubectl apply -f https://raw.githubusercontent.com/Azure-Samples/explore-iot-operations/refs/heads/main/samples/media-connector-invoke-test/media-server/media-server-service.yaml --validate=false & kubectl apply -f https://raw.githubusercontent.com/Azure-Samples/explore-iot-operations/refs/heads/main/samples/media-connector-invoke-test/media-server/media-server-service-public.yaml --validate=false
+kubectl create namespace media-server
+kubectl apply -f https://raw.githubusercontent.com/Azure-Samples/explore-iot-operations/refs/heads/main/samples/media-server/media-server-deployment.yaml 
+kubectl apply -f https://raw.githubusercontent.com/Azure-Samples/explore-iot-operations/refs/heads/main/samples/media-server/media-server-service.yaml
+kubectl apply -f https://raw.githubusercontent.com/Azure-Samples/explore-iot-operations/refs/heads/main/samples/media-server/media-server-service-public.yaml
 ```
 
 > [!IMPORTANT]
@@ -273,7 +276,7 @@ To verify that snapshots are publishing to the MQTT broker, use the **mosquitto_
 When you finish testing the asset, you can delete it by running the following command:
 
 ```console
-az iot ops asset delete -n asset-clip-to-mqtt -g $RESOURCE_GROUP
+az iot ops asset delete -n asset-snapshot-to-mqtt -g $RESOURCE_GROUP
 ```
 
 ## Snapshot to file system
@@ -341,7 +344,7 @@ kubectl get pods -n azure-iot-operations
 To view the files, run the `ls` command in the pod. Use the full name of the pod in the following command:
 
 ```console
-kubectl exec aio-opc-media-1-... -n azure-iot-operations -- ls /tmp/azure-iot-operations/data/asset-snapshot-to-fs/snapshot/
+kubectl exec aio-opc-media-1-... -n azure-iot-operations -- ls /tmp/azure-iot-operations/data/asset-snapshot-to-fs/snapshots/
 ```
 
 When you finish testing the asset, you can delete it by running the following command:
@@ -415,7 +418,7 @@ kubectl get pods -n azure-iot-operations
 To view the files, run the `ls` command in the pod. Use the full name of the pod in the following command:
 
 ```console
-kubectl exec aio-opc-media-1-... -n azure-iot-operations -- ls /tmp/azure-iot-operations/data/asset-clip-to-fs/clip/
+kubectl exec aio-opc-media-1-... -n azure-iot-operations -- ls /tmp/azure-iot-operations/data/asset-clip-to-fs/clips/
 ```
 
 When you finish testing the asset, you can delete it by running the following command:

articles/iot-operations/discover-manage-assets/howto-use-onvif-connector.md

@@ -147,7 +147,7 @@ Currently, during public preview, you must manually create the **Asset** and **A
 
 ### Access the PTZ capabilities of the camera
 
-To manually create an asset that represents the PTZ capabilities of the camera discovered previously:
+Use the PTZ capabilities of an ONVIF compliant camera to control its position and orientation.To manually create an asset that represents the PTZ capabilities of the camera discovered previously:
 
 # [Bash](#tab/bash)
 
@@ -201,13 +201,72 @@ The following snippet shows the bicep file that you used to create the asset. Th
 
 :::code language="bicep" source="~/azure-iot-operations-samples/samples/onvif-connector-bicep/asset-ptz.bicep":::
 
+### Access the media capabilities of the camera
+
+To use the PTZ capabilities of an ONVIF-complian camera, you need a profile token from the camera's media service. To manually create an asset that represents the media capabilities of the camera discovered previously:
+
+# [Bash](#tab/bash)
+
+1. Set the following environment variables:
+
+    ```bash
+    SUBSCRIPTION_ID="<YOUR SUBSCRIPTION ID>"
+    RESOURCE_GROUP="<YOUR AZURE IOT OPERATIONS RESOURCE GROUP>"
+    AEP_NAME="contoso-onvif-aep"
+    ```
+
+1. Run the following script:
+
+    ```bash
+    # Download the Bicep file
+    wget https://raw.githubusercontent.com/Azure-Samples/explore-iot-operations/main/samples/onvif-connector-bicep/asset-onvif-media.bicep -O asset-onvif-media.bicep
+    
+    # Find the name of your custom location
+    CUSTOM_LOCATION_NAME=$(az iot ops list -g $RESOURCE_GROUP --query "[0].extendedLocation.name" -o tsv)
+    
+    # Use the Bicep file to deploy the asset
+    az deployment group create --subscription $SUBSCRIPTION_ID --resource-group $RESOURCE_GROUP --template-file asset-onvif-media.bicep --parameters customLocationName=$CUSTOM_LOCATION_NAME aepName=$AEP_NAME
+    ```
+
+# [PowerShell](#tab/powershell)
+
+1. Set the following environment variables:
+
+    ```powershell
+    $SUBSCRIPTION_ID="<YOUR SUBSCRIPTION ID>"
+    $RESOURCE_GROUP="<YOUR AZURE IOT OPERATIONS RESOURCE GROUP>"
+    $AEP_NAME="contoso-onvif-aep"
+    ```
+
+1. Run the following script:
+
+    ```powershell
+    # Download the Bicep file
+    Invoke-WebRequest -Uri https://raw.githubusercontent.com/Azure-Samples/explore-iot-operations/main/samples/onvif-connector-bicep/asset-onvif-media.bicep -OutFile asset-onvif-media.bicep
+
+    # Find the name of your custom location
+    $CUSTOM_LOCATION_NAME = (az iot ops list -g $RESOURCE_GROUP --query "[0].extendedLocation.name" -o tsv)
+
+    # Use the Bicep file to deploy the asset
+    az deployment group create --subscription $SUBSCRIPTION_ID --resource-group $RESOURCE_GROUP --template-file asset-onvif-media.bicep --parameters customLocationName=$CUSTOM_LOCATION_NAME aepName=$AEP_NAME
+    ```
+
+---
+
+The following snippet shows the bicep file that you used to create the asset. The `-media` suffix to the asset name is a required convention to indicate that the asset represents the media capabilities of the camera:
+
+:::code language="bicep" source="~/azure-iot-operations-samples/samples/onvif-connector-bicep/asset-onvif-media.bicep":::
+
 ## Manage and control the camera
 
 To interact with the ONVIF camera, you can publish MQTT messages that the connector for ONVIF subscribes to. The message format is based on the [ONVIF network interface specifications](https://www.onvif.org/profiles/specifications/).
 
-The [Azure IoT Operations connector for ONVIF PTZ Demo](https://github.com/Azure-Samples/explore-iot-operations/tree/main/samples/aio-onvif-connector-ptz-demo) sample application shows how to use the connector for ONVIF to interact with the PTZ capabilities of an ONVIF camera.
+The [Azure IoT Operations connector for ONVIF PTZ Demo](https://github.com/Azure-Samples/explore-iot-operations/tree/main/samples/aio-onvif-connector-ptz-demo) sample application shows how to use the connector for ONVIF to:
+
+- Use the media asset definition to retrieve a profile token from the camera's media service.
+- Use the profile token when you use the camera's PTZ capabilities control its position and orientation.
 
-The sample application uses the Azure IoT Operations MQTT broker to send commands to the connector for ONVIF. To learn more, see [Publish and subscribe MQTT messages using MQTT broker](../manage-mqtt-broker/overview-broker.md).
+The sample application uses the Azure IoT Operations MQTT broker to send commands to interact with the connector for ONVIF. To learn more, see [Publish and subscribe MQTT messages using MQTT broker](../manage-mqtt-broker/overview-broker.md).
 
 ### Access the camera's video streams