Commit 8a429dc7 authored by ruiyue's avatar ruiyue
Browse files

Merge branch... 

Merge branch 'TS28532_Rel17_draftCR_S5-222261_Update_provMnS_yaml_file_to_include_the_resources-intentNrm' into 'Integration_Rel17_SA5_142_YAML'

Ts28532 rel17 draft cr s5 222261 update prov mn s yaml file to include the resources intent nrm

See merge request !296
parents 14e792e6 3c4b46ff

OpenAPI/provMnS.yaml

+1 −0
Original line number Diff line number Diff line
@@ -417,6 +417,7 @@ components: 
            - $ref: 'nrNrm.yaml#/components/schemas/resources-nrNrm'

            - $ref: '5gcNrm.yaml#/components/schemas/resources-5gcNrm'

            - $ref: 'sliceNrm.yaml#/components/schemas/resources-sliceNrm'

            - $ref: 'intentNrm.yaml#/components/schemas/resources-intentNrm'            



    MoiChange:

      type: object

yang-models/_3gpp-5gc-nrm-FiveQiDscpMappingSet.yang

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet { 
        range 0..255 ;

      }

      min-elements 1;

      description " Identifies the 5QI values that are mapped to a same DSCP, as specified in TS 28.541.";

      description " Identifies the 5QI values that are mapped to a same DSCP";

     }

     

    leaf dscp {

yang-models/_3gpp-5gc-nrm-amffunction.yang

+4 −2
Original line number Diff line number Diff line
@@ -13,8 +13,10 @@ module _3gpp-5gc-nrm-amffunction { 
  organization "3gpp SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";

  description "AMFFunction derived from basic ManagedFunction.";

  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

  

  revision 2020-11-05 { reference CR-0412 ; }

  revision 2022-01-07 { reference CR-0643; }

  revision 2020-11-06 { reference CR-0412 ; }

  revision 2019-10-25 { reference "S5-194457 S5-193518"; }



  revision 2019-05-31 { reference "Ericsson refactoring."; }

yang-models/_3gpp-5gc-nrm-amfregion.yang

+4 −3
Original line number Diff line number Diff line
@@ -13,11 +13,12 @@ module _3gpp-5gc-nrm-amfregion { 
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";

  description "This IOC represents the AMF Region which consists one or

    multiple AMF Sets.";

  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";



  revision 2020-11-05 { reference CR-0412 ; }

  revision 2022-01-07 { reference CR-0643; }

  revision 2020-11-06 { reference CR-0412 ; }

  revision 2019-10-28 { reference S5-193518 ; }

  revision 2019-06-11 {

 reference "Ericsson refactoring."; }

  revision 2019-06-11 { reference ""; }

  

  grouping AMFRegionGrp {

    description "Represents the AMFRegion IOC";

yang-models/_3gpp-5gc-nrm-amfset.yang

+3 −1
Original line number Diff line number Diff line
@@ -13,8 +13,10 @@ module _3gpp-5gc-nrm-amfset { 
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";

  description "This IOC represents the AMF Set which consists of some AMFs 

    that serve a given area and Network Slice.";

  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";



  revision 2020-11-05 { reference CR-0412 ; }

  revision 2022-01-07 { reference CR-0643; }

  revision 2020-11-06 { reference CR-0412 ; }

  revision 2019-10-28 { reference S5-193518 ; }

  revision 2019-06-11 { reference "Ericsson refactoring."; }