X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=models%2Fplugins%2Fyang%2Fvnfd.yang;h=1dfb459f4e6eee4c64d7ceafdcdc626e7f5ba497;hb=27111f970f0b039e81efdddc8bc3bbe94edf41c8;hp=32a87d26bff27be83134a6f723085ca4e0c7f825;hpb=07b439824b5eac4dc760ce56b52fbdcf5539db4c;p=osm%2FSO.git diff --git a/models/plugins/yang/vnfd.yang b/models/plugins/yang/vnfd.yang index 32a87d26..1dfb459f 100644 --- a/models/plugins/yang/vnfd.yang +++ b/models/plugins/yang/vnfd.yang @@ -59,7 +59,7 @@ module vnfd } leaf short-name { - description "Short name of the connection point"; + description "Short name to appear as label in the UI"; type string; } @@ -70,7 +70,6 @@ module vnfd leaf port-security-enabled { description "Enables the port security for the port"; type boolean; - default true; } } @@ -133,7 +132,7 @@ module vnfd } leaf short-name { - description "VNFD short name."; + description "Short name to appear as label in the UI"; type string; } @@ -181,7 +180,7 @@ module vnfd "Use the default management interface on this VDU."; leaf vdu-id { type leafref { - path "/vnfd:vnfd-catalog/vnfd:vnfd/vnfd:vdu/vnfd:id"; + path "../../vdu/id"; } } } @@ -191,7 +190,7 @@ module vnfd "Use the ip address associated with this connection point."; leaf cp { type leafref { - path "/vnfd:vnfd-catalog/vnfd:vnfd/vnfd:connection-point/vnfd:name"; + path "../../connection-point/name"; } } } @@ -228,7 +227,7 @@ module vnfd description "List of Internal Virtual Link Descriptors (VLD). The internal VLD describes the basic topology of - the connectivity (e.g. E-LAN, E-Line, E-Tree) + the connectivity such as E-LAN, E-Line, E-Tree. between internal VNF components of the system."; leaf id { @@ -242,11 +241,12 @@ module vnfd } leaf short-name { - description "Short name of the internal VLD"; + description "Short name to appear as label in the UI"; type string; } leaf description { + description "Description of internal VLD."; type string; } @@ -277,20 +277,40 @@ module vnfd } } uses manotypes:provider-network; + choice init-params { + description "Extra parameters for VLD instantiation"; + + case vim-network-ref { + leaf vim-network-name { + description + "Name of network in VIM account. This is used to indicate + pre-provisioned network name in cloud account."; + type string; + } + } + + case vim-network-profile { + leaf ip-profile-ref { + description "Named reference to IP-profile object"; + type string; + } + } + + } } + uses manotypes:ip-profile-list; + list connection-point { key "name"; description "List for external connection points. Each VNF has one - or more external connection points. As the name - implies that external connection points are used for - connecting the VNF to other VNFs or to external networks. - Each VNF exposes these connection points to the - orchestrator. The orchestrator can construct network - services by connecting the connection points between - different VNFs. The NFVO will use VLDs and VNFFGs at - the network service level to construct network services."; + or more external connection points that connect the VNF + to other VNFs or to external networks. Each VNF exposes + connection points to the orchestrator, which can construct + network services by connecting the connection points + between different VNFs. The NFVO will use VLDs and VNFFGs + at the network service level to construct network services."; uses common-connection-point; } @@ -344,13 +364,13 @@ module vnfd choice cloud-init-input { description - "Indicates how the contents of cloud-init script are provided. - There are 2 choices - inline or in a file"; + "Indicates how the contents of cloud-init script are provided. + There are 2 choices - inline or in a file"; case inline { leaf cloud-init { description - "Contents of cloud-init script, provided inline, in cloud-config format"; + "Contents of cloud-init script, provided inline, in cloud-config format"; type string; } } @@ -358,13 +378,13 @@ module vnfd case filename { leaf cloud-init-file { description - "Name of file with contents of cloud-init script in cloud-config format"; - type string; + "Name of file with contents of cloud-init script in cloud-config format"; + type string; } } } - uses manotypes:custom-boot-data; + uses manotypes:supplemental-boot-data; list internal-connection-point { key "id"; @@ -372,17 +392,11 @@ module vnfd "List for internal connection points. Each VNFC has zero or more internal connection points. Internal connection points are used for connecting - the VNF components internal to the VNF. If a VNF + the VNF with components internal to the VNF. If a VNF has only one VNFC, it may not have any internal connection points."; uses common-connection-point; - - leaf internal-vld-ref { - type leafref { - path "../../../internal-vld/id"; - } - } } list internal-interface { @@ -415,7 +429,8 @@ module vnfd leaf name { description "Name of the external interface. Note that - this name has only local significance."; + this name has only local significance to + the VDU."; type string; } @@ -454,8 +469,8 @@ module vnfd leaf vdu-depends-on-ref { description - "Reference to the VDU that - source VDU depends."; + "Reference to the VDU on which + the source VDU depends."; type leafref { path "../../vdu/id"; } @@ -478,7 +493,7 @@ module vnfd description "Type of Service Function. NOTE: This needs to map with Service Function Type in ODL to - support VNFFG. Service Function Type is manadatory param in ODL + support VNFFG. Service Function Type is mandatory param in ODL SFC. This is temporarily set to string for ease of use"; type string; }