Commit 6024b183 authored by sunse's avatar sunse
Browse files

Merge Rel19 contest from SA5 154 and 155 based on SA#104 Rel18 baseline

parent cd26898d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -969,7 +969,7 @@ components:
        contextValueRange:
          type: array
          items:
            $ref: "TS28623_GenericNrm.yaml#/components/schemas/NFType"
            $ref: "TS28541_5GcNrm.yaml#/components/schemas/NFType"
    NfInstanceLocationContext:          
      description: >-
        This data type is the "ObjectContext" data type with specialisations for NfInstanceLocationContext 
+206 −16

File changed.

Preview size limit exceeded, changes collapsed.

+12 −0
Original line number Diff line number Diff line
@@ -628,26 +628,32 @@ components:
      properties:
        positionX:
          type: integer
          default: 0
          minimum: 0
          maximum: 604800
        positionY:
          type: integer
          default: 0          
          minimum: 0
          maximum: 604800
        positionZ:
          type: integer
          default: 0          
          minimum: 0
          maximum: 604800
        velocityVX:
          type: integer
          default: 0          
          minimum: -131072
          maximum: 131071         
        velocityVY:
          type: integer
          default: 0          
          minimum: -131072
          maximum: 131071           
        velocityVZ:
          type: integer
          default: 0          
          minimum: -131072
          maximum: 131071

@@ -656,26 +662,32 @@ components:
      properties:
          semiMajorAxis:
            type: integer
            default: 0            
            minimum: 0
            maximum: 8589934591 
          eccentricity:
            type: integer
            default: 0                 
            minimum: -524288
            maximum: 524287
          periapsis:
            type: integer
            default: 0     
            minimum: 0
            maximum: 16777215
          longitude:
            type: integer
            default: 0                 
            minimum: 0
            maximum: 2097151
          inclination:
            type: integer
            default: 0                 
            minimum: -524288
            maximum: 524287
          meanAnomaly:
            type: integer
            default: 0                 
            minimum: 0
            maximum: 16777215

+8 −0
Original line number Diff line number Diff line
@@ -143,6 +143,9 @@ components:

    Fqdn:
      type: string
      pattern: '^([0-9A-Za-z]([-0-9A-Za-z]{0,61}[0-9A-Za-z])?\.)+[A-Za-z]{2,63}\.?$'
      minLength: 4
      maxLength: 253
    Ipv4Addr:
      type: string
      pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$'
@@ -192,6 +195,11 @@ components:
        - LOCKED
        - UNLOCKED
      default: LOCKED  
    BasicAdministrativeState:
      type: string
      enum:
        - LOCKED
        - UNLOCKED
    OperationalState:
      type: string
      enum:
+19 −0
Original line number Diff line number Diff line
@@ -12,6 +12,25 @@ externalDocs:
paths: {}
components:
  schemas:

  #-------- Definition of types for name-containments ------
    SubNetwork-ncO-FileManagementNrm:
      type: object
      properties:
        FileDownloadJob:
          $ref: '#/components/schemas/FileDownloadJob-Multiple'
        Files:
          $ref: '#/components/schemas/Files-Multiple'
    ManagedElement-ncO-FileManagementNrm:
      type: object
      properties:
        FileDownloadJob:
          $ref: '#/components/schemas/FileDownloadJob-Multiple'
        Files:
          $ref: '#/components/schemas/Files-Multiple'      
   #-------Definition of generic IOCs ----------#  


#-------- Definition of types-----------------------------------------------------
    FileDownloadJobProcessMonitor:
      description: >-
Loading