Skip to content

Commit

Permalink
Finalized YANG model (first full version). sonata-nfv#73
Browse files Browse the repository at this point in the history 
Signed-off-by: peusterm <[email protected]>
  • Loading branch information
peusterm committed Mar 8, 2019
1 parent e132be3 commit 4344f29
Show file tree
Hide file tree
Showing 5 changed files with 221 additions and 141 deletions.
48 changes: 27 additions & 21 deletions models/doc/ietf-ped-catalog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,11 @@ <h1> Module: <font color=blue>ietf-ped-catalog</font>, Namespace:
onclick="toggleRows(this);return false"
class="folder">&nbsp;
</a>
<abbr title="Performance Experiment Descriptor (PED)">ped-catalog</abbr>
<abbr title="Performance Experiment Descriptor (PED) catalog.
A collection of PEDs that can be empty.
(This construct is needed to be aligned with RFC6020.
Putting the PED description directly into the model wouldn't
work, since a PED cannot be empty).">ped-catalog</abbr>
</div>
</td>
<td nowrap>container</td>
Expand Down Expand Up @@ -229,7 +233,7 @@ <h1> Module: <font color=blue>ietf-ped-catalog</font>, Namespace:
</td>
<td>leaf</td>
<td nowrap><abbr title="string
">string</abbr></td>
{length = 1..255} {pattern = ^[a-z0-9\-_.]+$}">string</abbr></td>
<td nowrap>config</td>
<td></td>
<td>current</td>
Expand Down Expand Up @@ -257,7 +261,7 @@ <h1> Module: <font color=blue>ietf-ped-catalog</font>, Namespace:
</td>
<td>leaf</td>
<td nowrap><abbr title="string
">string</abbr></td>
{length = 1..255} {pattern = ^[a-z0-9\-_.]+$}">string</abbr></td>
<td nowrap>config</td>
<td></td>
<td>current</td>
Expand All @@ -271,7 +275,7 @@ <h1> Module: <font color=blue>ietf-ped-catalog</font>, Namespace:
</td>
<td>leaf</td>
<td nowrap><abbr title="string
">string</abbr></td>
{length = 1..255} {pattern = ^[a-z0-9\-_.]+$}">string</abbr></td>
<td nowrap>config</td>
<td></td>
<td>current</td>
Expand All @@ -285,7 +289,7 @@ <h1> Module: <font color=blue>ietf-ped-catalog</font>, Namespace:
</td>
<td>leaf</td>
<td nowrap><abbr title="string
">string</abbr></td>
{length = 1..255} {pattern = ^[abv0-9\-_.]+$}">string</abbr></td>
<td nowrap>config</td>
<td></td>
<td>current</td>
Expand Down Expand Up @@ -344,7 +348,7 @@ <h1> Module: <font color=blue>ietf-ped-catalog</font>, Namespace:
</td>
<td>leaf</td>
<td nowrap><abbr title="string
">string</abbr></td>
{length = 1..255} {pattern = ^[a-z0-9\-_.]+$}">string</abbr></td>
<td nowrap>config</td>
<td></td>
<td>current</td>
Expand All @@ -357,8 +361,9 @@ <h1> Module: <font color=blue>ietf-ped-catalog</font>, Namespace:
</div>
</td>
<td>leaf</td>
<td nowrap><abbr title="string
">string</abbr></td>
<td nowrap><abbr title="inet:uri
string
">inet:uri</abbr></td>
<td nowrap>config</td>
<td>?</td>
<td>current</td>
Expand All @@ -372,7 +377,7 @@ <h1> Module: <font color=blue>ietf-ped-catalog</font>, Namespace:
</td>
<td>leaf</td>
<td nowrap><abbr title="string
">string</abbr></td>
{length = 1..255} {pattern = ^[a-z0-9\-_.]+$}">string</abbr></td>
<td nowrap>config</td>
<td></td>
<td>current</td>
Expand All @@ -386,7 +391,7 @@ <h1> Module: <font color=blue>ietf-ped-catalog</font>, Namespace:
</td>
<td>leaf</td>
<td nowrap><abbr title="string
">string</abbr></td>
{length = 1..255} {pattern = ^[a-z0-9\-_.]+$}">string</abbr></td>
<td nowrap>config</td>
<td></td>
<td>current</td>
Expand All @@ -400,7 +405,7 @@ <h1> Module: <font color=blue>ietf-ped-catalog</font>, Namespace:
</td>
<td>leaf</td>
<td nowrap><abbr title="string
">string</abbr></td>
{length = 1..32} {pattern = ^[abv0-9\-_.]+$}">string</abbr></td>
<td nowrap>config</td>
<td></td>
<td>current</td>
Expand Down Expand Up @@ -445,7 +450,7 @@ <h1> Module: <font color=blue>ietf-ped-catalog</font>, Namespace:
</td>
<td>leaf</td>
<td nowrap><abbr title="string
">string</abbr></td>
{length = 1..255} {pattern = ^[a-z0-9\-_.]+$}">string</abbr></td>
<td nowrap>config</td>
<td></td>
<td>current</td>
Expand Down Expand Up @@ -505,7 +510,7 @@ <h1> Module: <font color=blue>ietf-ped-catalog</font>, Namespace:
</td>
<td>leaf</td>
<td nowrap><abbr title="string
">string</abbr></td>
{length = 1..255} {pattern = ^[a-z0-9\-_.]+$}">string</abbr></td>
<td nowrap>config</td>
<td></td>
<td>current</td>
Expand All @@ -528,12 +533,12 @@ <h1> Module: <font color=blue>ietf-ped-catalog</font>, Namespace:
<td nowrap>
<div id=9999 class=tier6>
<a class="leaf">&nbsp;</a>
<abbr title="Name of SUT connectin point to which this probe should be connected"> <em> connection-point-ref </em></abbr>
<abbr title="Name of SUT connectin point to which this probe should be connected (same as specified in the SUT's VNF/NS descriptor)"> <em> connection-point-ref </em></abbr>
</div>
</td>
<td>leaf</td>
<td nowrap><abbr title="string
">string</abbr></td>
{length = 1..255} {pattern = ^[a-z0-9\-_.:]+$}">string</abbr></td>
<td nowrap>config</td>
<td>?</td>
<td>current</td>
Expand All @@ -546,8 +551,9 @@ <h1> Module: <font color=blue>ietf-ped-catalog</font>, Namespace:
</div>
</td>
<td>leaf</td>
<td nowrap><abbr title="string
">string</abbr></td>
<td nowrap><abbr title="inet:ipv4-prefix
string
{pattern = (([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))}">inet:ipv4-prefix</abbr></td>
<td nowrap>config</td>
<td>?</td>
<td>current</td>
Expand Down Expand Up @@ -578,7 +584,7 @@ <h1> Module: <font color=blue>ietf-ped-catalog</font>, Namespace:
</td>
<td>leaf</td>
<td nowrap><abbr title="string
">string</abbr></td>
{length = 1..255} {pattern = ^[a-z0-9\-_.]+$}">string</abbr></td>
<td nowrap>config</td>
<td></td>
<td>current</td>
Expand Down Expand Up @@ -643,7 +649,7 @@ <h1> Module: <font color=blue>ietf-ped-catalog</font>, Namespace:
</td>
<td>leaf</td>
<td nowrap><abbr title="string
">string</abbr></td>
{length = 1..255} {pattern = ^[a-z0-9\-_.]+$}">string</abbr></td>
<td nowrap>config</td>
<td></td>
<td>current</td>
Expand All @@ -657,7 +663,7 @@ <h1> Module: <font color=blue>ietf-ped-catalog</font>, Namespace:
</td>
<td>leaf</td>
<td nowrap><abbr title="string
">string</abbr></td>
{length = 1..255} {pattern = ^[a-z0-9\-_.]+$}">string</abbr></td>
<td nowrap>config</td>
<td></td>
<td>current</td>
Expand All @@ -671,7 +677,7 @@ <h1> Module: <font color=blue>ietf-ped-catalog</font>, Namespace:
</td>
<td>leaf</td>
<td nowrap><abbr title="string
">string</abbr></td>
{length = 1..32} {pattern = ^[abv0-9\-_.]+$}">string</abbr></td>
<td nowrap>config</td>
<td></td>
<td>current</td>
Expand Down
4 changes: 2 additions & 2 deletions models/doc/ietf-ped-catalog.tree
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module: ietf-ped-catalog
+--rw author? string
+--rw targets* [id]
| +--rw id string
| +--rw uri? string
| +--rw uri? inet:uri
| +--rw vendor-ref string
| +--rw name-ref string
| +--rw version-ref string
Expand All @@ -23,7 +23,7 @@ module: ietf-ped-catalog
| +--rw id string
| +--rw container-image string
| +--rw connection-point-ref? string
| +--rw address? string
| +--rw address? inet:ipv4-prefix
+--rw parameters* [id]
+--rw id string
+--rw (node-ref)
Expand Down
35 changes: 19 additions & 16 deletions models/doc/ietf-ped-catalog.uml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,18 @@ hide <<leafref>> stereotype
hide <<leafref>> circle
page 1x1
Title ietf-ped-catalog
note top of pe_ietf_ped_catalog : <b>Namespace: </b> urn:ietf:params:xml:ns:yang:ietf-ped-catalog \n<b>Prefix: </b> pe \n<b>Organization : </b>\nPaderborn University \n<b>Contact : </b>\nManuel Peuster <[email protected]> \n<b>Revision : </b> 2019-02-21 \n
package "inet:ietf-inet-types" as inet_ietf_inet_types {
}
note top of pe_ietf_ped_catalog : <b>Namespace: </b> urn:ietf:params:xml:ns:yang:ietf-ped-catalog \n<b>Prefix: </b> pe \n<b>Organization : </b>\nPaderborn University \n<b>Contact : </b>\nManuel Peuster <[email protected]> \n<b>Revision : </b> 2019-03-08 \n
package "pe:ietf-ped-catalog" as pe_ietf_ped_catalog {
inet_ietf_inet_types +-- pe_ietf_ped_catalog
class "ietf-ped-catalog" as ietf_ped_catalog << (M, #33CCFF) module>>
class "time-in-seconds" as time_in_seconds << (T, YellowGreen) typedef>>
time_in_seconds : uint64
class "vendor-name-version-id-ref" as ietf_ped_catalog_I_vendor_name_version_id_ref_grouping <<(G,Lime) grouping>>
ietf_ped_catalog_I_vendor_name_version_id_ref_grouping : vendor-ref : string {mandatory}
ietf_ped_catalog_I_vendor_name_version_id_ref_grouping : name-ref : string {mandatory}
ietf_ped_catalog_I_vendor_name_version_id_ref_grouping : version-ref : string {mandatory}
ietf_ped_catalog_I_vendor_name_version_id_ref_grouping : vendor-ref : string {length = 1..255} {pattern = ^[a-z0-9\-_.]+$} {mandatory}
ietf_ped_catalog_I_vendor_name_version_id_ref_grouping : name-ref : string {length = 1..255} {pattern = ^[a-z0-9\-_.]+$} {mandatory}
ietf_ped_catalog_I_vendor_name_version_id_ref_grouping : version-ref : string {length = 1..32} {pattern = ^[abv0-9\-_.]+$} {mandatory}
class "generic-description" as ietf_ped_catalog_I_generic_description_grouping <<(G,Lime) grouping>>
ietf_ped_catalog_I_generic_description_grouping : description : string
class "expandable-parameter-float" as ietf_ped_catalog_I_expandable_parameter_float_grouping <<(G,Lime) grouping>>
Expand Down Expand Up @@ -49,15 +52,15 @@ class "vector" as ietf_ped_catalog_I_expandable_parameter_string_I_parameter_I_v
ietf_ped_catalog_I_expandable_parameter_string_I_parameter .. ietf_ped_catalog_I_expandable_parameter_string_I_parameter_I_vector_case : choice parameter
ietf_ped_catalog_I_expandable_parameter_string_I_parameter_I_vector_case : vector []: string
class "sut-ref" as ietf_ped_catalog_I_sut_ref_grouping <<(G,Lime) grouping>>
ietf_ped_catalog_I_sut_ref_grouping : id : string
ietf_ped_catalog_I_sut_ref_grouping : uri : string
ietf_ped_catalog_I_sut_ref_grouping : id : string {length = 1..255} {pattern = ^[a-z0-9\-_.]+$} {mandatory}
ietf_ped_catalog_I_sut_ref_grouping : uri : inet:uri
ietf_ped_catalog_I_sut_ref_grouping : vendor-name-version-id-ref {uses}
ietf_ped_catalog_I_sut_ref_grouping : generic-description {uses}
class "probe" as ietf_ped_catalog_I_probe_grouping <<(G,Lime) grouping>>
ietf_ped_catalog_I_probe_grouping : id : string
ietf_ped_catalog_I_probe_grouping : id : string {length = 1..255} {pattern = ^[a-z0-9\-_.]+$} {mandatory}
ietf_ped_catalog_I_probe_grouping : container-image : string {mandatory}
ietf_ped_catalog_I_probe_grouping : connection-point-ref : string
ietf_ped_catalog_I_probe_grouping : address : string
ietf_ped_catalog_I_probe_grouping : connection-point-ref : string {length = 1..255} {pattern = ^[a-z0-9\-_.:]+$}
ietf_ped_catalog_I_probe_grouping : address : inet:ipv4-prefix
class "node-command-parameter" as ietf_ped_catalog_I_node_command_parameter_grouping <<(G,Lime) grouping>>
class "cmd-start" as ietf_ped_catalog_I_node_command_parameter_I_cmd_start <<container>>
ietf_ped_catalog_I_node_command_parameter_grouping *-- "1" ietf_ped_catalog_I_node_command_parameter_I_cmd_start
Expand All @@ -82,15 +85,15 @@ class "io-bw" as ietf_ped_catalog_I_node_resource_parameter_I_io_bw <<container
ietf_ped_catalog_I_node_resource_parameter_grouping *-- "1" ietf_ped_catalog_I_node_resource_parameter_I_io_bw
ietf_ped_catalog_I_node_resource_parameter_I_io_bw : expandable-parameter-float {uses}
class "experiment" as ietf_ped_catalog_I_experiment_grouping <<(G,Lime) grouping>>
ietf_ped_catalog_I_experiment_grouping : id : string
ietf_ped_catalog_I_experiment_grouping : id : string {length = 1..255} {pattern = ^[a-z0-9\-_.]+$} {mandatory}
ietf_ped_catalog_I_experiment_grouping : repetitions : uint64
ietf_ped_catalog_I_experiment_grouping : time-limit : time-in-seconds
class "probes" as ietf_ped_catalog_I_experiment_I_probes << (L, #FF7700) list>>
ietf_ped_catalog_I_experiment_grouping *-- "0..N" ietf_ped_catalog_I_experiment_I_probes
ietf_ped_catalog_I_experiment_I_probes : probe {uses}
class "parameters" as ietf_ped_catalog_I_experiment_I_parameters << (L, #FF7700) list>>
ietf_ped_catalog_I_experiment_grouping *-- "0..N" ietf_ped_catalog_I_experiment_I_parameters
ietf_ped_catalog_I_experiment_I_parameters : +id : string {key}
ietf_ped_catalog_I_experiment_I_parameters : +id : string {length = 1..255} {pattern = ^[a-z0-9\-_.]+$} {key}
class "node-ref" as ietf_ped_catalog_I_experiment_I_parameters_I_node_ref <<choice>>
ietf_ped_catalog_I_experiment_I_parameters .. ietf_ped_catalog_I_experiment_I_parameters_I_node_ref : choice
class "vnf" as ietf_ped_catalog_I_experiment_I_parameters_I_node_ref_I_vnf_case <<case>>
Expand All @@ -104,11 +107,11 @@ ietf_ped_catalog_I_experiment_I_parameters_I_node_ref_I_probe_case : probe-ref :
ietf_ped_catalog_I_experiment_I_parameters : node-command-parameter {uses}
ietf_ped_catalog_I_experiment_I_parameters : node-resource-parameter {uses}
class "ped" as ietf_ped_catalog_I_ped_grouping <<(G,Lime) grouping>>
ietf_ped_catalog_I_ped_grouping : +id : string {key}
ietf_ped_catalog_I_ped_grouping : +id : string {length = 1..255} {pattern = ^[a-z0-9\-_.]+$} {key}
ietf_ped_catalog_I_ped_grouping : descriptor-version : decimal64 = 1.0
ietf_ped_catalog_I_ped_grouping : vendor : string {mandatory}
ietf_ped_catalog_I_ped_grouping : name : string {mandatory}
ietf_ped_catalog_I_ped_grouping : version : string {mandatory}
ietf_ped_catalog_I_ped_grouping : vendor : string {length = 1..255} {pattern = ^[a-z0-9\-_.]+$} {mandatory}
ietf_ped_catalog_I_ped_grouping : name : string {length = 1..255} {pattern = ^[a-z0-9\-_.]+$} {mandatory}
ietf_ped_catalog_I_ped_grouping : version : string {length = 1..255} {pattern = ^[abv0-9\-_.]+$} {mandatory}
ietf_ped_catalog_I_ped_grouping : generic-description {uses}
ietf_ped_catalog_I_ped_grouping : author : string
class "targets" as ietf_ped_catalog_I_ped_I_targets << (L, #FF7700) list>>
Expand Down Expand Up @@ -142,6 +145,6 @@ ietf_ped_catalog_I_ped_I_targets --> ietf_ped_catalog_I_sut_ref_grouping : uses
ietf_ped_catalog_I_ped_I_experiments --> ietf_ped_catalog_I_experiment_grouping : uses
ietf_ped_catalog_I_ped_catalog_I_peds --> ietf_ped_catalog_I_ped_grouping : uses
center footer
<size:20> UML Generated : 2019-03-07 16:30 </size>
<size:20> UML Generated : 2019-03-08 14:07 </size>
endfooter
@enduml

0 comments on commit 4344f29

Please sign in to comment.