Commit 71b9b866 authored by Simon Pastor's avatar Simon Pastor
Browse files

merge

parent d4f35c14
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1571,7 +1571,7 @@ components:
    Query.InterestRealm:
      name: interestRealm
      in: query
      description: 'Interest realm of access point (e.g. geographical area, a type of industry etc.).'
      description: 'Interest realm of access point (e.g. geographical area, a type of industry etc.). [not implemented]'
      required: false
      schema:
        type: string
+41 −41
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ components:
    Query.UeIpv6Address:
      name: ue_ipv6_address
      in: query
      description: 'Comma separated list of IE IPv6 addresses as defined for the type for AssociateId'
      description: 'Comma separated list of IE IPv6 addresses as defined for the type for AssociateId. [not implemented]'
      required: false
      schema:
        type: array
@@ -569,7 +569,7 @@ components:
    Query.NatedIpAddress:
      name: nated_ip_address
      in: query
      description: 'Comma separated list of IE NATed IP addresses as defined for the type for AssociateId'
      description: 'Comma separated list of IE NATed IP addresses as defined for the type for AssociateId. [not implemented]'
      required: false
      schema:
        type: array
@@ -579,7 +579,7 @@ components:
    Query.GtpTeid:
      name: gtp_teid
      in: query
      description: 'Comma separated list of GTP TEID addresses as defined for the type for AssociateId'
      description: 'Comma separated list of GTP TEID addresses as defined for the type for AssociateId. [not implemented]'
      required: false
      schema:
        type: array
@@ -620,7 +620,7 @@ components:
    Query.ErabMbrDl:
      name: erab_mbr_dl
      in: query
      description: 'Maximum downlink E-RAB Bit Rate as defined in ETSI TS 123 401'
      description: 'Maximum downlink E-RAB Bit Rate as defined in ETSI TS 123 401. [not implemented]'
      required: false
      schema:
        type: integer
@@ -630,7 +630,7 @@ components:
    Query.ErabMbrUl:
      name: erab_mbr_ul
      in: query
      description: 'Maximum uplink E-RAB Bit Rate as defined in ETSI TS 123 401'
      description: 'Maximum uplink E-RAB Bit Rate as defined in ETSI TS 123 401. [not implemented]'
      required: false
      schema:
        type: integer
@@ -640,7 +640,7 @@ components:
    Query.ErabGbrDl:
      name: erab_gbr_dl
      in: query
      description: 'Guaranteed downlink E-RAB Bit Rate as defined in ETSI TS 123 401'
      description: 'Guaranteed downlink E-RAB Bit Rate as defined in ETSI TS 123 401. [not implemented]'
      required: false
      schema:
        type: integer
@@ -650,7 +650,7 @@ components:
    Query.ErabGbrUl:
      name: erab_gbr_ul
      in: query
      description: 'Guaranteed uplink E-RAB Bit Rate as defined in ETSI TS 123 401'
      description: 'Guaranteed uplink E-RAB Bit Rate as defined in ETSI TS 123 401. [not implemented]'
      required: false
      schema:
        type: integer
@@ -660,7 +660,7 @@ components:
    Query.TempUeId:
      name: temp_ue_id
      in: query
      description: 'Comma separated list of temporary identifiers allocated for the specific UE as defined in   ETSI TS 136 413'
      description: 'Comma separated list of temporary identifiers allocated for the specific UE as defined in   ETSI TS 136 413. [not implemented]'
      required: false
      schema:
        type: array
