Commit ccf2bc46 authored by bradburyr's avatar bradburyr
Browse files

Fixed indentation errors and syntax errors.

Aligned data types with paper specification.
Moved M1MediaEntryPoint to TS26510_CommonDataTypes.yaml.
parent 13ee6e68
Loading
Loading
Loading
Loading
+46 −60
Original line number Diff line number Diff line
@@ -283,8 +283,7 @@ components:
          scopes: {}

  schemas:
   
    EdgestConfiguration:
    EgestConfiguration:
      type: object
      description: 'Parameters for egesting media content from the Media AS at reference point M2.'
      required:
@@ -298,30 +297,19 @@ components:
        baseURL:
          $ref: 'TS26510_CommonData.yaml#/components/schemas/AbsoluteUrl'
        entryPoint:
          $ref: '#/components/schemas/M1MediaEntryPoint'

    M1MediaEntryPoint:
      description: "A typed entry point for downlink or uplink media streaming."
      type: object
      required:
        - relativePath
        - contentType
      properties:
        relativePath:
          $ref: 'TS26510_CommonData.yaml#/components/schemas/RelativeUrl'
        contentType:
          type: string
        profiles:
          $ref: 'TS26510_CommonData.yaml#/components/schemas/M1MediaEntryPoint'
        cachingConfigurations:
          type: array
          items:
            $ref: 'TS29571_CommonData.yaml#/components/schemas/Uri'
            $ref: 'TS26510_CommonData.yaml#/components/schemas/EgestCachingConfiguration'
          minItems: 1
 
    CachingConfiguration:
    EgestCachingConfiguration:
      type: object
      description: 'A Media AS content caching configuration.'
      description: 'A caching configuration for content egest at reference point M2.'
      required:
        - urlPatternFilter
        - cachingDirectives
      properties:
        urlPatternFilter:
          type: string
@@ -330,25 +318,20 @@ components:
          required:
            - noCache
          properties:
            statusCodeFilters:
              type: array
              items:
                type: integer
                minimum: 100
                maximum: 599
              minItems: 1
            noCache:
              type: boolean
            maxAge:
              $ref: 'TS29571_CommonData.yaml#/components/schemas/Uint32'

 ContributionConfigurations:
    ContributionConfiguration:
      type: array
      items:
        type: object
        description: 'A configuration for content contribution.'
        required:
          - certificateId
          - canonicalDomainName
          - baseURL
          - entryPoint
        properties:
          edgeResourcesConfigurationId:
@@ -356,18 +339,22 @@ components:
          contentPreparationTemplateId:
            $ref: 'TS26510_CommonData.yaml#/components/schemas/ResourceId'
          certificateId: 
              type: string
              description: 'A reference to a Server Certificate resource.'
            allOf:
              - $ref: 'TS26510_CommonData.yaml#/components/schemas/ResourceId'
              - description: 'A reference to a Server Certificate resource to be presented by the Media AS at reference point M4.'
          canonicalDomainName:
            readOnly: true
            type: string
              description: 'Default Fully-Qualified Domain Name assigned by the Media AF.'
            description: 'Default Fully-Qualified Domain Name assigned by the Media AF for use at reference point M4.'
          domainNameAlias: 
            type: string
              description: 'domain name is used by the Media AS to set appropriate CORS HTTP response headers at reference point M4.'
            description: 'Additional domain name nominated by the Media Application Provider and used by the Media AS to set appropriate CORS HTTP response headers at reference point M4.'
          baseURL:
              $ref: 'TS26510_CommonData.yaml#/components/schemas/AbsoluteUrl'
            readOnly: true
            allOf:
              - $ref: 'TS26510_CommonData.yaml#/components/schemas/AbsoluteUrl'
          entryPoint:
               $ref: '#/components/schemas/M1MediaEntryPoint'
            $ref: 'TS26510_CommonData.yaml#/components/schemas/M1MediaEntryPoint'

    # Schema for the resource itself
    ContentPublishingConfiguration:
@@ -375,13 +362,12 @@ components:
      description: "A representation of a Content Publishing Configuration resource."
      required:
        - name
        - contributionConfiguration
        - contributionConfigurations
        - egestConfiguration
      properties:
        name:
          type: string
        contributionConfiguration:
        contributionConfigurations:
          $ref: '#/components/schemas/ContributionConfiguration'
        egestConfiguration:
          $ref: '#/components/schemas/EgestConfiguration'