Merge 4.3.1-dev into Release-4

Giacomo Berninirequested to merge
4.3.1-dev into Release-4

Merge request reports

docker/Dockerfile

+1 −1
Changes for docker/Dockerfile: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ RUN apk add asciidoctor 
RUN apk add openjdk8

RUN apk add ca-certificates wget && update-ca-certificates 

RUN apk add openssl

RUN gem install rdoc --pre || gem install rdoc --pre

RUN gem install rdoc -v 6.3.3 || gem install rdoc -v 6.3.3

RUN gem install asciidoctor-pdf-cjk

RUN wget https://forge.etsi.org/swagger2markup-cli-1.3.2.jar

RUN npm config set proxy $http_proxy

src/SOL009/NFVManoConfigurationAndInformationManagement/components/NFVManoConfigurationAndInformationManagement_def.yaml→src/SOL009/NFVManoConfigurationAndInformationManagement/definitions/NFVManoConfigurationAndInformationManagement_def.yaml

+200 −106

File changed and moved.

Preview size limit exceeded, changes collapsed.

src/SOL009/NFVManoConfigurationAndInformationManagement/NFVManoConfigurationAndInformationManagement.yaml

+215 −215

File changed.

Preview size limit exceeded, changes collapsed.

src/SOL009/NFVManoConfigurationAndInformationManagementNotification/components/NFVManoConfigurationAndInformationManagementNotification_def.yaml→src/SOL009/NFVManoConfigurationAndInformationManagementNotification/definitions/NFVManoConfigurationAndInformationManagementNotification_def.yaml

+21 −21
Changes for src/SOL009/NFVManoConfigurationAndInformationManagementNotification/definitions/NFVManoConfigurationAndInformationManagementNotification_def.yaml: 21 added lines, 21 removed lines.
Original line number Diff line number Diff line 
components:

definitions:

  schemas:

    InformationChangedNotification:

      description: >
@@ -21,7 +21,7 @@ components: 
            Identifier of this notification. If a notification is sent multiple

            times due to multiple subscriptions, the "id" attribute of all these

            notifications shall have the same value.

          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/Identifier"

          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/Identifier"

        notificationType:

          description: >

            Discriminator for the different notification types. Shall be set to
@@ -30,24 +30,24 @@ components: 
        subscriptionId:

          description: >

            Identifier of the subscription that this notification relates to.

          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/Identifier"

          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/Identifier"

        timeStamp:

          description: >

            Date and time of the generation of the notification.

          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/DateTime"

          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/DateTime"

        informationChangedTime:

          description: >

            Timestamp indicating when the information was changed.

          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/DateTime"

          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/DateTime"

        manoEntityId:

          description: >

            Identifier of the MANO entity of which the information was changed.

          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/Identifier"

          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/Identifier"

        changedInfo:

          description: >

            Data about the changed configuration and information of the NFV-MANO

            functional entity.

          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/KeyValuePairs"

          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/KeyValuePairs"

        _links:

          description: >

            Links to resources related to this notification.
@@ -56,11 +56,11 @@ components: 
            self:

              description: >

                Link to the related subscription.

              $ref: "../../components/SOL009_schemas.yaml#/components/schemas/NotificationLink"

              $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/NotificationLink"

            subscription:

              description: >

                Link to the related subscription.

              $ref: "../../components/SOL009_schemas.yaml#/components/schemas/NotificationLink"

              $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/NotificationLink"

          required:

            - self
@@ -84,7 +84,7 @@ components: 
            Identifier of this notification. If a notification is sent multiple times

            due to multiple subscriptions, the "id" attribute of all these notifications

            shall have the same value.

          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/Identifier"

          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/Identifier"

        notificationType:

          description: >

            Discriminator for the different notification types. Shall be set to
@@ -93,39 +93,39 @@ components: 
        subscriptionId:

          description: >

            Identifier of the subscription that this notification relates to.

          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/Identifier"

          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/Identifier"

        timestamp:

          description: >

            Date-time of the generation of the notification.

          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/DateTime"

          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/DateTime"

        changeStateOpOccId:

          description: >

            Identifier of the change state operation occurrence associated to the

            notification.

          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/Identifier"

          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/Identifier"

        stateChangedTime:

          description: >

            Timestamp indicating when the state on the managed object was changed.

          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/DateTime"

          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/DateTime"

        changeStateOperationState:

          description: >

            The state of the "change state operation occurrence".

          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/ChangeStateOpOccStateEnumType"

          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/ChangeStateOpOccStateEnumType"

        managedObjectRef:

          description: >

            Reference of the managed object to which the state change notification relates.

            The value of the "type" attribute shall be "MANO_ENTITY" or "MANO_SERVICE_IF".

          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/ManoManagedObjectReference"

          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/ManoManagedObjectReference"

        operationalState:

          description: >

            New operational state of the managed object. Shall only be present when

            there is a change in the operational state.

          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/OperationalStateEnumType"

          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/OperationalStateEnumType"

        administrativeState:

          description: >

            New administrative state of the managed object. Shall only be present

            when there is a change in the administrative state.

          $ref: "../../components/SOL009_schemas.yaml#/components/schemas/AdministrativeStateEnumType"

          $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/AdministrativeStateEnumType"

        _links:

          description: >

            Links to resources related to this notification.