@@ -670,7 +670,7 @@ components:
    Query.DlGbrPrbUsageCell:
      name: dl_gbr_prb_usage_cell
      in: query
      description: 'PRB usage for downlink GBR traffic in percentage as defined in ETSI TS 136 314'
      description: 'PRB usage for downlink GBR traffic in percentage as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -678,7 +678,7 @@ components:
    Query.UlGbrPrbUsageCell:
      name: ul_gbr_prb_usage_cell
      in: query
      description: 'PRB usage for uplink GBR traffic in percentage as defined in ETSI TS 136 314'
      description: 'PRB usage for uplink GBR traffic in percentage as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -686,7 +686,7 @@ components:
    Query.DlNonGbrPrbUsageCell:
      name: dl_nongbr_prb_usage_cell
      in: query
      description: 'PRB usage for downlink non-GBR traffic in percentage as defined in ETSI TS 136 314'
      description: 'PRB usage for downlink non-GBR traffic in percentage as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -694,7 +694,7 @@ components:
    Query.UlNonGbrPrbUsageCell:
      name: ul_nongbr_prb_usage_cell
      in: query
      description: 'PRB usage for uplink non-GBR traffic in percentage as defined in ETSI TS 136 314'
      description: 'PRB usage for uplink non-GBR traffic in percentage as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -702,7 +702,7 @@ components:
    Query.DlTotalPrbUsageCell:
      name: dl_total_prb_usage_cell
      in: query
      description: 'PRB usage for total downlink traffic in percentage as defined in ETSI TS 136 314'
      description: 'PRB usage for total downlink traffic in percentage as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -710,7 +710,7 @@ components:
    Query.UlTotalPrbUsageCell:
      name: ul_total_prb_usage_cell
      in: query
      description: 'PRB usage for total uplink traffic in percentage as defined in ETSI TS 136 314'
      description: 'PRB usage for total uplink traffic in percentage as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -718,7 +718,7 @@ components:
    Query.ReceivedDedicatedPreamblesCell:
      name: received_dedicated_preambles_cell
      in: query
      description: 'Received dedicated preambles in percentage as defined in ETSI TS 136 314'
      description: 'Received dedicated preambles in percentage as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -726,7 +726,7 @@ components:
    Query.ReceivedRandomPreamblesLowRangeCell:
      name: received_randomly_selected_preambles_low_range_cell
      in: query
      description: 'Received randomly selected preambles in the low range in percentage as defined in ETSI TS 136 314'
      description: 'Received randomly selected preambles in the low range in percentage as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -734,7 +734,7 @@ components:
    Query.ReceivedRandomPreamblesHighRangeCell:
      name: received_randomly_selected_preambles_high_range_cell
      in: query
      description: 'Received rendomly selected preambles in the high range in percentage as defined in ETSI TS 136 314'
      description: 'Received rendomly selected preambles in the high range in percentage as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -742,7 +742,7 @@ components:
    Query.NumberOfActiveUeDlGbrCell:
      name: number_of_active_ue_dl_gbr_cell
      in: query
      description: 'Number of active UEs with downlink GBR traffic as defined in ETSI TS 136 314'
      description: 'Number of active UEs with downlink GBR traffic as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -750,7 +750,7 @@ components:
    Query.NumberOfActiveUeUlGbrCell:
      name: number_of_active_ue_ul_gbr_cell
      in: query
      description: 'Number of active UEs with uplink GBR traffic as defined in ETSI TS 136 314'
      description: 'Number of active UEs with uplink GBR traffic as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -758,7 +758,7 @@ components:
    Query.NumberOfActiveUeDlNonGbrCell:
      name: number_of_active_ue_dl_nongbr_cell
      in: query
      description: 'Number of active UEs with downlink non-GBR traffic as defined in ETSI TS 136 314'
      description: 'Number of active UEs with downlink non-GBR traffic as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -766,7 +766,7 @@ components:
    Query.NumberOfActiveUeUlNonGbrCell:
      name: number_of_active_ue_ul_nongbr_cell
      in: query
      description: 'Number of active UEs with uplink non-GBR traffic as defined in ETSI TS 136 314'
      description: 'Number of active UEs with uplink non-GBR traffic as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -774,7 +774,7 @@ components:
    Query.DlGbrPdrCell:
      name: dl_gbr_pdr_cell
      in: query
      description: 'Packet discard rate for downlink GBR traffic in percentage as defined in ETSI TS 136 314'
      description: 'Packet discard rate for downlink GBR traffic in percentage as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -782,7 +782,7 @@ components:
    Query.UlGbrPdrCell:
      name: ul_gbr_pdr_cell
      in: query
      description: 'Packet discard rate for uplink GBR traffic in percentage as defined in ETSI TS 136 314'
      description: 'Packet discard rate for uplink GBR traffic in percentage as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -790,7 +790,7 @@ components:
    Query.DlNonGbrPdrCell:
      name: dl_nongbr_pdr_cell
      in: query
      description: 'Packet discard rate for downlink non-GBR traffic in percentage as defined in ETSI TS 136 314'
      description: 'Packet discard rate for downlink non-GBR traffic in percentage as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -798,7 +798,7 @@ components:
    Query.UlNonGbrPdrCell:
      name: ul_nongbr_pdr_cell
      in: query
      description: 'Packet discard rate for uplink non-GBR traffic in percentage as defined in ETSI TS 136 314'
      description: 'Packet discard rate for uplink non-GBR traffic in percentage as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -806,7 +806,7 @@ components:
    Query.DlGbrDelayUe:
      name: dl_gbr_delay_ue
      in: query
      description: 'Packet delay of downlink GBR traffic of a UE as defined in ETSI TS 136 314'
      description: 'Packet delay of downlink GBR traffic of a UE as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -814,7 +814,7 @@ components:
    Query.UlGbrDelayUe:
      name: ul_gbr_delay_ue
      in: query
      description: 'Packet delay of uplink GBR traffic of a UE as defined in ETSI TS 136 314'
      description: 'Packet delay of uplink GBR traffic of a UE as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -822,7 +822,7 @@ components:
    Query.DlNonGbrDelayUe:
      name: dl_nongbr_delay_ue
      in: query
      description: 'Packet delay of downlink non-GBR traffic of a UE as defined in ETSI TS 136 314'
      description: 'Packet delay of downlink non-GBR traffic of a UE as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -830,7 +830,7 @@ components:
    Query.UlNonGbrDelayUe:
      name: ul_nongbr_delay_ue
      in: query
      description: 'Packet delay of uplink non-GBR traffic of a UE as defined in ETSI TS 136 314'
      description: 'Packet delay of uplink non-GBR traffic of a UE as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -838,7 +838,7 @@ components:
    Query.DlGbrPdrUe:
      name: dl_gbr_pdr_ue
      in: query
      description: 'Packet discard rate of downlink GBR traffic of a UE in percentage as defined in ETSI TS 136 314'
      description: 'Packet discard rate of downlink GBR traffic of a UE in percentage as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -846,7 +846,7 @@ components:
    Query.UlGbrPdrUe:
      name: ul_gbr_pdr_ue
      in: query
      description: 'Packet discard rate of uplink GBR traffic of a UE in percentage as defined in ETSI TS 136 314'
      description: 'Packet discard rate of uplink GBR traffic of a UE in percentage as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -854,7 +854,7 @@ components:
    Query.DlNonGbrPdrUe:
      name: dl_nongbr_pdr_ue
      in: query
      description: 'Packet discard rate of downlink non-GBR traffic of a UE in percentage as defined in ETSI TS 136 314'
      description: 'Packet discard rate of downlink non-GBR traffic of a UE in percentage as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -862,7 +862,7 @@ components:
    Query.UlNonGbrPdrUe:
      name: ul_nongbr_pdr_ue
      in: query
      description: 'Packet discard rate of uplink non-GBR traffic of a UE in percentage as defined in ETSI TS 136 314'
      description: 'Packet discard rate of uplink non-GBR traffic of a UE in percentage as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -870,7 +870,7 @@ components:
    Query.DlGbrThroughputUe:
      name: dl_gbr_throughput_ue
      in: query
      description: 'Scheduled throughput of downlink GBR traffic of a UE as defined in ETSI TS 136 314'
      description: 'Scheduled throughput of downlink GBR traffic of a UE as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -878,7 +878,7 @@ components:
    Query.UlGbrThroughputUe:
      name: ul_gbr_throughput_ue
      in: query
      description: 'Scheduled throughput of uplink GBR traffic of a UE as defined in ETSI TS 136 314'
      description: 'Scheduled throughput of uplink GBR traffic of a UE as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -886,7 +886,7 @@ components:
    Query.DlNonGbrThroughputUe:
      name: dl_nongbr_throughput_ue
      in: query
      description: 'Scheduled throughput of downlink non-GBR traffic of a UE as defined in ETSI TS 136 314'
      description: 'Scheduled throughput of downlink non-GBR traffic of a UE as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -894,7 +894,7 @@ components:
    Query.UlNonGbrThroughputUe:
      name: ul_nongbr_throughput_ue
      in: query
      description: 'Scheduled throughput of uplink non-GBR traffic of a UE as defined in ETSI TS 136 314'
      description: 'Scheduled throughput of uplink non-GBR traffic of a UE as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -902,7 +902,7 @@ components:
    Query.DlGbrDataVolumeUe:
      name: dl_gbr_data_volume_ue
      in: query
      description: 'Data volume of downlink GBR traffic of a UE as defined in ETSI TS 136 314'
      description: 'Data volume of downlink GBR traffic of a UE as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -910,7 +910,7 @@ components:
    Query.UlGbrDataVolumeUe:
      name: ul_gbr_data_volume_ue
      in: query
      description: 'Data volume of uplink GBR traffic of a UE as defined in ETSI TS 136 314'
      description: 'Data volume of uplink GBR traffic of a UE as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -918,7 +918,7 @@ components:
    Query.DlNonGbrDataVolumeUe:
      name: dl_nongbr_data_volume_ue
      in: query
      description: 'Data volume of downlink non-GBR traffic of a UE as defined in ETSI TS 136 314'
      description: 'Data volume of downlink non-GBR traffic of a UE as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
