Commit 300652ed authored by Elian Kraja's avatar Elian Kraja
Browse files

Merge branch 'stf606-draft' into stf606-final

parents b85dcc26 5e462f3d
Loading
Loading
Loading
Loading
Loading

.jenkins.sh

deleted100755 → 0
+0 −18
Original line number Diff line number Diff line
#!/bin/bash

specfiles=$(ls | egrep "^[^.]*.(json|yaml)")

fres=0
for i in $specfiles ; do
    echo "-- Validating and linting OpenAPI file $i..."
    swagger-cli validate $i
    res=$?
    speccy lint "$i"
    res2=$?
    fres=$(($fres||$res||$res2))
    echo "--- Validator returned $res, linter returned $res2."
done

echo "-- Final validator returns $fres."
exit $fres
+1 −1
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@
          },
          "vimConnectionId": {
            "type": "string",
            "description": null
            "description": ""
          },
          "zoneId": {
            "type": "string",
+2 −2
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ components:
          description: Identifier of the connection to the VIM that manages the resource zone. The applicable "VimConnectionInfo" structure, which is referenced by vimConnectionId, can be obtained from the " vimConnectionInfo" attribute of the "AppInstanceInfo" structure.
        vimConnectionId: 
          type: string
          description: 
          description: ''
        zoneId:
          type: string
          description: The identifier of the resource zone, as managed by the resource management layer (typically, the VIM).
+15 −7
Original line number Diff line number Diff line
@@ -646,6 +646,9 @@
                "responses": {
                  "204": {
                    "description": "No content"
                  },
                  "404": {
                    "description": "Not found"
                  }
                }
              }
@@ -2019,7 +2022,7 @@
          "content": {
            "application/json": {
              "schema": {
                "$ref": "./MEC010p2_v221_definitions.yaml#/definitions/ConfigPlatformForAppRequest"
                "$ref": "./definitions/MEC010p2_definitions.yaml#/definitions/ConfigPlatformForAppRequest"
              }
            }
          }
@@ -2195,7 +2198,8 @@
        ],
        "properties": {
          "href": {
            "type": "uri"
            "type": "string",
            "format": "uri"
          },
          "subscriptionType": {
            "$ref": "#/components/schemas/AppInstanceSubscriptionType"
@@ -2244,7 +2248,8 @@
            "type": "string"
          },
          "callbackUri": {
            "type": "uri"
            "type": "string",
            "format": "uri"
          },
          "appInstanceSubscriptionFilter": {
            "$ref": "#/components/schemas/AppInstanceSubscriptionFilter"
@@ -2263,7 +2268,8 @@
            "description": "Shall be set to \"AppIdentifierDeletionSubscription\"."
          },
          "callbackUri": {
            "type": "uri"
            "type": "string",
            "format": "uri"
          },
          "appInstanceSubscriptionFilter": {
            "$ref": "#/components/schemas/AppInstanceSubscriptionFilter"
@@ -2286,7 +2292,8 @@
            "type": "string"
          },
          "callbackUri": {
            "type": "uri"
            "type": "string",
            "format": "uri"
          },
          "appInstanceSubscriptionFilter": {
            "$ref": "#/components/schemas/AppInstanceSubscriptionFilter"
@@ -2321,7 +2328,8 @@
            "description": "Shall be set to \"AppIdentifierDeletionSubscription\"."
          },
          "callbackUri": {
            "type": "uri"
            "type": "string",
            "format": "uri"
          },
          "appInstanceSubscriptionFilter": {
            "$ref": "#/components/schemas/AppInstanceSubscriptionFilter"
@@ -3368,7 +3376,7 @@
          },
          "seconds": {
            "type": "integer",
            "description": "The seconds part of the Time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.",
            "description": "The seconds part of the Time. Time is defined as Unix-time since January 1, 1970, 00:00:00 UTC.",
            "contentEncoding": "int32"
          }
        }
+13 −6
Original line number Diff line number Diff line
@@ -417,6 +417,8 @@ paths:
              responses:
                '204':
                  description: "No content"
                '404':
                  description: "Not found"
      deprecated: false
    get:
      tags:
@@ -1315,7 +1317,7 @@ paths:
        content:
          application/json:
            schema:
              $ref: './MEC010p2_v221_definitions.yaml#/definitions/ConfigPlatformForAppRequest'
              $ref: './definitions/MEC010p2_definitions.yaml#/definitions/ConfigPlatformForAppRequest'
      responses:
        '202':
          description: The request was accepted for processing, but it is possible that the processing is not yet completed
@@ -1436,7 +1438,8 @@ components:
        - subscriptionType
      properties:
            href:
              type: uri
              type: string
              format: uri
            subscriptionType:
              $ref: '#/components/schemas/AppInstanceSubscriptionType'

@@ -1476,7 +1479,8 @@ components:
        subscriptionType:
          type: string
        callbackUri:
          type: uri
          type: string
          format: uri
        appInstanceSubscriptionFilter:
          $ref: '#/components/schemas/AppInstanceSubscriptionFilter'

@@ -1492,7 +1496,8 @@ components:
          type: string
          description: Shall be set to "AppIdentifierDeletionSubscription".
        callbackUri:
          type: uri
          type: string
          format: uri
        appInstanceSubscriptionFilter:
          $ref: '#/components/schemas/AppInstanceSubscriptionFilter'

@@ -1509,7 +1514,8 @@ components:
        subscriptionType:
          type: string
        callbackUri:
          type: uri
          type: string
          format: uri
        appInstanceSubscriptionFilter:
          $ref: '#/components/schemas/AppInstanceSubscriptionFilter'
        _links:
@@ -1536,7 +1542,8 @@ components:
          type: string
          description: Shall be set to "AppIdentifierDeletionSubscription".
        callbackUri:
          type: uri
          type: string
          format: uri
        appInstanceSubscriptionFilter:
          $ref: '#/components/schemas/AppInstanceSubscriptionFilter'
        _links:
Loading