Commit eb609da1 authored by ruiyue's avatar ruiyue
Browse files

Merge branch '28.541_Rel18_CR1008_Add_NRM_fragment_to_support_NTN_management'...

Merge branch '28.541_Rel18_CR1008_Add_NRM_fragment_to_support_NTN_management' into 'Integration_Rel18_SA5_150_YAML'

28.541_Rel18_CR1008_Add_NRM_fragment_to_support_NTN_management

See merge request !730
parents ce49634f 6c0a5507
Loading
Loading
Loading
Loading
Loading
+120 −0
Original line number Diff line number Diff line
@@ -591,6 +591,75 @@ components:
            type: integer
          minValue:
            type: integer
    NTNTAClist:
      type: array
      items:
        $ref: '#/components/schemas/NrTac'
    Ephemeris:
      type: object
      oneOf:
        - $ref: '#/components/schemas/PositionVelocity'
        - $ref: '#/components/schemas/Orbital'
      properties:
        satelliteId:
          type: integer
  
    PositionVelocity:
      type: object
      properties:
        positionX:
          type: integer
          minimum: 0
          maximum: 604800
        positionY:
          type: integer
          minimum: 0
          maximum: 604800
        positionZ:
          type: integer
          minimum: 0
          maximum: 604800
        velocityVX:
          type: integer
          minimum: -131072
          maximum: 131071         
        velocityVY:
          type: integer
          minimum: -131072
          maximum: 131071           
        velocityVZ:
          type: integer
          minimum: -131072
          maximum: 131071

    Orbital:
      type: object
      properties:
          semiMajorAxis:
            type: integer
            minimum: 0
            maximum: 8589934591 
          eccentricity:
            type: integer
            minimum: -524288
            maximum: 524287
          periapsis:
            type: integer
            minimum: 0
            maximum: 16777215
          longitude:
            type: integer
            minimum: 0
            maximum: 2097151
          inclination:
            type: integer
            minimum: -524288
            maximum: 524287
          meanAnomaly:
            type: integer
            minimum: 0
            maximum: 16777215

#-------- Definition of abstract IOCs --------------------------------------------

    RrmPolicy_-Attr:
@@ -1875,6 +1944,45 @@ components:
        - $ref: '#/components/schemas/CCOParameters-Attr'
        - type: object
    
    NTNFunction-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              type: object
              properties:
                nTNpLMNInfoList:
                  $ref: '#/components/schemas/PlmnInfoList'
                nTNTAClist:
                  $ref: '#/components/schemas/NrTacList'
            EphemerisInfoSet:
              $ref: '#/components/schemas/EphemerisInfoSet-Multiple'

    EphemerisInfoSet-Single:
      allOf:
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
        - type: object
          properties:
            attributes:
              allOf:
                - type: object
                  properties:
                    EphemerisInfos:
                      $ref: '#/components/schemas/Ephemeris-Multiple'

    Ephemeris-Single:
      allOf:
              - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
              - type: object
                oneOf:
                  - $ref: '#/components/schemas/PositionVelocity'
                  - $ref: '#/components/schemas/Orbital'
                properties:
                  satelliteId:
                    type: integer


#-------- Definition of JSON arrays for name-contained IOCs ----------------------

    SubNetwork-Multiple:
@@ -2037,7 +2145,15 @@ components:
      type: array
      items:
        $ref: '#/components/schemas/EP_S1U-Single'
    EphemerisInfoSet-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/EphemerisInfoSet-Single'

    Ephemeris-Multiple:
      type: array
      items:
        $ref: '#/components/schemas/Ephemeris-Single'
#-------- Definitions in TS 28.541 for TS 28.532 ---------------------------------

    resources-nrNrm:
@@ -2104,3 +2220,7 @@ components:
        - $ref: '#/components/schemas/CCOWeakCoverageParameters-Single'
        - $ref: '#/components/schemas/CCOPilotPollutionParameters-Single'
        - $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single'
        - $ref: '#/components/schemas/NTNFunction-Single'
        - $ref: '#/components/schemas/EphemerisInfoSet-Single'
        - $ref: '#/components/schemas/Ephemeris-Single'