@@ -134,18 +134,18 @@ components: 
            subscription:

              description: >

                Link to the related subscription.

              $ref: "../../components/SOL009_schemas.yaml#/components/schemas/NotificationLink"

              $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/NotificationLink"

            objectInstance:

              description: >

                Link to the resource representing the object to which the change

                state applies. Shall be present if the object instance is accessible

                as a resource.

              $ref: "../../components/SOL009_schemas.yaml#/components/schemas/NotificationLink"

              $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/NotificationLink"

            changeStateOpOcc:

              description: >

                Link to the change state operation occurrence that this notification

                is related to.

              $ref: "../../components/SOL009_schemas.yaml#/components/schemas/NotificationLink"

              $ref: "../../definitions/SOL009_def.yaml#/definitions/schemas/NotificationLink"

          required:

            - subscription

            - objectInstance

src/SOL009/NFVManoConfigurationAndInformationManagementNotification/NFVManoConfigurationAndInformationManagementNotification.yaml

+24 −24
Changes for src/SOL009/NFVManoConfigurationAndInformationManagementNotification/NFVManoConfigurationAndInformationManagementNotification.yaml: 24 added lines, 24 removed lines.
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ info: 
  version: 2.1.0-impl:etsi.org:ETSI_NFV_OpenAPI:1



externalDocs:

  description: ETSI GS NFV-SOL 009 V3.6.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/03.06.01_60/gs_NFV-SOL009v030601p.pdf

  description: ETSI GS NFV-SOL 009 V4.3.1

  url: https://www.etsi.org/deliver/etsi_gs/NFV-SOL/001_099/009/04.03.01_60/gs_NFV-SOL009v040301p.pdf



servers:

  - url: http://127.0.0.1/callback/v2
@@ -48,25 +48,25 @@ paths: 
        "204": 

          $ref: "#/components/responses/Notification.Post.204"

        "400":

          $ref: ../components/SOL009_resp.yaml#/components/responses/400

          $ref: ../responses/SOL009_resp.yaml#/responses/400

        "401":

          $ref: ../components/SOL009_resp.yaml#/components/responses/401

          $ref: ../responses/SOL009_resp.yaml#/responses/401

        "403":

          $ref: ../components/SOL009_resp.yaml#/components/responses/403

          $ref: ../responses/SOL009_resp.yaml#/responses/403

        "404":

          $ref: ../components/SOL009_resp.yaml#/components/responses/404

          $ref: ../responses/SOL009_resp.yaml#/responses/404

        "405":

          $ref: ../components/SOL009_resp.yaml#/components/responses/405

          $ref: ../responses/SOL009_resp.yaml#/responses/405

        "406":

          $ref: ../components/SOL009_resp.yaml#/components/responses/406

          $ref: ../responses/SOL009_resp.yaml#/responses/406

        "422":

          $ref: ../components/SOL009_resp.yaml#/components/responses/422

          $ref: ../responses/SOL009_resp.yaml#/responses/422

        "500":

          $ref: ../components/SOL009_resp.yaml#/components/responses/500

          $ref: ../responses/SOL009_resp.yaml#/responses/500

        "503":

          $ref: ../components/SOL009_resp.yaml#/components/responses/503

          $ref: ../responses/SOL009_resp.yaml#/responses/503

        "504":

          $ref: ../components/SOL009_resp.yaml#/components/responses/504

          $ref: ../responses/SOL009_resp.yaml#/responses/504



    get:

      description: >
@@ -80,25 +80,25 @@ paths: 
        "204": 

          $ref: "#/components/responses/Notification.Get.204"

        "400":

          $ref: ../components/SOL009_resp.yaml#/components/responses/400

          $ref: ../responses/SOL009_resp.yaml#/responses/400

        "401":

          $ref: ../components/SOL009_resp.yaml#/components/responses/401

          $ref: ../responses/SOL009_resp.yaml#/responses/401

        "403":

          $ref: ../components/SOL009_resp.yaml#/components/responses/403

          $ref: ../responses/SOL009_resp.yaml#/responses/403

        "404":

          $ref: ../components/SOL009_resp.yaml#/components/responses/404

          $ref: ../responses/SOL009_resp.yaml#/responses/404

        "405":

          $ref: ../components/SOL009_resp.yaml#/components/responses/405

          $ref: ../responses/SOL009_resp.yaml#/responses/405

        "406":

          $ref: ../components/SOL009_resp.yaml#/components/responses/406

          $ref: ../responses/SOL009_resp.yaml#/responses/406

        "422":

          $ref: ../components/SOL009_resp.yaml#/components/responses/422

          $ref: ../responses/SOL009_resp.yaml#/responses/422

        "500":

          $ref: ../components/SOL009_resp.yaml#/components/responses/500

          $ref: ../responses/SOL009_resp.yaml#/responses/500

        "503":

          $ref: ../components/SOL009_resp.yaml#/components/responses/503

          $ref: ../responses/SOL009_resp.yaml#/responses/503

        "504":

          $ref: ../components/SOL009_resp.yaml#/components/responses/504

          $ref: ../responses/SOL009_resp.yaml#/responses/504



components:

  responses:
@@ -153,6 +153,6 @@ components: 
        application/json:

          schema: 

            oneOf:

              - $ref: "./components/NFVManoConfigurationAndInformationManagementNotification_def.yaml#/components/schemas/InformationChangedNotification"

              - $ref: "./components/NFVManoConfigurationAndInformationManagementNotification_def.yaml#/components/schemas/ChangeStateNotification"

              - $ref: "./definitions/NFVManoConfigurationAndInformationManagementNotification_def.yaml#/definitions/schemas/InformationChangedNotification"

              - $ref: "./definitions/NFVManoConfigurationAndInformationManagementNotification_def.yaml#/definitions/schemas/ChangeStateNotification"

      required: true
 
 No newline at end of file