Skip to content

Commit

Permalink
Merge pull request #442 from karthik-sethuraman/develop
Browse files Browse the repository at this point in the history 
UML/YANG/TREE file updates to align & be consistent with PR #441  & PR #439
  • Loading branch information
@karthik-sethuraman
karthik-sethuraman authored Jun 30, 2019
2 parents 416a2d3 + fff7959 commit 1b90629
Show file tree
Hide file tree
Showing 40 changed files with 7,610 additions and 6,016 deletions.
491 changes: 311 additions & 180 deletions UML/TapiCommon.notation
View file

Large diffs are not rendered by default.

33 changes: 24 additions & 9 deletions UML/TapiCommon.uml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ License: This module is distributed under the Apache License 2.0
</ownedComment>
<ownedAttribute xmi:type="uml:Property" xmi:id="_xEvjm98AEeW-BtRsuJPbqg" name="uuid" visibility="public" type="_FRi-QNnWEeWIOYiRCk5bbQ">
<ownedComment xmi:type="uml:Comment" xmi:id="_xEvjnN8AEeW-BtRsuJPbqg" annotatedElement="_xEvjm98AEeW-BtRsuJPbqg">
<body>UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable. An UUID carries no semantics with respect to the purpose or state of the entity.&#xD;
<body>UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable.&#xD;
An UUID carries no semantics with respect to the purpose or state of the entity.&#xD;
UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters.&#xD;
Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} &#xD;
Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6</body>
Expand All @@ -54,8 +55,9 @@ Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xEvjnt8AEeW-BtRsuJPbqg" value="1"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_xEvjn98AEeW-BtRsuJPbqg" name="name" visibility="public" type="_6efrYNnVEeWIOYiRCk5bbQ">
<ownedComment xmi:type="uml:Comment" xmi:id="_xEvjoN8AEeW-BtRsuJPbqg">
<body>List of names. A property of an entity with a value that is unique in some namespace but may change during the life of the entity. A name carries no semantics with respect to the purpose of the entity.</body>
<ownedComment xmi:type="uml:Comment" xmi:id="_VbMx4JndEemVaY_egjrbOQ" annotatedElement="_xEvjn98AEeW-BtRsuJPbqg">
<body>List of names. This value is unique in some namespace but may change during the life of the entity.&#xD;
A name carries no semantics with respect to the purpose of the entity.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xEvjod8AEeW-BtRsuJPbqg"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xEvjot8AEeW-BtRsuJPbqg" value="*"/>
Expand All @@ -75,8 +77,9 @@ Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
</ownedAttribute>
<ownedAttribute xmi:type="uml:Property" xmi:id="_MP7aAJLQEeaqpNd__7dv4w" name="name" type="_6efrYNnVEeWIOYiRCk5bbQ">
<ownedComment xmi:type="uml:Comment" xmi:id="_-rk80JLSEeaqpNd__7dv4w">
<body>List of names. A property of an entity with a value that is unique in some namespace but may change during the life of the entity. A name carries no semantics with respect to the purpose of the entity.</body>
<ownedComment xmi:type="uml:Comment" xmi:id="_XYchsJndEemVaY_egjrbOQ" annotatedElement="_MP7aAJLQEeaqpNd__7dv4w">
<body>List of names. This value is unique in some namespace but may change during the life of the entity.&#xD;
A name carries no semantics with respect to the purpose of the entity.</body>
</ownedComment>
<lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Ne02EJLQEeaqpNd__7dv4w"/>
<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Ne02EpLQEeaqpNd__7dv4w" value="*"/>
Expand Down Expand Up @@ -617,8 +620,14 @@ The timeticks type represents a non-negative integer that represents the time, m
<packagedElement xmi:type="uml:Package" xmi:id="_FhzwMHrqEeavcODnuX7FyA" name="Interfaces">
<packagedElement xmi:type="uml:Interface" xmi:id="_JSfMgHrqEeavcODnuX7FyA" name="ServiceInterfacePoint">
<ownedOperation xmi:type="uml:Operation" xmi:id="_WHPN8FJvEeWcs7ZjyujtOg" name="getServiceInterfacePointDetails" isLeaf="true">
<ownedParameter xmi:type="uml:Parameter" xmi:id="_WHPN8VJvEeWcs7ZjyujtOg" name="sipIdOrName" effect="read">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
<ownedParameter xmi:type="uml:Parameter" xmi:id="_WHPN8VJvEeWcs7ZjyujtOg" name="uuid" type="_FRi-QNnWEeWIOYiRCk5bbQ" effect="read">
<ownedComment xmi:type="uml:Comment" xmi:id="__qr5oJnhEemrjrtN9v_T1A" annotatedElement="_WHPN8VJvEeWcs7ZjyujtOg">
<body>UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable.&#xD;
An UUID carries no semantics with respect to the purpose or state of the entity.&#xD;
UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters.&#xD;
Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} &#xD;
Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6</body>
</ownedComment>
</ownedParameter>
<ownedParameter xmi:type="uml:Parameter" xmi:id="_WHPN8lJvEeWcs7ZjyujtOg" name="sip" type="_It0sYEG-EeWMO5szP8dKiA" direction="out" effect="read"/>
</ownedOperation>
Expand All @@ -629,8 +638,14 @@ The timeticks type represents a non-negative integer that represents the time, m
</ownedParameter>
</ownedOperation>
<ownedOperation xmi:type="uml:Operation" xmi:id="_OsQnwGNAEee0bPnI-Gt-mQ" name="updateServiceInterfacePoint">
<ownedParameter xmi:type="uml:Parameter" xmi:id="_qZ9WgGNDEee0bPnI-Gt-mQ" name="sipIdOrName" effect="read">
<type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
<ownedParameter xmi:type="uml:Parameter" xmi:id="_qZ9WgGNDEee0bPnI-Gt-mQ" name="uuid" type="_FRi-QNnWEeWIOYiRCk5bbQ" effect="read">
<ownedComment xmi:type="uml:Comment" xmi:id="_BPtWsJniEemrjrtN9v_T1A" annotatedElement="_qZ9WgGNDEee0bPnI-Gt-mQ">
<body>UUID: An identifier that is universally unique within an identifier space, where the identifier space is itself globally unique, and immutable.&#xD;
An UUID carries no semantics with respect to the purpose or state of the entity.&#xD;
UUID here uses string representation as defined in RFC 4122. The canonical representation uses lowercase characters.&#xD;
Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12} &#xD;
Example of a UUID in string representation: f81d4fae-7dec-11d0-a765-00a0c91e6bf6</body>
</ownedComment>
</ownedParameter>
<ownedParameter xmi:type="uml:Parameter" xmi:id="_ee1L0GNEEee0bPnI-Gt-mQ" name="state" type="_zSpnYNnjEeWIOYiRCk5bbQ" isUnique="false" effect="update"/>
</ownedOperation>
Expand Down
Loading

0 comments on commit 1b90629

Please sign in to comment.