Commit fcf2a506 authored by sunse's avatar sunse
Browse files

Merge branch '28.541_Rel16_CR0521_Deprecate_Top-Attr_and_use_Top_instead' into... 

Merge branch '28.541_Rel16_CR0521_Deprecate_Top-Attr_and_use_Top_instead' into 'Integration_Rel16_SA5_138_YAML'

28.541 rel16 CR0521 deprecate top attr and use top instead

See merge request sa5/MnS!178
parents f41818a4 b50ea60f

OpenAPI/5gcNrm.yaml

+61 −61
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ components: 


    SubNetwork-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -471,7 +471,7 @@ components: 


    ManagedElement-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -523,7 +523,7 @@ components: 
 

    AmfFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -576,7 +576,7 @@ components: 
              $ref: '#/components/schemas/EP_NLG-Multiple'

    AmfSet-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -594,7 +594,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

    AmfRegion-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -612,7 +612,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

    SmfFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -663,7 +663,7 @@ components: 


    UpfFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -696,7 +696,7 @@ components: 
              $ref: '#/components/schemas/EP_S5U-Multiple'

    N3iwfFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -717,7 +717,7 @@ components: 
              $ref: '#/components/schemas/EP_N4-Multiple'

    PcfFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -758,7 +758,7 @@ components: 


    AusfFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -785,7 +785,7 @@ components: 
              $ref: '#/components/schemas/EP_N13-Multiple'

    UdmFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -814,7 +814,7 @@ components: 
              $ref: '#/components/schemas/EP_N13-Multiple'

    UdrFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -832,7 +832,7 @@ components: 
                      $ref: '#/components/schemas/ManagedNFProfile'

    UdsfFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -850,7 +850,7 @@ components: 
                      $ref: '#/components/schemas/ManagedNFProfile'

    NrfFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -875,7 +875,7 @@ components: 
              $ref: '#/components/schemas/EP_N27-Multiple'

    NssfFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -904,7 +904,7 @@ components: 
              $ref: '#/components/schemas/EP_N31-Multiple'

    SmsfFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -931,7 +931,7 @@ components: 
              $ref: '#/components/schemas/EP_MAP_SMSC-Multiple'

    LmfFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -952,7 +952,7 @@ components: 
              $ref: '#/components/schemas/EP_NLS-Multiple'

    NgeirFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -977,7 +977,7 @@ components: 
              $ref: '#/components/schemas/EP_N17-Multiple'

    SeppFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1000,7 +1000,7 @@ components: 
              $ref: '#/components/schemas/EP_N32-Multiple'

    NwdafFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1020,7 +1020,7 @@ components: 
                      $ref: '#/components/schemas/CommModelList'

    ScpFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1035,7 +1035,7 @@ components: 
        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'

    NefFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1057,7 +1057,7 @@ components: 


    ExternalAmfFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1071,7 +1071,7 @@ components: 
                      $ref: '#/components/schemas/AmfIdentifier'

    ExternalNrfFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1083,7 +1083,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList'

    ExternalNssfFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1095,7 +1095,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/PlmnIdList'

    ExternalSeppFunction-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1113,7 +1113,7 @@ components: 


    EP_N2-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1127,7 +1127,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N3-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1143,7 +1143,7 @@ components: 
                      $ref: 'comDefs.yaml#/components/schemas/DnList'

    EP_N4-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1157,7 +1157,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N5-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1171,7 +1171,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N6-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1185,7 +1185,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N7-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1199,7 +1199,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N8-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1213,7 +1213,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N9-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1227,7 +1227,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N10-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1241,7 +1241,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N11-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1255,7 +1255,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N12-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1269,7 +1269,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N13-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1283,7 +1283,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N14-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1297,7 +1297,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N15-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1311,7 +1311,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N16-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1325,7 +1325,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N17-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1340,7 +1340,7 @@ components: 


    EP_N20-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1355,7 +1355,7 @@ components: 


    EP_N21-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1369,7 +1369,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N22-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1384,7 +1384,7 @@ components: 


    EP_N26-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1398,7 +1398,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N27-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1414,7 +1414,7 @@ components: 


    EP_N31-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1428,7 +1428,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N32-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1451,7 +1451,7 @@ components: 


    EP_S5C-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1465,7 +1465,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_S5U-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1479,7 +1479,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_Rx-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1493,7 +1493,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_MAP_SMSC-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1507,7 +1507,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_NLS-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1521,7 +1521,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_NLG-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1536,7 +1536,7 @@ components: 


    FiveQiDscpMappingSet-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1550,7 +1550,7 @@ components: 


    Configurable5QISet-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1564,7 +1564,7 @@ components: 
   

    Dynamic5QISet-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1578,7 +1578,7 @@ components: 
                      

    GtpUPathQoSMonitoringControl-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1615,7 +1615,7 @@ components: 


    QFQoSMonitoringControl-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -1652,7 +1652,7 @@ components: 


    PredefinedPccRuleSet-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:

OpenAPI/nrNrm.yaml

+43 −43

File changed.

Preview size limit exceeded, changes collapsed.

OpenAPI/sliceNrm.yaml

+4 −4
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ components: 


    SubNetwork-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -326,7 +326,7 @@ components: 


    NetworkSlice-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -343,7 +343,7 @@ components: 
                      $ref: '#/components/schemas/ServiceProfileList'

    NetworkSliceSubnet-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes:
@@ -368,7 +368,7 @@ components: 
                      type: integer

    EP_Transport-Single:

      allOf:

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

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

        - type: object

          properties:

            attributes: