From 6001fb668b6943b9a6995a9e336e5da1ab5fb28b Mon Sep 17 00:00:00 2001 From: moscatelli Date: Wed, 8 May 2019 11:05:23 +0200 Subject: [PATCH] SOL002: VNF Indicator data types consolidation --- src/SOL002/VNFIndicator/VNFIndicator.yaml | 16 ++-- .../VnfIndicatorNotificationsFilter_def.yaml | 24 ------ .../VnfIndicatorSubscriptionRequest_def.yaml | 27 ------ .../VnfIndicatorSubscription_def.yaml | 37 --------- .../definitions/VnfIndicator_def.yaml | 31 ------- .../VnfInstanceSubscriptionFilter_def.yaml | 83 ------------------- .../responses/VNFIndicator_resp.yaml | 16 ---- .../SOL002SOL003VNFIndicator_def.yaml | 3 +- 8 files changed, 9 insertions(+), 228 deletions(-) delete mode 100644 src/SOL002/VNFIndicator/definitions/VnfIndicatorNotificationsFilter_def.yaml delete mode 100644 src/SOL002/VNFIndicator/definitions/VnfIndicatorSubscriptionRequest_def.yaml delete mode 100644 src/SOL002/VNFIndicator/definitions/VnfIndicatorSubscription_def.yaml delete mode 100644 src/SOL002/VNFIndicator/definitions/VnfIndicator_def.yaml delete mode 100644 src/SOL002/VNFIndicator/definitions/VnfInstanceSubscriptionFilter_def.yaml delete mode 100644 src/SOL002/VNFIndicator/responses/VNFIndicator_resp.yaml diff --git a/src/SOL002/VNFIndicator/VNFIndicator.yaml b/src/SOL002/VNFIndicator/VNFIndicator.yaml index c08314a8..339e250e 100644 --- a/src/SOL002/VNFIndicator/VNFIndicator.yaml +++ b/src/SOL002/VNFIndicator/VNFIndicator.yaml @@ -133,7 +133,7 @@ paths: schema: type: array items: - $ref: 'definitions/VnfIndicator_def.yaml#/definitions/VnfIndicator' + $ref: '../../definitions/SOL002SOl003VNFIndicator_def.yaml#/definitions/VnfIndicator' 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: @@ -267,7 +267,7 @@ paths: schema: type: array items: - $ref: 'definitions/VnfIndicator_def.yaml#/definitions/VnfIndicator' + $ref: '../../definitions/SOL002SOl003VNFIndicator_def.yaml#/definitions/VnfIndicator' 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: @@ -355,7 +355,7 @@ paths: maximum: 1 minimum: 1 schema: - $ref: 'definitions/VnfIndicator_def.yaml#/definitions/VnfIndicator' + $ref: '../../definitions/SOL002SOl003VNFIndicator_def.yaml#/definitions/VnfIndicator' 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: @@ -425,7 +425,7 @@ paths: maximum: 1 minimum: 1 schema: - $ref: 'definitions/VnfIndicator_def.yaml#/definitions/VnfIndicator' + $ref: '../../definitions/SOL002SOl003VNFIndicator_def.yaml#/definitions/VnfIndicator' 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: @@ -478,7 +478,7 @@ paths: description: Details of the subscription to be created. required: true schema: - $ref: 'definitions/VnfIndicatorSubscriptionRequest_def.yaml#/definitions/VnfIndicatorSubscriptionRequest' + $ref: '../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscriptionRequest' responses: 201: description: > @@ -487,7 +487,7 @@ paths: The subscription was created successfully. The response body shall contain a representation of the created subscription resource. schema: - $ref: 'definitions/VnfIndicatorSubscription_def.yaml#/definitions/VnfIndicatorSubscription' + $ref: '../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription' headers: Location: description: > @@ -620,7 +620,7 @@ paths: schema: type: array items: - $ref: 'definitions/VnfIndicatorSubscription_def.yaml#/definitions/VnfIndicatorSubscription' + $ref: '../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription' 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: @@ -701,7 +701,7 @@ paths: maximum: 1 minimum: 1 schema: - $ref: 'definitions/VnfIndicatorSubscription_def.yaml#/definitions/VnfIndicatorSubscription' + $ref: '../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription' 400: $ref: "../../responses/SOL002SOL003_resp.yaml#/responses/400" 401: diff --git a/src/SOL002/VNFIndicator/definitions/VnfIndicatorNotificationsFilter_def.yaml b/src/SOL002/VNFIndicator/definitions/VnfIndicatorNotificationsFilter_def.yaml deleted file mode 100644 index af90510c..00000000 --- a/src/SOL002/VNFIndicator/definitions/VnfIndicatorNotificationsFilter_def.yaml +++ /dev/null @@ -1,24 +0,0 @@ -definitions: - - VnfIndicatorNotificationsFilter: - description: > - This type represents a subscription filter related to notifications about VNF indicator value changes. - At a particular nesting level in the filter structure, the following applies: - All attributes shall match in order for the filter to match (logical "and" between different filter attributes). - If an attribute is an array, the attribute shall match if at least one of the values in the array matches - (logical "or" between the values of one filter attribute). - type: object - properties: - vnfInstanceSubscriptionFilter: - description: > - Filter criteria to select VNF instances about which to notify. This attribute shall not be included - when the VNFM sends a subscription request to a particular VNF instance. - $ref: 'VnfInstanceSubscriptionFilter_def.yaml#/definitions/VnfInstanceSubscriptionFilter' - indicatorIds: - description: > - Match particular VNF indicator identifiers. - type: array - items: - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd' - - diff --git a/src/SOL002/VNFIndicator/definitions/VnfIndicatorSubscriptionRequest_def.yaml b/src/SOL002/VNFIndicator/definitions/VnfIndicatorSubscriptionRequest_def.yaml deleted file mode 100644 index 09e8c6d6..00000000 --- a/src/SOL002/VNFIndicator/definitions/VnfIndicatorSubscriptionRequest_def.yaml +++ /dev/null @@ -1,27 +0,0 @@ -definitions: - - VnfIndicatorSubscriptionRequest: - description: > - This type represents a subscription request related to VNF indicator value change notifications. - type: object - required: - - callbackUri - properties: - filter: - description: > - Filter settings for this subscription, to define the subset of all notifications this - subscription relates to. A particular notification is sent to the subscriber if the filter - matches, or if there is no filter. - $ref: 'VnfIndicatorNotificationsFilter_def.yaml#/definitions/VnfIndicatorNotificationsFilter' - callbackUri: - description: > - The URI of the endpoint to send the notification to. - type: string - format: URI - authentication: - description: > - Authentication parameters to configure the use of Authorization when sending notifications corresponding - to this subscription. This attribute shall only be present if the subscriber requires authorization of - notifications. - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/SubscriptionAuthentication" - \ No newline at end of file diff --git a/src/SOL002/VNFIndicator/definitions/VnfIndicatorSubscription_def.yaml b/src/SOL002/VNFIndicator/definitions/VnfIndicatorSubscription_def.yaml deleted file mode 100644 index 406680a1..00000000 --- a/src/SOL002/VNFIndicator/definitions/VnfIndicatorSubscription_def.yaml +++ /dev/null @@ -1,37 +0,0 @@ -definitions: - - VnfIndicatorSubscription: - description: > - This type represents a subscription related to notifications about VNF indicator value changes. - type: object - required: - - callbackUri - - id - - _links - properties: - id: - description: > - Identifier of this subscription resource. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier' - filter: - description: > - Filter settings for this subscription, to define the subset of all notifications this subscription - relates to. A particular notification is sent to the subscriber if the filter matches, or if there - is no filter. - $ref: 'VnfIndicatorNotificationsFilter_def.yaml#/definitions/VnfIndicatorNotificationsFilter' - callbackUri: - description: > - The URI of the endpoint to send the notification to. - type: string - format: URI - _links: - description: > - Links to resources related to this resource. - type: object - required: - - self - properties: - self: - description: > - URI of this resource. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/Link' diff --git a/src/SOL002/VNFIndicator/definitions/VnfIndicator_def.yaml b/src/SOL002/VNFIndicator/definitions/VnfIndicator_def.yaml deleted file mode 100644 index 70523565..00000000 --- a/src/SOL002/VNFIndicator/definitions/VnfIndicator_def.yaml +++ /dev/null @@ -1,31 +0,0 @@ -definitions: - - VnfIndicator: - type: object - required: - - id - - value - - vnfInstanceId - - _links - properties: - id: - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd' - name: - type: string - value: - type: object - vnfInstanceId: - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier' - _links: - description: > - Links to resources related to this resource. - type: object - required: - - self - properties: - self: - description: URI of this resource. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/Link' - vnfInstance: - description: Link to the VNF instance that the operation applies to. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/Link' diff --git a/src/SOL002/VNFIndicator/definitions/VnfInstanceSubscriptionFilter_def.yaml b/src/SOL002/VNFIndicator/definitions/VnfInstanceSubscriptionFilter_def.yaml deleted file mode 100644 index ea226bf6..00000000 --- a/src/SOL002/VNFIndicator/definitions/VnfInstanceSubscriptionFilter_def.yaml +++ /dev/null @@ -1,83 +0,0 @@ -definitions: - - VnfInstanceSubscriptionFilter: - description: > - This type represents subscription filter criteria to match VNF instances. - * NOTE 1: - The attributes "vnfdIds" and "vnfProductsFromProviders" are alternatives to reference to - VNF instances that are based on certain VNFDs in a filter. They should not be used both - in the same filter instance, but one alternative should be chosen. - * NOTE 2: - The attributes "vnfInstanceIds" and "vnfInstanceNames" are alternatives to reference to - particular VNF instances in a filter. They should not be used both in the same filter instance, - but one alternative should be chosen. - type: object - properties: - vnfdIds: - description: > - If present, match VNF instances that were created based on a VNFD identified by one of the - vnfdId values listed in this attribute. See NOTE 1. - type: array - items: - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier' - vnfProductsFromProviders: - description: > - If present, match VNF instances that belong to VNF products from certain providers. See NOTE 1. - type: array - items: - type: object - required: - - vnfProvider - properties: - vnfProvider: - description: > - Name of the VNF provider to match. - type: string - vnfProducts: - description: > - If present, match VNF instances that belong to VNF products with certain product names, - from one particular provider. - type: array - items: - type: object - required: - - vnfProductName - properties: - vnfProductName: - description: > - Name of the VNF product to match. - type: string - versions: - description: > - If present, match VNF instances that belong to VNF products with certain versions - and a certain product name, from one particular provider. - type: array - items: - type: object - required: - - vnfSoftwareVersions - properties: - vnfSoftwareVersions: - description: > - Software version to match. - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/Version' - vnfdVersions: - description: > - If present, match VNF instances that belong to VNF products with certain VNFD versions, - a certain software version and a certain product name, from one particular provider. - type: array - items: - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/Version' - vnfInstanceIds: - description: > - If present, match VNF instances with an instance identifier listed in this attribute. See NOTE 2. - type: array - items: - $ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier' - vnfInstanceNames: - description: > - If present, match VNF instances with a VNF Instance Name listed in this attribute. See NOTE 2 - type: array - items: - type: string - diff --git a/src/SOL002/VNFIndicator/responses/VNFIndicator_resp.yaml b/src/SOL002/VNFIndicator/responses/VNFIndicator_resp.yaml deleted file mode 100644 index 89938b31..00000000 --- a/src/SOL002/VNFIndicator/responses/VNFIndicator_resp.yaml +++ /dev/null @@ -1,16 +0,0 @@ -responses: - 409: - description: > - Conflict - - Another request is in progress that prohibits the fulfilment of - the current request, or the current resource state is inconsistent - with the request. - headers: - Content-Type: - description: The MIME type of the body of the response. - type: string - maximum: 1 - minimum: 1 - schema: - $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails" diff --git a/src/definitions/SOL002SOL003VNFIndicator_def.yaml b/src/definitions/SOL002SOL003VNFIndicator_def.yaml index e7e64956..7cf746de 100644 --- a/src/definitions/SOL002SOL003VNFIndicator_def.yaml +++ b/src/definitions/SOL002SOL003VNFIndicator_def.yaml @@ -127,8 +127,7 @@ definitions: callbackUri: description: > The URI of the endpoint to send the notification to. - type: string - format: url + $ref: "SOL002SOl003_def.yaml#/definitions/Uri" authentication: description: > Authentication parameters to configure the use of Authorization -- GitLab