X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=models%2Fyang%2Fvnfd-base.yang;h=ce637d273c0e6ce56be5f9dcbf5b104176340e6d;hp=75dcadc471d1c252934eb7fde349fa3f1630ec99;hb=ebba267848f3bbde5b9a54021ac3f7bc38969481;hpb=a75e0bb18141e1c9b25b0e481a3ae36577e319a0 diff --git a/models/yang/vnfd-base.yang b/models/yang/vnfd-base.yang index 75dcadc..ce637d2 100644 --- a/models/yang/vnfd-base.yang +++ b/models/yang/vnfd-base.yang @@ -62,8 +62,9 @@ module vnfd-base } leaf port-security-enabled { - description "Enables the port security for the port"; + description "Enables the port security for the port."; type boolean; + default true; } } @@ -94,15 +95,17 @@ module vnfd-base description "Specifies the type of virtual interface between VM and host. - VIRTIO : Use the traditional VIRTIO interface. + PARAVIRT : Use the default paravirtualized interface for the VIM (virtio, vmxnet3, etc.). + VIRTIO : Deprecated! Use the traditional VIRTIO interface. PCI-PASSTHROUGH : Use PCI-PASSTHROUGH interface. SR-IOV : Use SR-IOV interface. E1000 : Emulate E1000 interface. RTL8139 : Emulate RTL8139 interface. PCNET : Emulate PCNET interface. - OM-MGMT : Deprecated! Use VIRTIO instead and set the VNF management interface at vnfd:mgmt-interface:cp"; + OM-MGMT : Deprecated! Use PARAVIRT instead and set the VNF management interface at vnfd:mgmt-interface:cp"; type enumeration { + enum PARAVIRT; enum OM-MGMT; enum PCI-PASSTHROUGH; enum SR-IOV; @@ -111,7 +114,7 @@ module vnfd-base enum RTL8139; enum PCNET; } - default "VIRTIO"; + default "PARAVIRT"; } leaf vpci { @@ -298,11 +301,12 @@ module vnfd-base key "id-ref"; description "List of internal connection points in this VLD"; leaf id-ref { - description "reference to the internal connection point id"; + description "Reference to the internal connection point id"; type leafref { path "../../../vdu/internal-connection-point/id"; } } + leaf ip-address { description "IP address of the internal connection point"; type inet:ip-address; @@ -380,6 +384,16 @@ module vnfd-base type string; } + leaf pdu-type { + description + "Type of PDU. If this field exists, the deployment unit must be + understood as a PDU, not as a VDU. This field is used to identify + the category of PDU instances to be used at instantiation time. For + the instantiation to be successful, there must be available + PDU instances of this type in the selected datacenter."; + type string; + } + leaf count { description "Number of instances of VDU"; type uint64; @@ -431,6 +445,30 @@ module vnfd-base uses manotypes:vca-configuration; } + list monitoring-param { + description + "List of VDU-related monitoring parameters at NFVI level"; + key id; + leaf id { + description "The unique id of the monitoring param at VDU level"; + type string; + } + + leaf nfvi-metric { + description "The associated NFVI metric to be monitored"; + type manotypes:nfvi-metric-type; + } + + leaf interface-name-ref { + description + "Reference to a VDU interface name. Applicable only when the nfvi-metric + refers to an interface and not to the VM"; + type leafref { + path "../../interface/name"; + } + } + } + choice cloud-init-input { description "Indicates how the contents of cloud-init script are provided. @@ -492,6 +530,14 @@ module vnfd-base type uint32; } + leaf mgmt-interface { + description + "Flag to indicate that this is the mgmt interface + to be used for VDU configuration"; + type boolean; + default false; + } + leaf type { description "Type of the Interface"; @@ -590,7 +636,280 @@ module vnfd-base type string; } - uses manotypes:monitoring-param; + uses manotypes:http-endpoints; + + list scaling-group-descriptor { + description + "scaling group descriptor within the VNF. + The scaling group defines a group of VDUs, + and the ratio of VDUs in the VNF + that is used as target for scaling action"; + + key "name"; + + leaf name { + description "Name of this scaling group."; + type string; + } + + list scaling-policy { + + key "name"; + + leaf name { + description + "Name of the scaling policy"; + type string; + } + + leaf scaling-type { + description + "Type of scaling"; + type manotypes:scaling-policy-type; + } + + leaf enabled { + description + "Specifies if the scaling policy can be applied"; + type boolean; + default true; + } + + leaf scale-in-operation-type { + description + "Operation to be applied to check between scaling criterias to + check if the scale in threshold condition has been met. + Defaults to AND"; + type manotypes:scaling-criteria-operation; + default AND; + } + + leaf scale-out-operation-type { + description + "Operation to be applied to check between scaling criterias to + check if the scale out threshold condition has been met. + Defauls to OR"; + type manotypes:scaling-criteria-operation; + default OR; + } + + leaf threshold-time { + description + "The duration for which the criteria must hold true"; + type uint32; + mandatory true; + } + + leaf cooldown-time { + description + "The duration after a scaling-in/scaling-out action has been + triggered, for which there will be no further optional"; + type uint32; + mandatory true; + } + + list scaling-criteria { + description + "list of conditions to be met for generating scaling + requests"; + key "name"; + + leaf name { + type string; + } + + leaf scale-in-threshold { + description + "Value below which scale-in requests are generated"; + type uint64; + } + + leaf scale-in-relational-operation { + description + "The relational operator used to compare the monitoring param + against the scale-in-threshold."; + type manotypes:relational-operation-type; + default LE; + } + + leaf scale-out-threshold { + description + "Value above which scale-out requests are generated"; + type uint64; + } + + leaf scale-out-relational-operation { + description + "The relational operator used to compare the monitoring param + against the scale-out-threshold."; + type manotypes:relational-operation-type; + default GE; + } + + leaf vnf-monitoring-param-ref { + description + "Reference to the VNF level monitoring parameter + that is aggregated"; + type leafref { + path "../../../../monitoring-param/id"; + } + } + } + } + + list vdu { + description "List of VDUs in this scaling group"; + key "vdu-id-ref"; + + leaf vdu-id-ref { + description "Reference to the VDU id"; + type leafref { + path "../../../vdu/id"; + } + } + + leaf count { + description + "count of this VDU id within this scaling group. + The count allows to define the number of instances + when a scaling action targets this scaling group"; + type uint32; + default 1; + } + } + + leaf min-instance-count { + description + "Minimum instances of the scaling group which are allowed. + These instances are created by default when the network service + is instantiated."; + type uint32; + default 0; + } + + leaf max-instance-count { + description + "Maximum instances of this scaling group that are allowed + in a single network service. The network service scaling + will fail, when the number of service group instances + exceed the max-instance-count specified."; + type uint32; + default 10; + } + + list scaling-config-action { + description "List of scaling config actions"; + key "trigger"; + + leaf trigger { + description "scaling trigger"; + type manotypes:scaling-trigger; + } + + leaf vnf-config-primitive-name-ref { + description "Reference to the VNF config primitive"; + type leafref { + path "../../../vnf-configuration/config-primitive/name"; + } + } + } + } + + list monitoring-param { + description + "List of monitoring parameters at the network service level"; + key id; + leaf id { + type string; + } + + leaf name { + type string; + } + + uses manotypes:monitoring-param-aggregation; + + choice monitoring-type { + description + "Defines the type of monitoring param to be used: + * vdu-monitorin-param: VDU-related metric (from NFVI) + * vnf-metric: VNF-related metric (from VCA) + * vdu-metric: VDU-related metric (from VCA) + "; + + case vdu-monitoring-param { + description "VDU-related metric from the infrastructure"; + container vdu-monitoring-param { + leaf vdu-ref { + type leafref { + path "../../../vdu/id"; + } + } + leaf vdu-monitoring-param-ref { + type leafref { + path "../../../vdu[id = current()/../vdu-ref]/monitoring-param/id"; + } + } + } + } + + case vnf-metric { + description "VNF-related metric (from VCA)"; + container vnf-metric { + leaf vnf-metric-name-ref { + type leafref { + path "../../../vnf-configuration/metrics/name"; + } + } + } + } + + case vdu-metric { + description "VDU-related metric (from VCA)"; + container vdu-metric { + leaf vdu-ref { + type leafref { + path "../../../vdu/id"; + } + } + leaf vdu-metric-name-ref { + type leafref { + path "../../../vdu[id = current()/../vdu-ref]/vdu-configuration/metrics/name"; + } + } + } + } + + } + + leaf http-endpoint-ref { + type leafref { + path "../../http-endpoint/path"; + } + } + + leaf json-query-method { + type manotypes:json-query-method; + default "NAMEKEY"; + } + + container json-query-params { + leaf json-path { + description + "The jsonpath to use to extract value from JSON structure"; + type string; + } + leaf object-path { + description + "The objectpath to use to extract value from JSON structure"; + type string; + } + } + + uses manotypes:monitoring-param-ui-data; + uses manotypes:monitoring-param-value; + + } list placement-groups { description "List of placement groups at VNF level";