Commit c123dc25 authored by bradburyr's avatar bradburyr
Browse files

Merge branch 'main' into 'm5-refactoring' 

# Conflicts:
#   TS26510_Maf_SessionHandling_DynamicPolicy.yaml
#   TS26510_Maf_SessionHandling_NetworkAssistance.yaml
parents 9985974a 08d5cae9

README.md

+25 −25
Original line number Diff line number Diff line
@@ -21,17 +21,17 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f 
([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26510_CommonData.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26510_CommonData.yaml))



## Maf_Provisioning (M1) APIs

* Provisioning Sessions API

## Media AF Provisioning

* Provisioning Sessions

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26510_Maf_Provisioning_ProvisioningSessions.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26510_Maf_Provisioning_ProvisioningSessions.yaml))

* Content Protocols API

* Content Protocols Discovery

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26510_Maf_Provisioning_ContentProtocols.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26510_Maf_Provisioning_ContentProtocols.yaml))

* Server Certificates Provisioning API

* Server Certificates Provisioning

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26510_Maf_Provisioning_ServerCertificates.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26510_Maf_Provisioning_ServerCertificates.yaml))

* Content Preparation Templates Provisioning API`

* Content Preparation Templates Provisioning

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26510_Maf_Provisioning_ContentPreparationTemplates.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26510_Maf_Provisioning_ContentPreparationTemplates.yaml))

* Edge Resources Provisioning
@@ -40,23 +40,23 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f 
* Policy Templates Provisioning

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26510_Maf_Provisioning_PolicyTemplates.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26510_Maf_Provisioning_PolicyTemplates.yaml))

* Content Hosting Provisioning API

* Content Hosting Provisioning

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26510_Maf_Provisioning_ContentHosting.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26510_Maf_Provisioning_ContentHosting.yaml))

* Content Publishing Provisioning API

* Content Publishing Provisioning

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26510_Maf_Provisioning_ContentPublishing.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26510_Maf_Provisioning_ContentPublishing.yaml))

* Metrics Reporting Provisioning

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26510_Maf_Provisioning_MetricsReporting.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26510_Maf_Provisioning_MetricsReporting.yaml))

* Consumption Reporting Provisioning API

* Consumption Reporting Provisioning

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26510_Maf_Provisioning_ConsumptionReporting.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26510_Maf_Provisioning_ConsumptionReporting.yaml))

* Event Data Processing Provisioning API

* Event Data Processing Provisioning

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26510_Maf_Provisioning_EventDataProcessing.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26510_Maf_Provisioning_EventDataProcessing.yaml))



## Maf_SessionHandling (M5) APIs

## Media AF Session Handling

* Service Access Information

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26510_Maf_SessionHandling_ServiceAccessInformation.yaml))
@@ -69,7 +69,7 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f 
* Metrics Reporting

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26510_Maf_SessionHandling_MetricsReporting.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26510_Maf_SessionHandling_MetricsReporting.yaml))

* Consumption Reporting API

* Consumption Reporting

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26510_Maf_SessionHandling_ConsumptionReporting.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26510_Maf_SessionHandling_ConsumptionReporting.yaml))
@@ -79,25 +79,17 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f 
([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26512_CommonData.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26512_CommonData.yaml))



## Maf_Provisioning (M1) APIs

* Top-level Provisioning API for 5G Media Streaming

## 5GMS AF Provisioning

* Top-level Provisioning API for 5G Media Streaming (M1)

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26512_Maf_Provisioning.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26512_Maf_Provisioning.yaml))



## Maf_SessionHandling (M5) APIs

* Top-level Media Session Handling API for 5G Media Streaming

## 5GMS AF Session Handling

* Top-level Media Session Handling API for 5G Media Streaming (M3, M5)

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26512_Maf_SessionHandling.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26512_Maf_SessionHandling.yaml))



APIs specified in TS 26.512 that are deprecated in this release:

* Dynamic Policies *(Rel-17 only; deprecated)*

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26512_M5_DynamicPolicies.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26512_M5_DynamicPolicies.yaml))

* Network Assistance *(Rel-17 only; deprecated)*

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26512_M5_NetworkAssistance.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26512_M5_NetworkAssistance.yaml))



## Data Reporting (R2, R4) APIs

## 5GMS AF Data Reporting data types depended on by Ndcaf_DataReporting API

* 5GMS Client (R2)

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26512_R2_DataReporting.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26512_R2_DataReporting.yaml))
@@ -105,7 +97,15 @@ APIs specified in TS 26.512 that are deprecated in this release: 
([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26512_R4_DataReporting.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26512_R4_DataReporting.yaml))



## Event Exposure (R5, R6) API

## 5GMS AF Event Exposure data types depended on by Naf_EventExposure API

* Data Collection AF (R5, R6)

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26512_EventExposure.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26512_EventExposure.yaml))



## 5GMS AF Event Exposure data types deprecated in this release

* Dynamic Policies *(Rel-17 only; deprecated)*

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26512_M5_DynamicPolicies.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26512_M5_DynamicPolicies.yaml))

* Network Assistance *(Rel-17 only; deprecated)*

([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=TS26512_M5_NetworkAssistance.yaml))

([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=TS26512_M5_NetworkAssistance.yaml))

TS26510_Maf_Provisioning_ContentHosting.yaml

+17 −2
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ paths: 
          $ref: 'TS29571_CommonData.yaml#/components/responses/400'

        '401': # Unauthorized

          $ref: 'TS29571_CommonData.yaml#/components/responses/401'

        '403': # Forbidden

          $ref: 'TS29571_CommonData.yaml#/components/responses/403'

        '411': # Length Required

          $ref: 'TS29571_CommonData.yaml#/components/responses/411'

        '413': # Payload Too Large
@@ -92,8 +94,7 @@ paths: 
          $ref: 'TS29571_CommonData.yaml#/components/responses/401'

        '404': # Not Found

          $ref: 'TS29571_CommonData.yaml#/components/responses/404'

        '410':

          # Gone: Resource no longer exists

        '410': # Gone: Resource no longer exists

          $ref: 'TS29571_CommonData.yaml#/components/responses/410'

        '413': # Payload Too Large: No request body allowed for this operation

          $ref: 'TS29571_CommonData.yaml#/components/responses/413'
@@ -134,8 +135,14 @@ paths: 
          $ref: 'TS29571_CommonData.yaml#/components/responses/404'

        '410': # Gone: Resource no longer exists

          $ref: 'TS29571_CommonData.yaml#/components/responses/410'

        '411': # Length Required

          $ref: 'TS29571_CommonData.yaml#/components/responses/411'

        '413': # Payload Too Large

          $ref: 'TS29571_CommonData.yaml#/components/responses/413'

        '414': # URI Too Long

          $ref: 'TS29571_CommonData.yaml#/components/responses/414'

        '415': # Unsupported Media Type

          $ref: 'TS29571_CommonData.yaml#/components/responses/415'

        '500': # Internal Server Error

          $ref: 'TS29571_CommonData.yaml#/components/responses/500'

        '503': # Service Unavailable
@@ -174,8 +181,14 @@ paths: 
          $ref: 'TS29571_CommonData.yaml#/components/responses/404'

        '410': # Gone: Resource no longer exists

          $ref: 'TS29571_CommonData.yaml#/components/responses/410'

        '411': # Length Required

          $ref: 'TS29571_CommonData.yaml#/components/responses/411'

        '413': # Payload Too Large

          $ref: 'TS29571_CommonData.yaml#/components/responses/413'

        '414': # URI Too Long

          $ref: 'TS29571_CommonData.yaml#/components/responses/414'

        '415': # Unsupported Media Type

          $ref: 'TS29571_CommonData.yaml#/components/responses/415'

        '500': # Internal Server Error

          $ref: 'TS29571_CommonData.yaml#/components/responses/500'

        '503': # Service Unavailable
@@ -245,6 +258,8 @@ paths: 
          $ref: 'TS29571_CommonData.yaml#/components/responses/401'

        '404': # Not Found

          $ref: 'TS29571_CommonData.yaml#/components/responses/404'

        '411': # Length Required

          $ref: 'TS29571_CommonData.yaml#/components/responses/411'

        '413': # Payload Too Large

          $ref: 'TS29571_CommonData.yaml#/components/responses/413'

        '414': # URI Too Long

TS26510_Maf_Provisioning_ContentPreparationTemplates.yaml

+4 −0
Original line number Diff line number Diff line
@@ -138,6 +138,8 @@ paths: 
                type: string

        '204': # No Content

          description: 'Content Preparation Template Unchanged'

        '400': # Bad Request: The syntax of the HTTP request is malformed in a way not covered by one of the following more specific client errors

          $ref: 'TS29571_CommonData.yaml#/components/responses/400'

        '401': # Unauthorized

          $ref: 'TS29571_CommonData.yaml#/components/responses/401'

        '403': # Forbidden
@@ -176,6 +178,8 @@ paths: 
      responses:

        '204': # No Content

          description: 'Content Preparation Template Patched'

        '400': # Bad Request: The syntax of the HTTP request is malformed in a way not covered by one of the following more specific client errors

          $ref: 'TS29571_CommonData.yaml#/components/responses/400'

        '401': # Unauthorized

          $ref: 'TS29571_CommonData.yaml#/components/responses/401'

        '403': # Forbidden

TS26510_Maf_Provisioning_EdgeResources.yaml

+4 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ paths: 
                $ref: '#/components/schemas/EdgeResourcesConfiguration'

        '204': # No Content

          description: 'Edge Resources Configuration Unchanged'

        '400': # Bad Request: The syntax of the HTTP request is malformed in a way not covered by one of the following more specific client errors

          $ref: 'TS29571_CommonData.yaml#/components/responses/400'

        '401': # Unauthorized

          $ref: 'TS29571_CommonData.yaml#/components/responses/401'

        '403': # Forbidden
@@ -181,6 +183,8 @@ paths: 
                $ref: '#/components/schemas/EdgeResourcesConfiguration'

        '204': # No Content

          description: 'Edge Resources Configuration Unchanged'

        '400': # Bad Request: The syntax of the HTTP request is malformed in a way not covered by one of the following more specific client errors

          $ref: 'TS29571_CommonData.yaml#/components/responses/400'

        '401': # Unauthorized

          $ref: 'TS29571_CommonData.yaml#/components/responses/401'

        '403': # Forbidden

TS26510_Maf_Provisioning_EventDataProcessing.yaml

+4 −0
Original line number Diff line number Diff line
@@ -138,6 +138,8 @@ paths: 
                $ref: '#/components/schemas/EventDataProcessingConfiguration'

        '204': # No Content

          description: 'Event Data Processing Configuration Unchanged'

        '400': # Bad Request: The syntax of the HTTP request is malformed in a way not covered by one of the following more specific client errors

          $ref: 'TS29571_CommonData.yaml#/components/responses/400'

        '401': # Unauthorized

          $ref: 'TS29571_CommonData.yaml#/components/responses/401'

        '403': # Forbidden
@@ -182,6 +184,8 @@ paths: 
                $ref: '#/components/schemas/EventDataProcessingConfiguration'

        '204': # No Content

          description: 'Event Data Processing Configuration Unchanged'

        '400': # Bad Request: The syntax of the HTTP request is malformed in a way not covered by one of the following more specific client errors

          $ref: 'TS29571_CommonData.yaml#/components/responses/400'

        '401': # Unauthorized

          $ref: 'TS29571_CommonData.yaml#/components/responses/401'

        '403': # Forbidden