@@ -926,7 +926,7 @@ components:
    Query.UlNonGbrDataVolumeUe:
      name: ul_nongbr_data_volume_ue
      in: query
      description: 'Data volume of uplink non-GBR traffic of a UE as defined in ETSI TS 136 314'
      description: 'Data volume of uplink non-GBR traffic of a UE as defined in ETSI TS 136 314. [not implemented]'
      required: false
      schema:
        type: integer
+27 −61
Original line number Diff line number Diff line
@@ -143,15 +143,11 @@ paths:
            example:
              subscriptionType: AssocStaSubscription
              callbackReference: 'http://meAppClient.example.com/wai/v2/notifications/1'
              expiryDeadline:
                seconds: 1977836800
                nanoSeconds: 0
              apId:
                bssid: 005C0A0A0A0A
                ssid:
                - 'myNetworkSsid'
                ipAddress:
                - 10.10.100.1
              notificationEvent:
                threshold: 1
                trigger: 1
      responses:
        '201':
          description: Successful subscription response
@@ -165,15 +161,11 @@ paths:
                _links:
                  self:
                    href: 'http://meAppServer.example.com/wai/v2/subscriptions/sub123'
                expiryDeadline:
                  seconds: 1977836800
                  nanoSeconds: 0
                apId:
                  bssid: 005C0A0A0A0A
                  ssid:
                  - 'myNetworkSsid'
                  ipAddress:
                  - 10.10.100.1
                notificationEvent:
                  threshold: 1
                  trigger: 1
        '400':
          $ref: '#/components/responses/400'
        '401':
