X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=models%2Fyang%2Fvnfr.yang;h=aff7af4e8e88aedb6f76126030ddae966d58dce8;hp=d47c6a733bfda7f53eda523e8192449ff3bed568;hb=400907817e6c038a65c3e04707e264959c3dc281;hpb=e27e0b2fcd1d2278a5f82dc8b090aa8bcd0177b0 diff --git a/models/yang/vnfr.yang b/models/yang/vnfr.yang index d47c6a7..aff7af4 100644 --- a/models/yang/vnfr.yang +++ b/models/yang/vnfr.yang @@ -27,10 +27,6 @@ module vnfr prefix "manotypes"; } - import rw-pb-ext { - prefix "rwpb"; - } - import vnfd-base { prefix "vnfd-base"; } @@ -72,6 +68,36 @@ module vnfr "Derived from earlier versions of base YANG files"; } + typedef vdu-operational-status { + type enumeration { + enum init; + enum vm-init-phase; + enum vm-alloc-pending; + enum running; + enum upgrading; + enum terminate; + enum vl-terminate-phase; + enum terminated; + enum failed; + } + } + + typedef vnf-operational-status { + type enumeration { + enum pre-init; + enum init; + enum vl-init-phase; + enum vm-init-phase; + enum running; + enum upgrading; // Experimental + enum terminate; + enum vm-terminate-phase; + enum vl-terminate-phase; + enum terminated; + enum failed; + } + } + grouping placement-group-info { list placement-groups-info { description @@ -85,7 +111,6 @@ module vnfr } } - grouping virtual-interface { container virtual-interface { description @@ -172,6 +197,12 @@ module vnfr augment "/rw-project:project" { container vnfr-catalog { + leaf schema-version { + description "Schema version for the VNFR. If unspecified, it assumes v3.0"; + type string; + default "v3.0"; + } + config false; list vnfr { description @@ -258,9 +289,9 @@ module vnfr } // Use parameters provided here to configure this VNF - container vnf-configuration { - uses manotypes:vca-configuration; - } + container vnf-configuration { + uses manotypes:vca-configuration; + } // Mainly used by Mon-params & dashboard url container mgmt-interface { @@ -331,6 +362,7 @@ module vnfr "IP address assigned to the external connection point"; type inet:ip-address; } + leaf mac-address { description "MAC address assigned to the external connection point"; @@ -364,8 +396,6 @@ module vnfr description "Short Unique name of the VDU This will be of the format NSR name-ShortnedString-VDUname NSR name and VDU name shall be constrained to 10 characters"; - rwpb:field-inline "true"; - rwpb:field-string-max 64; type string; } @@ -413,9 +443,9 @@ module vnfr uses manotypes:supplemental-boot-data; - container vdu-configuration { - uses manotypes:vca-configuration; - } + container vdu-configuration { + uses manotypes:vca-configuration; + } list volumes { key "name"; @@ -450,6 +480,7 @@ module vnfr "IP address assigned to the internal connection point"; type inet:ip-address; } + leaf mac-address { description "MAC address assigned to the internal connection point"; @@ -464,79 +495,69 @@ module vnfr uses associated-virtual-cps; } - list interface { - description - "List of interfaces (internal and external) for the VNF"; - key name; - - leaf name { + list interface { description - "Name of the interface. Note that this - name has only local significance to the VDU."; - type string; - } + "List of interfaces (internal and external) for the VNF"; + key name; - leaf position { - description - "Explicit Position of the interface within the list"; - type uint32; - } + leaf name { + description + "Name of the interface. Note that this + name has only local significance to the VDU."; + type string; + } - leaf type { - description - "Type of the Interface"; + leaf position { + description + "Explicit Position of the interface within the list"; + type uint32; + } - type vnfd-base:interface-type; + leaf type { + description + "Type of the Interface"; - default "EXTERNAL"; - } - choice connection-point-type { - case internal { - leaf internal-connection-point-ref { - description - "Leaf Ref to the particular internal connection point"; - type leafref { - path "../../internal-connection-point/id"; + type vnfd-base:interface-type; + + default "EXTERNAL"; + } + choice connection-point-type { + case internal { + leaf internal-connection-point-ref { + description + "Leaf Ref to the particular internal connection point"; + type leafref { + path "../../internal-connection-point/id"; + } } } - } - case external { - leaf external-connection-point-ref { - description - "Leaf Ref to the particular external connection point"; - type leafref { - path "../../../connection-point/name"; + case external { + leaf external-connection-point-ref { + description + "Leaf Ref to the particular external connection point"; + type leafref { + path "../../../connection-point/name"; + } } } } + uses virtual-interface; } - uses virtual-interface; - } - - leaf operational-status { - description - "The operational status of the VDU - init : The VDU has just started. - vm-init-phase : The VDUs in the VNF is being created in VIM. - vm-alloc-pending : The VM alloc is pending in VIM - running : The VDU is active in VM - terminate : The VDU is being terminated - vm-terminate-phase : The VDU in the VNF is being terminated in VIM. - terminated : The VDU is in the terminated state. - failed : The VDU instantiation failed. - "; - type enumeration { - rwpb:enum-type "VduOperationalStatus"; - enum init; - enum vm-init-phase; - enum vm-alloc-pending; - enum running; - enum terminate; - enum vl-terminate-phase; - enum terminated; - enum failed; - } + leaf operational-status { + description + "The operational status of the VDU + init : The VDU has just started. + vm-init-phase : The VDUs in the VNF is being created in VIM. + vm-alloc-pending : The VM alloc is pending in VIM + running : The VDU is active in VM + upgrading : The VDU is being upgraded (EXPERIMENTAL) + terminate : The VDU is being terminated + vm-terminate-phase : The VDU in the VNF is being terminated in VIM. + terminated : The VDU is in the terminated state. + failed : The VDU instantiation failed. + "; + type vdu-operational-status; } uses placement-group-info; @@ -558,20 +579,7 @@ module vnfr terminated : The VNF is in the terminated state. failed : The VNF instantiation failed "; - - type enumeration { - rwpb:enum-type "VnfrOperationalStatus"; - enum pre-init; - enum init; - enum vl-init-phase; - enum vm-init-phase; - enum running; - enum terminate; - enum vm-terminate-phase; - enum vl-terminate-phase; - enum terminated; - enum failed; - } + type vnf-operational-status; } leaf config-status { @@ -599,7 +607,6 @@ module vnfr uses placement-group-info; container cloud-config { - rwpb:msg-new VnfrCloudConfig; uses manotypes:cloud-config; } }