Commit c58f204d authored by ruiyue's avatar ruiyue
Browse files

Merge branch '28.541_Rel19_correct_issues_for_MWAB_NRM_fragment' into... 

Merge branch '28.541_Rel19_correct_issues_for_MWAB_NRM_fragment' into 'Integration_Rel19_SA5_164_YAML'

28.541_Rel19_CR1657_correct_issues_for_MWAB_NRM_fragment

See merge request !1971
parents 3c4bf443 9fd52d78

OpenAPI/TS28541_NrNrm.yaml

+53 −1
Original line number Diff line number Diff line
@@ -792,6 +792,32 @@ components: 
          $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Nid'

        aIotAreaCode:

          type: string

    MnrOamIPConfig:

      type: object

      properties:

        caraConfiguration:

          $ref: '#/components/schemas/CaraConfiguration'

        seGwConfiguration:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr'

        scsConfiguration:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr'

    CaraConfiguration:

      type: object

      properties:

        caraAddress:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr'

        portNumber:

          type: integer

        path:

          type: string

        subjectName:

          type: string

        protocol:

          type: string

          enum:

            - HTTP

            - HTTPS

          default: HTTP



#-------- Definition of types for name-containments ------

    SubNetwork-ncO-NrNrm:
@@ -839,6 +865,8 @@ components: 
          $ref: '#/components/schemas/NRECMappingRule-Multiple'

        MWAB:

          $ref: '#/components/schemas/MWAB-Multiple'

        IAB:

          $ref: '#/components/schemas/IAB-Multiple'



    ManagedElement-ncO-NrNrm:

      type: object
@@ -873,6 +901,8 @@ components: 
          $ref: '#/components/schemas/NRECMappingRule-Multiple'

        MWAB:

          $ref: '#/components/schemas/MWAB-Multiple'

        IAB:

          $ref: '#/components/schemas/IAB-Multiple'



#-------- Definition of abstract IOCs --------------------------------------------
@@ -914,6 +944,8 @@ components: 
                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                    dynamic5QISetRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'

                    iABRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

        - type: object

          properties:
@@ -2288,6 +2320,8 @@ components: 
            attributes:

              type: object

              properties:

                mnrOamIPConfig:

                  $ref: '#/components/schemas/MnrOamIPConfig'

                administrativeState:

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'

                operationalState:
@@ -2374,6 +2408,18 @@ components: 
                      uniqueItems: true

                      items:

                        $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

    IAB-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'

        - type: object

          properties:

            attributes:

              type: object

              properties:

                mrnOamIPConfig:

                  $ref: '#/components/schemas/MnrOamIPConfig'

                currentLocation:

                  $ref: '#/components/schemas/LocationInfo'

                     



#-------- Definition of JSON arrays for name-contained IOCs ----------------------
@@ -2555,6 +2601,11 @@ components: 
      items:

        $ref: '#/components/schemas/AIOTReader-Single'



    IAB-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/IAB-Single'



#-------- Definitions in TS 28.541 for TS 28.532 ---------------------------------



    resources-nrNrm:
@@ -2626,4 +2677,5 @@ components: 
        - $ref: '#/components/schemas/NTNTimeBasedConfig-Single'

        - $ref: '#/components/schemas/RedCapAccessCriteria-Single'

        - $ref: '#/components/schemas/AIOTReader-Single'

        - $ref: '#/components/schemas/IAB-Single'