@@ -211,18 +203,8 @@ paths:
                        nanoseconds: 0
                      apId:
                        bssid: 005C0A0A0A0A
                        ssid:
                        - 'myNetworkSsid'
                        ipAddress:
                        - 10.10.100.1
                      staId:
                        macId: 005C01111111
                        ssid:
                        - 'myNetworkSsid'
                        - 'myOtherNetworkSsid'
                        aid: '1122'
                        ipAddress:
                        - 10.10.1.255
              responses:
                '204':
                  $ref: '#/components/responses/204'
@@ -248,15 +230,11 @@ paths:
                _links:
                  self:
                    href: 'http://meAppServer.example.com/wai/v2/subscriptions/sub123'
                expiryDeadline:
                  seconds: 1977836800
                  nanoSeconds: 0
                apId:
                  bssid: 005C0A0A0A0A
                  ssid:
                  - 'myNetworkSsid'
                  ipAddress:
                  - 10.10.100.1
                notificationEvent:
                  threshold: 1
                  trigger: 1
        '400':
          $ref: '#/components/responses/400'
        '401':
@@ -288,15 +266,11 @@ paths:
              _links:
                self:
                  href: 'http://meAppServer.example.com/wai/v2/subscriptions/sub123'
              expiryDeadline:
                seconds: 1977836800
                nanoSeconds: 0
              apId:
                bssid: 005C0A0A0A0A
                ssid:
                - 'myNetworkSsid'
                ipAddress:
                - 10.10.100.1
              notificationEvent:
                threshold: 1
                trigger: 1
      parameters:
        - $ref: '#/components/parameters/Path.subscrId'
      responses:
