Skip to content
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

Jump to bottom

fix(openapi): Add inheritance beetween Event and QosStatusChangedEvent #177

Merged
merged 6 commits into from
Jul 20, 2023
Merged

fix(openapi): Add inheritance beetween Event and QosStatusChangedEvent #177

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
25a7db1
fix(openapi): Add inheritance beetween Event and QosStatusChangedEvent
patrice-conil Jun 30, 2023
679ffbf
fix(openapi): Align allOf syntax with openapi spec samples
patrice-conil Jul 3, 2023
b43a85a
fix(openapi): Add QOS_STATUS_CHANGED as Event sample , and remove typ…
patrice-conil Jul 12, 2023
bbe5812
fix(openapi): Re-introduce EventNotification to be compliant with cur…
patrice-conil Jul 17, 2023
96c6b09
fix(openapi): Rename subscriptionId into eventSubscriptionId
patrice-conil Jul 17, 2023
f729fb6
fix(openapi): Add EventNotification sample in callback
patrice-conil Jul 20, 2023
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
40 changes: 14 additions & 26 deletions code/API_definitions/qod-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ paths:
content:
application/json:
schema:
$ref: "#/components/schemas/EventNotification"
$ref: "#/components/schemas/Event"
responses:
"204":
description: Successful notification
Expand Down Expand Up @@ -699,7 +699,7 @@ components:
allOf:
- $ref: "#/components/schemas/TimeUnitEnum"
- example: Minutes

TimeUnitEnum:
type: string
enum:
Expand Down Expand Up @@ -732,18 +732,19 @@ components:
- Gbps
- Tbps

EventNotification:
Event:
description: The event being notified
type: object
required:
- event
- eventType
- eventTime
properties:
event:
$ref: "#/components/schemas/Event"

Event:
description: The event being notified
anyOf:
- $ref: "#/components/schemas/QosStatusChangedEvent"
eventid:
$ref: "#/components/schemas/EventId"
eventType:
$ref: "#/components/schemas/EventType"
eventTime:
$ref: "#/components/schemas/EventTime"
discriminator:
propertyName: eventType
mapping:
Expand All @@ -767,22 +768,9 @@ components:
example: 2023-05-30T10:18:28Z
description: Date time when the event occurred

EventBase:
type: object
required:
- eventType
- eventTime
properties:
eventid:
$ref: "#/components/schemas/EventId"
eventType:
$ref: "#/components/schemas/EventType"
eventTime:
$ref: "#/components/schemas/EventTime"

QosStatusChangedEvent:
allOf:
- $ref: "#/components/schemas/EventBase"
- $ref: "#/components/schemas/Event"
- type: object
properties:
eventDetail:
Expand All @@ -799,7 +787,7 @@ components:
statusInfo:
$ref: "#/components/schemas/StatusInfo"
required:
- eventDetail
- eventDetail

StatusInfo:
description: |
Expand Down