Commit c01c9e22 authored by Laurent Velez's avatar Laurent Velez
Browse files

Merge branch 'stf606-final' into 'master' 

Update editor and validation tools

See merge request !11
parents 8f515265 85bef031

.jenkins.sh

deleted100644 → 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

README.md

+2 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ This repository contains OpenAPIs descriptions for the interfaces specified in E 


## Online resources



* [Navigate the API in the browser](https://forge.etsi.org/swagger/ui/?url=https://forge.etsi.org/rep/mec/gs028-wai-api/raw/stf606-final/WlanInformationApi.yaml).

* [Edit the API online](https://forge.etsi.org/swagger/editor/?url=https://forge.etsi.org/rep/mec/gs028-wai-api/raw/stf606-final/WlanInformationApi.yaml).

* [Navigate the API in the browser](https://forge.etsi.org/swagger/ui/?url=https://forge.etsi.org/rep/mec/gs028-wai-api/raw/v2.3.1/WlanInformationApi.yaml).

* [Edit the API online](https://redocly.github.io/redoc/?url=https://forge.etsi.org/rep/mec/gs028-wai-api/raw/v2.3.1/WlanInformationApi.yaml).



## License

WlanInformationApi.json

+12 −8
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ 
  ],

  "tags": [

    {

      "name": "wai"

      "name": "wai",

      "description": "WLAN Access Information"

    }

  ],

  "paths": {
@@ -754,6 +755,9 @@ 
                "responses": {

                  "204": {

                    "description": "No content"

                  },

                  "400": {

                    "description": "Bad Request"

                  }

                }

              }
@@ -2077,7 +2081,7 @@ 
        "properties": {

          "antennaId": {

            "type": "integer",

            "description": "The Antenna ID field contains the identifying number for the antenna(s) used for this measurement. Antenna ID is defined in clause 9.4.2.40 of IEEE 802.11-2016.",

            "description": "The Antenna ID field contains the identifying number for the antenna(s) used for this measurement. Antenna ID is defined in clause 9.4.2.40 of IEEE 802.11-2016.",

            "contentEncoding": "int32"

          },

          "bssid": {
@@ -3825,9 +3829,9 @@ 
        "discriminator": {

          "propertyName": "notificationType",

          "mapping": {

            "AssocStaNotification": "AssocStaNotification",

            "MeasurementReportNotification": "MeasurementReportNotification",

            "StaDataRateNotification": "StaDataRateNotification"

            "AssocStaNotification": "#/components/schemas/AssocStaNotification",

            "MeasurementReportNotification": "#/components/schemas/MeasurementReportNotification",

            "StaDataRateNotification": "#/components/schemas/StaDataRateNotification"

          }

        }

      },
@@ -3845,9 +3849,9 @@ 
        "discriminator": {

          "propertyName": "subscriptionType",

          "mapping": {

            "AssocStaSubscription": "AssocStaSubscription",

            "MeasurementReportSubscription": "MeasurementReportSubscription",

            "StaDataRateSubscription": "StaDataRateSubscription"

            "AssocStaNotification": "#/components/schemas/AssocStaNotification",

            "MeasurementReportNotification": "#/components/schemas/MeasurementReportNotification",

            "StaDataRateNotification": "#/components/schemas/StaDataRateNotification"

          }

        }

      },

WlanInformationApi.yaml

+9 −6
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ servers: 


tags:

- name: wai

  description: WLAN Access Information



paths:

  /queries/ap/ap_information:
@@ -494,6 +495,8 @@ paths: 
              responses:

                '204':

                 description: "No content"

                '400':

                 description: "Bad Request"





    parameters: []
@@ -2747,9 +2750,9 @@ components: 
      discriminator:

        propertyName: notificationType

        mapping:

          AssocStaNotification: AssocStaNotification

          MeasurementReportNotification: MeasurementReportNotification

          StaDataRateNotification: StaDataRateNotification

          AssocStaNotification: '#/components/schemas/AssocStaNotification'

          MeasurementReportNotification: '#/components/schemas/MeasurementReportNotification'

          StaDataRateNotification: '#/components/schemas/StaDataRateNotification'

    InlineSubscription:

      title: InlineSubscription

      required:
@@ -2761,9 +2764,9 @@ components: 
      discriminator:

        propertyName: subscriptionType

        mapping:

          AssocStaSubscription: AssocStaSubscription

          MeasurementReportSubscription: MeasurementReportSubscription

          StaDataRateSubscription: StaDataRateSubscription

          AssocStaNotification: '#/components/schemas/AssocStaNotification'

          MeasurementReportNotification: '#/components/schemas/MeasurementReportNotification'

          StaDataRateNotification: '#/components/schemas/StaDataRateNotification'

    Links:

      title: Links

      required: