Commit 44dc5194 authored by Zu Qiang's avatar Zu Qiang 🛀
Browse files

Update file _3gpp-common-yang-types.yang

parent ba635805

yang-models/_3gpp-common-yang-types.yang

+20 −62
Original line number Diff line number Diff line
@@ -958,90 +958,50 @@ module _3gpp-common-yang-types { 
    EBNF in 32.300 clause 7.3  EBNF of DN String Representation



    leaf DN { type string {   //  Same pattern as LocalDN

      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))

        (([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|

        (\\[a-fA-F0-9]{2})))?(,[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|

        (\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;

        \\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)*';

      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?(,[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)*';

    } }



    leaf fullLocalDN { type string {   // LocalRDN , { RDNSeparator , LocalRDN }

        RDNSeparator is a single , no space or \R allowed   Me.mykey=1 allowed

    leaf fullLocalDN { type string {   // LocalRDN , { RDNSeparator , LocalRDN }    RDNSeparator is a single , no space or \R allowed   Me.mykey=1 allowed

      //  (fullLocalRDN)(,(fullLocalRDN))*

      pattern '(([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.

      [a-z][^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))

      (([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|

      (\\[a-fA-F0-9]{2})))?))(,(([A-Z][^,=+<>#;\\"\r\n*.]*|

      ([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*))

      =(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|

      (\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)))*';

      pattern '(([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?))(,(([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)))*';

    } }



    leaf LocalDN { type string {   // LocalRDN , { RDNSeparator , LocalRDN }

        RDNSeparator is a single , no space or \R allowed

    leaf LocalDN { type string {   // LocalRDN , { RDNSeparator , LocalRDN }    RDNSeparator is a single , no space or \R allowed

      //  LocalRDN(,LocalRDN)*

      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]

      |(\\[a-fA-F0-9]{2}))

      (([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|

      (\\[a-fA-F0-9]{2})))?(,[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|

      (\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*

      ([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)*';

      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?(,[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)*';

    } }



    leaf fullLocalRDN { type string {   // same as 

    fullLocalDNAttributeTypeAndValue

      pattern '([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z]

      [^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))

      (([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|

      (\\[a-fA-F0-9]{2})))?)';

    leaf fullLocalRDN { type string {   // same as fullLocalDNAttributeTypeAndValue

      pattern '([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)';

    } }



    leaf LocalRDN { type string {   // same as LocalDNAttributeTypeAndValue

      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|

      (\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*

      ([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?';

      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?';

    } }



    leaf fullLocalDNAttributeTypeAndValue { type string { 

      // LocalDNAttributeType , AttributeTypeAndValueSeparator , 

        RegularAttributeValue

    leaf fullLocalDNAttributeTypeAndValue { type string { // LocalDNAttributeType , AttributeTypeAndValueSeparator , RegularAttributeValue

      // pattern LocalDNAttributeType=RegularAttributeValue

      pattern '([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]

        *\.[a-z][^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|

        (\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))

        *([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)';

      pattern '([A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*))=(([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?)';

    } }



      // limitation: NamesOfClassAndNamingAttributenot supported Me.mykey=1

    leaf LocalDNAttributeTypeAndValue { type string {

      // ebnf1          LocalDNAttributeType , AttributeTypeAndValueSeparator

         , RegularAttributeValue

      // ebnf2-limited  NameOfClassWithIdAttribute , 

        AttributeTypeAndValueSeparator , RegularAttributeValue

      // ebnf1          LocalDNAttributeType , AttributeTypeAndValueSeparator , RegularAttributeValue

      // ebnf2-limited  NameOfClassWithIdAttribute , AttributeTypeAndValueSeparator , RegularAttributeValue

      // pattern        NameOfClassWithIdAttribute=RegularAttributeValue

      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|

        (\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*

        ([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?';

      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*=([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?';

    } }



    leaf LocalDNAttributeType { type string {   // NameOfClassWithIdAttribute 

      | NamesOfClassAndNamingAttribute  RDNSeparator is a single , 

      no space or \R allowed

    leaf LocalDNAttributeType { type string {   // NameOfClassWithIdAttribute | NamesOfClassAndNamingAttribute  RDNSeparator is a single , no space or \R allowed

      //  NameOfClassWithIdAttribute|NamesOfClassAndNamingAttribute

      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]

        *\.[a-z][^,=+<>#;\\"\r\n*.]*)';

      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*|([A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*)';

    } }



    leaf RegularAttributeValue { type string {       

      // ( AttributeValueChar - SpaceChar ) , [ { AttributeValueChar } , 

        ( AttributeValueChar - SpaceChar ) ]

      pattern '([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))

        (([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|

        (\\[a-fA-F0-9]{2})))?' ;

    leaf RegularAttributeValue { type string {       // ( AttributeValueChar - SpaceChar ) , [ { AttributeValueChar } , ( AttributeValueChar - SpaceChar ) ]

      pattern '([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2}))(([^,=+<>#;\\"\r\n*]|(\\[a-fA-F0-9]{2}))*([^,=+<>#;\\"\r\n* ]|(\\[a-fA-F0-9]{2})))?' ;

    } }



    leaf NamesOfClassAndNamingAttribute  { type string {  // ClassName , 

      ClassNamingAttributeSeparator , NamingAttributeName

    leaf NamesOfClassAndNamingAttribute  { type string {  // ClassName , ClassNamingAttributeSeparator , NamingAttributeName

      // pattern: ClassName\.NamingAttributeName

      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*\.[a-z][^,=+<>#;\\"\r\n*.]*' ;

    } }
@@ -1050,13 +1010,11 @@ module _3gpp-common-yang-types { 
      pattern '[a-zA-Z][a-zA-Z0-9-_]*' ;

    } }



    leaf ClassName { type string {     // CapitalLetterChar , 

      { LocalDNAttributeTypeChar }

    leaf ClassName { type string {     // CapitalLetterChar , { LocalDNAttributeTypeChar }

      pattern '[A-Z][^,=+<>#;\\"\r\n*.]*' ;

    } }



    leaf NamingAttributeName { type string {   // SmallLetterChar , 

      { LocalDNAttributeTypeChar }

    leaf NamingAttributeName { type string {   // SmallLetterChar , { LocalDNAttributeTypeChar }

      pattern '[a-z][^,=+<>#;\\"\r\n*.]*' ;

    } }