@@ -313,10 +287,9 @@ paths:
                callbackReference: 'http://my.callback.com/wai/some-id'
                apId:
                  bssid: 005C0A0A0A0A
                  ssid:
                  - 'myNetworkSsid'
                  ipAddress:
                  - 10.10.100.1
                notificationEvent:
                  threshold: 1
                  trigger: 1
        '400':
          $ref: '#/components/responses/400'
        '401':
@@ -401,9 +374,6 @@ paths:
            example:
              staId:
                macId: 005C01111111
                ssid:
                - 'myNetworkSsid'
                - 'myOtherNetworkSsid'
              measurementId: myId1
              measurementInfo: {}
      responses:
@@ -419,9 +389,6 @@ paths:
                    href: 'http://meAppServer.example.com/wai/v2/measurements/meas123'
                staId:
                  macId: 005C01111111
                  ssid:
                  - 'myNetworkSsid'
                  - 'myOtherNetworkSsid'
                measurementId: myId1
                measurementInfo: {}
        '400':
@@ -462,9 +429,6 @@ paths:
                    href: 'http://meAppServer.example.com/wai/v2/measurements/meas123'
                staId:
                  macId: 005C01111111
                  ssid:
                  - 'myNetworkSsid'
                  - 'myOtherNetworkSsid'
                measurementId: myId1
                measurementInfo: {}
        '400':
@@ -498,9 +462,6 @@ paths:
                  href: 'http://meAppServer.example.com/wai/v2/measurements/meas123'
              staId:
                macId: 005C01111111
                ssid:
                - 'myNetworkSsid'
                - 'myOtherNetworkSsid'
              measurementId: myId1
              measurementInfo: {}
      parameters:
@@ -518,9 +479,6 @@ paths:
                    href: 'http://meAppServer.example.com/wai/v2/measurements/123'
                staId:
                  macId: 005C01111111
                  ssid:
                  - 'myNetworkSsid'
                  - 'myOtherNetworkSsid'
                measurementId: myId1
                measurementInfo: {}
        '400':
@@ -898,8 +856,9 @@ components:

                2 = Notification issued when the number of connected stations is less than or equal to the threshold'
              enum:
              - SEE_DESCRIPTION
              type: string
              - 1 
              - 2
              type: integer
              x-etsi-mec-cardinality: '1'
              x-etsi-mec-origin-type: Enum (inline)
          required:
@@ -2380,8 +2339,15 @@ components:
            trigger:
              description: "Trigger event for the notification:\n1 = Notification issued when the STA\u2019s downlink data rate is greater than or equal to the downlink threshold\n2 = Notification issued when the STA\u2019s downlink data rate is less than or equal to the downlink threshold\n3 = Notification issued when the STA\u2019s uplink data rate is greater than or equal to the uplink threshold\n4 = Notification issued when the STA\u2019s uplink data rate is less than or equal to the uplink threshold\n5 = Notification issued when the STA\u2019s downlink and uplink data rate is greater than or equal to their thresholds\n6 = Notification issued when the STA\u2019s downlink and uplink data rate is less than or equal to their thresholds\n7 = Notification issued when the STA\u2019s downlink or uplink data rate is greater than or equal to their thresholds\n8 = Notification issued when the STA\u2019s downlink or uplink data rate is less than or equal to their thresholds"
              enum:
              - SEE_DESCRIPTION
              type: string
              - 1
              - 2
              - 3
              - 4
              - 5 
              - 6
              - 7
              - 8
              type: integer
              x-etsi-mec-cardinality: '1'
              x-etsi-mec-origin-type: Enum (inline)
            uplinkRateThreshold:
+10 −10

File changed.

Preview size limit exceeded, changes collapsed.

+10 −10

File changed.

Preview size limit exceeded, changes collapsed.

Loading