Skip to content

QoS B&A - fix warnings reported against snapshot r2.2 #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Masa8106 merged 5 commits into from
Oct 20, 2026
Merged

QoS B&A - fix warnings reported against snapshot r2.2 #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16e8268
Fix QoS B&A Validation Warnings for Snapshot r2.2
gmuratk Oct 16, 2026
bc9e280
Update scenario for deleted QoS booking verification
gmuratk Oct 16, 2026
7d52181
Update createBooking feature for getBookingById scenario
gmuratk Oct 16, 2026
557df06
Refactor scenario for assigned devices retrieval
gmuratk Oct 16, 2026
a54a520
Refactor scenario for released devices in feature file
gmuratk Oct 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 4 additions & 22 deletions code/API_definitions/qos-booking-and-assignment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,8 @@ info:
# Identifying the device from the access token

This API requires the API consumer to identify a device as the subject of the API as follows:
- When the API is invoked using a two-legged access token, the subject will be identified from the optional `device` or `devices` object, which therefore MUST be provided.

- When a three-legged access token is used however, this optional identifier MUST NOT be provided, as the subject will be uniquely identified from the access token. In this case, only one device can be provided at a time.
- When the API is invoked using a two-legged access token, the subject will be identified from the optional `device` object, which therefore MUST be provided.
- When a three-legged access token is used however, this optional identifier MUST NOT be provided, as the subject will be uniquely identified from the access token.

This approach simplifies API usage for API consumers using a three-legged access token to invoke the API by relying on the information that is associated with the access token and was identified during the authentication process.

Expand Down Expand Up @@ -1116,6 +1115,7 @@ components:
* `BOOKING_UNKNOWN_ERROR` - An unknown error occurred.
* `BOOKING_ACCEPTED` - Deprecated. Use `BOOKING_SCHEDULED` instead.
type: string
pattern: ^[A-Z][A-Z0-9_]*$
maxLength: 256
example: "BOOKING_SCHEDULED"

Expand All @@ -1137,6 +1137,7 @@ components:
* `BOOKING_EXPIRED` - The booking referenced has expired and is no longer active.
* `BOOKING_TERMINATED` - The booking was terminated by the operator.
type: string
pattern: ^[A-Z][A-Z0-9_]*$
maxLength: 256
example: "ASSIGNMENT_COMPLETED"

Expand Down Expand Up @@ -1578,25 +1579,6 @@ components:
bookingStatus: "ACTIVATED"
statusInfo: "BOOKING_ACTIVATED"

BOOKING_CANCELLED:
summary: Booking Cancelled (notification payload)
description: Example `booking-status-changed` CloudEvent payload when a booking is successfully cancelled.
value:
bookingId: "8e2f6f30-0a1c-4c6b-92e1-1bd05aef1c58"
bookingDeviceCount: 15
remainingDevices: 15
qosProfile: "QOS_MEDIA_BROADCAST"
startTime: "2025-10-27T15:00:00.000Z"
duration: 3600
serviceArea:
areaType: "CIRCLE"
center:
latitude: 37.735851
longitude: -127.10066
radius: 100
bookingStatus: "TERMINATED"
statusInfo: "BOOKING_CANCELLED"

CANCELLATION_PENDING:
summary: Cancellation is Requested
description: Delete a booking using a valid `bookingId`. Delete operation is pending as operator may need more time to process the request.
Expand Down
11 changes: 5 additions & 6 deletions code/Test_definitions/qos-booking-and-assignment-assignDevices.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,13 @@
And the response property "$.devices" may not contain the assigned device information

@qos_booking_and_assignment_assignDevices_03_assigned_devices_listed
Scenario: Assigned devices are returned by getDevicesByBookingId
Scenario: Assigned devices are returned by getDevicesByBookingId

Check warning on line 66 in code/Test_definitions/qos-booking-and-assignment-assignDevices.feature

View workflow job for this annotation

GitHub Actions / validation / Validate

Inconsistent Gherkin indentation 

[G-002] Wrong indentation for "Scenario", expected indentation level of 2, but got 4
Given the header "Authorization" is set to a valid 2-legged access token
And the request body property "$.devices" is set to a valid array of device identifiers compliant with the schema at "#/components/schemas/Devices"
When the request "assignDevices" is sent
Then the response status code is 201
When the request "getDevicesByBookingId" is sent with the same path parameter "bookingId"
And devices have been assigned to the QoS booking with operation "assignDevices" using a valid array of device identifiers compliant with the schema at "#/components/schemas/Devices"
And the path parameter "bookingId" is set to the identifier of that QoS booking
When the request "getDevicesByBookingId" is sent
Then the response status code is 200
And the response property "$.devices" contains the device identifiers returned by the assignment response
And the response property "$.devices" contains the device identifiers returned by the assignDevices response

# CONDITIONAL: only applicable if the API provider supports partial assignment
@qos_booking_and_assignment_assignDevices_04_partial_success
Expand Down
18 changes: 8 additions & 10 deletions code/Test_definitions/qos-booking-and-assignment-createBooking.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,15 @@ Feature: CAMARA QoS Booking and Assignment API, vwip - Operation createBooking

@qos_booking_and_assignment_createBooking_08_booking_readable_after_creation
Scenario: The created booking can be read with getBookingById
Given the request body is compliant with the schema at "#/components/schemas/BookingInput"
When the request "createBooking" is sent
Then the response status code is 201
And the response property "$.bookingId" exists and is a valid UUID
When the request "getBookingById" is sent with the path parameter "bookingId" set to the value of "$.bookingId" of the creation response
Given a QoS booking has been created successfully with operation "createBooking"
And the path parameter "bookingId" is set to the value of "$.bookingId" of the createBooking response
When the request "getBookingById" is sent
Then the response status code is 200
And the response property "$.bookingId" has the same value as in the creation response
And the response property "$.qosProfile" has the same value as in the creation request body
And the response property "$.startTime" has the same value as in the creation request body
And the response property "$.duration" has the same value as in the creation request body
And the response property "$.serviceArea" has the same value as in the creation request body
And the response property "$.bookingId" has the same value as in the createBooking response
And the response property "$.qosProfile" has the same value as in the createBooking request body
And the response property "$.startTime" has the same value as in the createBooking request body
And the response property "$.duration" has the same value as in the createBooking request body
And the response property "$.serviceArea" has the same value as in the createBooking request body

@qos_booking_and_assignment_createBooking_09_event_notification
Scenario: Event is received when a booking status changes after using sink
Expand Down
5 changes: 2 additions & 3 deletions code/Test_definitions/qos-booking-and-assignment-deleteBooking.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,9 @@ Feature: CAMARA QoS Booking and Assignment API, vwip - Operation deleteBooking
@qos_booking_and_assignment_deleteBooking_03_booking_not_readable_after_deletion
Scenario: A deleted QoS booking can no longer be read
Given an existing QoS booking created by operation "createBooking" with no devices assigned
And the QoS booking has been deleted with operation "deleteBooking" and the deletion has completed
And the path parameter "bookingId" is set to the value of the identifier for that QoS booking
When the request "deleteBooking" is sent
Then the response status code is 204
When the request "getBookingById" is sent with the same path parameter "bookingId"
When the request "getBookingById" is sent
Then the response status code is 404
And the response property "$.status" is 404
And the response property "$.code" is "NOT_FOUND"
Expand Down
7 changes: 3 additions & 4 deletions code/Test_definitions/qos-booking-and-assignment-releaseDevices.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,9 @@ Feature: CAMARA QoS Booking and Assignment API, vwip - Operation releaseDevices
@qos_booking_and_assignment_releaseDevices_03_released_devices_not_listed
Scenario: Released devices are no longer returned by getDevicesByBookingId
Given the header "Authorization" is set to a valid 2-legged access token
And the request body property "$.devices" is set to a valid array of device identifiers that are assigned to the QoS booking
When the request "releaseDevices" is sent
Then the response status code is 200
When the request "getDevicesByBookingId" is sent with the same path parameter "bookingId"
And devices assigned to the QoS booking have been released with operation "releaseDevices"
And the path parameter "bookingId" is set to the identifier of that QoS booking
When the request "getDevicesByBookingId" is sent
Then the response status code is 200
And the response property "$.devices" does not contain any of the released device identifiers

Expand Down
Loading