Commit f433737c authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files

Merge branch 'v2.7.1' into 'bug#244'

# Conflicts:
#   example-data/nfv-nsd.xml
#   src/yang/etsi-nfv-ns.yang
parents 0463e048 5e261d31
Pipeline #1287 passed with stage
in 0 seconds
...@@ -243,6 +243,99 @@ submodule etsi-nfv-common { ...@@ -243,6 +243,99 @@ submodule etsi-nfv-common {
"Ephemeral type of storage."; "Ephemeral type of storage.";
} }
identity forwarding-behaviour {
description
"Base identity for forwarding behaviour.";
}
identity all {
base forwarding-behaviour;
description
"Traffic flows shall be forwarded simultaneously to all CP
or SAP instances created from the referenced CP profile(s).";
}
identity lb {
base forwarding-behaviour;
description
"Traffic flows shall be forwarded to one CP or SAP instance
created from the referenced CP profile(s) selected based on
a load-balancing algorithm.";
}
identity vip-function {
description
"Indicates the function the virtual IP address is used for.";
}
identity high-availability {
base vip-function;
description
"High availability function.";
}
identity load-balancing {
base vip-function;
description
"Load balancing function.";
}
identity vnic-type {
description
"Describes the type of the virtual network interface realizing
the CPs instantiated from this CPD. This is used to determine
which mechanism driver(s) to be used to bind the port. Value:
• NORMAL
• VIRTIO
• DIRECT
• BAREMETAL
• VIRTIO-FORWARDER
• DIRECT-PHYSICAL
• SMART-NIC";
}
identity normal {
base vnic-type;
description
"Normal NIC.";
}
identity virtio {
base vnic-type;
description
"VirtIO NIC.";
}
identity direct {
base vnic-type;
description
"Direct NIC type.";
}
identity bare-metal {
base vnic-type;
description
"Bare metal NIC type.";
}
identity virtio-forwarder {
base vnic-type;
description
"VirtIO Forwarder NIC type.";
}
identity direct-physical {
base vnic-type;
description
"Direct physical NIC type.";
}
identity smart-nic {
base vnic-type;
description
"SmartNIC or Smart NIC type.";
}
/* /*
* Typedefs * Typedefs
*/ */
......
...@@ -415,56 +415,56 @@ submodule etsi-nfv-ns { ...@@ -415,56 +415,56 @@ submodule etsi-nfv-ns {
element"; element";
} }
list cpd-pool { list nfp-position-element {
key "id"; key "id";
description
"Describes a pool of descriptors of connection points
attached to one of the constituent VNFs and PNFs and/or
one of the SAPs of the parent NS or of a nested NS.";
reference
"GS NFV IFA014: Section 6.4.2.2 Vnffgd information
element";
leaf id { leaf id {
type string; type string;
description
"Identifier of this NfpPositionElemen information
element. It uniquely identifies an
NfpPositionElemen.";
reference
"GS NFV IFA014: Section 6.4.6.2 NfpPositionElement
information element";
} }
choice constituent-base-element-id { container desc {
mandatory "true"; choice constituent-base-element-id {
container vnf-profile { mandatory "true";
leaf vnf-profile-id { container vnf-profile {
must ". = deref(../../vnfd-profile-id)" { leaf vnf-profile-id {
} must ". = deref(../../vnfd-profile-id)" {
type leafref { }
path "../../../../../nsd/df/vnf-profile/id"; type leafref {
path "../../../../../../nsd/df/vnf-profile/id";
}
} }
} }
} container pnf-profile {
container pnf-profile { leaf pnf-profile-id {
leaf pnf-profile-id { must ". = deref(../../pnfd-profile-id)" {
must ". = deref(../../pnfd-profile-id)" { }
} type leafref {
type leafref { path "../../../../../../nsd/df/pnf-profile/id";
path "../../../../../nsd/df/pnf-profile/id"; }
} }
} }
} container ns-profile {
container ns-profile { leaf ns-profile-id {
leaf ns-profile-id { must ". = deref(../../ns-profile-id)" {
must ". = deref(../../ns-profile-id)" { }
} type leafref {
type leafref { path "../../../../../../nsd/df/ns-profile/id";
path "../../../../../nsd/df/ns-profile/id"; }
} }
} }
description
"Reference to the profile of an NS constituent.";
reference
"GS NFV IFA014: Section 6.4.8
CpdInConstituentElement information element";
} }
description
"Reference to the profile of an NS constituent.";
reference
"GS NFV IFA014: Section 6.4.8 CpdInConstituentElement
information element";
}
choice constituent-cpd-id { choice constituent-cpd-id {
container vnf { container vnf {
...@@ -480,10 +480,13 @@ submodule etsi-nfv-ns { ...@@ -480,10 +480,13 @@ submodule etsi-nfv-ns {
path "deref(../vnfd-id)/../nfv:ext-cpd/nfv:id"; path "deref(../vnfd-id)/../nfv:ext-cpd/nfv:id";
} }
} }
} container pnf {
container pnf { leaf pnfd-id {
leaf pnfd-id { must ". = deref(../../pnfd-profile-id)/../pnfd-id" {
must ". = deref(../../pnfd-profile-id)/../pnfd-id" { }
type leafref {
path "../../../../../../pnfd/id";
}
} }
type leafref { type leafref {
path "/nfv:nfv/nfv:pnfd/nfv:id"; path "/nfv:nfv/nfv:pnfd/nfv:id";
...@@ -494,42 +497,50 @@ submodule etsi-nfv-ns { ...@@ -494,42 +497,50 @@ submodule etsi-nfv-ns {
path "deref(../pnfd-id)/../nfv:ext-cpd/nfv:id"; path "deref(../pnfd-id)/../nfv:ext-cpd/nfv:id";
} }
} }
} container ns {
container ns { leaf nsd-id {
leaf nsd-id { must ". = deref(../../nested-ns-profile-id)/" +
must ". = deref(../../nested-ns-profile-id)/" + "../nsd-id" {
"../nsd-id" { }
type leafref {
path "../../../../../../nsd/id";
}
} }
leaf sap-cpd-id {
type leafref { type leafref {
path "../../../../../nsd/id"; path "deref(../nsd-id)/../sapd/id";
} }
}
leaf sap-cpd-id {
type leafref {
path "deref(../nsd-id)/../sapd/id";
} }
} }
description
"References the VNF external CPD for a given
VnfProfile, or the PNF external CPD for a given
PnfProfile, or a NS SAPD for a given NsProfile
identified by the constituentBaseElementId.";
reference
"GS NFV IFA014: Section 6.4.8.2
CpdInConstituentElement information element";
} }
description description
"A reference to the descriptor of a connection point "Identifies a CPD or SAPD in the context of a profile
attached to one of the constituent VNFs and PNFs or to of an NS constituent element.";
the descriptor of a NS SAP.";
reference reference
"GS NFV IFA014: Section 6.4.4.2 CpdPool information "GS NFV IFA014: Section 6.4.6.2 NfpPositionElement
element"; information element";
} }
description
"One or a pair of CPDs or SAPDs. These descriptors
shall be members of the CpdPool associated to the
parent VNFFG.";
reference
"GS NFV IFA014: Section 6.4.5.2 NfpPositionDesc
information element";
} }
list nfpd { list nfpd {
key "id"; key "id";
description
"The network forwarding path associated to the VNFFG.";
reference
"GS NFV IFA014: Section 6.4.2.2 Vnffgd information
element";
leaf id { leaf id {
type string; type string;
description description
...@@ -544,33 +555,17 @@ submodule etsi-nfv-ns { ...@@ -544,33 +555,17 @@ submodule etsi-nfv-ns {
type string; type string;
description description
"Provides an NFP classification and selection rule. "Provides an NFP classification and selection rule.
The rule may be expressed as a criteria constructed The rule may be expressed as a criteria constructed out
out of atomic assertions linked by Boolean operators of atomic assertions linked by Boolean operators AND,
AND, OR and NOT."; OR and NOT.";
reference reference
"GS NFV IFA014: Section 6.4.3.2 Nfpd information "GS NFV IFA014: Section 6.4.3.2 Nfpd information
element"; element";
} }
list position-desc-id { list position-desc {
key "id"; key "id";
description
"Describes a position in the NFP in terms of one or
more CP profiles and rules for distributing the
traffic among CP and SAP instances created from the
CPD or SAPD associated to these profiles. This shall
be connection point profile, which is either a CPD
associated with the VnfProfile of a constituent VNF,
or a CPD associated with the PnfProfile of a
constituent PNF, or a SAPD associated with the
NsProfile of a nested NS. The related VnfProfile,
PnfProfile and NsProfile shall be included in the
parent VNFFGD.";
reference
"GS NFV IFA014: Section 6.4.3.2 Nfpd information
element";
leaf id { leaf id {
type string; type string;
description description
...@@ -580,62 +575,64 @@ submodule etsi-nfv-ns { ...@@ -580,62 +575,64 @@ submodule etsi-nfv-ns {
information element"; information element";
} }
list cp-profile-id { leaf-list nfp-position-element-id {
key "id"; type leafref {
path "../../../nfp-position-element/id";
}
description
"References NfpPositionElement associated with one of the
constituent VNF Profile, PNF Profile or NS Profile of a
nested NS.";
reference
"GS NFV IFA014: Section 6.4.2.2 Vnffgd information
element";
}
leaf forwarding-behaviour {
type identityref {
base forwarding-behaviour;
}
description description
"References the profile of a connection point to be "Identifies a rule to apply to forward traffic to CP or
traversed by the traffic flows matching the criteria. SAP instances corresponding to the referenced CPD(s)
This shall be a connection point attached to one of and SAPD(s). The minimum list of rules to be supported
the constituent VNFs and PNFs of the parent VNFFG, shall include:
or a SAP of one of the constituent nested NSs of the • ALL = Traffic flows shall be forwarded simultaneously
parent VNFFG."; to all CP or SAP instances created from the
referenced CP profile(s).
• LB = Traffic flows shall be forwarded to one CP or SAP
instance created from the referenced CP profile(s)
selected based on a load-balancing algorithm.";
reference reference
"GS NFV IFA014: Section 6.4.5.2 NfpPositionDesc "GS NFV IFA014: Section 6.4.5.2 NfpPositionDesc
information element"; information element";
}
leaf id { leaf forwarding-behavior-input-parameters {
type string; type string;
description description
"Identifier of this CpProfile information element. "Provides input parameters to configure the forwarding
It uniquely identifies a CpProfile."; behaviour (e.g. identifies a load balancing
reference algorithm).";
"GS NFV IFA014: Section 6.4.6.2 CpProfile reference
information element"; "GS NFV IFA014: Section 6.4.5.2 NfpPositionDesc
} information element";
list constituent-profile-elements {
key "id";
description
"Specifies the constituents of the CpProfile.";
reference
"GS NFV IFA014: Section 6.4.6.2 CpProfile
information element";
leaf id {
type string;
description
"Specifies the constituents of the CpProfile.";
reference
"GS NFV IFA014: Section 6.4.7.2
ConstituentProfileElements information element";
}
leaf cpd-id {
type string;
description
"References the VNF external CPD for a given
VnfProfile, or the PNF external CPD for a given
PnfProfile, or a NS SAPD for a give NsProfile
identified by the constituentBasedElementId.";
reference
"GS NFV IFA014: Section 6.4.7.2
ConstituentProfileElements information element";
}
}
} }
description
"Describes a position in the NFP in terms of one or more
CPDs and SAPDs and rules for distributing the traffic
among CP and SAP instances created from these CPDs
and SAPDs.";
reference
"GS NFV IFA014: Section 6.4.3.2 Nfpd information
element";
} }
description
"The network forwarding path associated to the VNFFG.";
reference
"GS NFV IFA014: Section 6.4.2.2 Vnffgd information
element";
} }
} }
......
...@@ -56,6 +56,7 @@ submodule etsi-nfv-vnf { ...@@ -56,6 +56,7 @@ submodule etsi-nfv-vnf {
} }
leaf support-mandatory { leaf support-mandatory {
status "deprecated";
default "false"; default "false";
type boolean; type boolean;
description description
...@@ -273,7 +274,7 @@ submodule etsi-nfv-vnf { ...@@ -273,7 +274,7 @@ submodule etsi-nfv-vnf {
VirtualNetworkInterfaceRequirements information element"; VirtualNetworkInterfaceRequirements information element";
} }
leaf-list order { leaf order {
type uint32; type uint32;
description description
"The order of the NIC to be assigned on the compute "The order of the NIC to be assigned on the compute
...@@ -292,6 +293,27 @@ submodule etsi-nfv-vnf { ...@@ -292,6 +293,27 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.4, VduCpd information "GS NFV IFA011: Section 7.1.6.4, VduCpd information
element."; element.";
} }
leaf vnic-type {
type identityref {
base vnic-type;
}
description
"Describes the type of the virtual network interface
realizing the CPs instantiated from this CPD. This is
used to determine which mechanism driver(s) to be used
to bind the port. Value:
• NORMAL
• VIRTIO
• DIRECT
• BAREMETAL
• VIRTIO-FORWARDER
• DIRECT-PHYSICAL
• SMART-NIC";
reference
"GS NFV IFA011: Section 7.1.6.4, VduCpd information
element.";
}
uses cpd; uses cpd;
leaf security-group-rule-id { leaf security-group-rule-id {
...@@ -871,6 +893,17 @@ submodule etsi-nfv-vnf { ...@@ -871,6 +893,17 @@ submodule etsi-nfv-vnf {
information element."; information element.";
} }
leaf provider {
type string;
description
"The provider of this software image. If not present the
provider of the software image is assumed to be same as
the VNF provider.";
reference
"GS NFV IFA011: Section 7.1.6.5 SwImageDesc
information element.";
}
container checksum { container checksum {
leaf algorithm { leaf algorithm {
...@@ -1238,7 +1271,23 @@ submodule etsi-nfv-vnf { ...@@ -1238,7 +1271,23 @@ submodule etsi-nfv-vnf {
} }
} }
} }
leaf vip-cpd {
type leafref {
path "../../vip-cpd/id";
}
description
"Reference to the VIP CPD which is used to instantiate CPs
to hold virtual IP addresses. These CPs are, in turn,
exposed as external CPs defined by this external CPD.
One and only one of the following attributes shall be
present: intVirtualLinkDesc or intCpd or vipCpd .";
reference
"GS NFV-IFA011: Section 7.1.3.2, VnfExtCpd information
element";
}
} }
uses virtual-network-interface-requirements; uses virtual-network-interface-requirements;
leaf nicio-requirements { leaf nicio-requirements {
...@@ -1270,6 +1319,55 @@ submodule etsi-nfv-vnf { ...@@ -1270,6 +1319,55 @@ submodule etsi-nfv-vnf {
} }
} }
list vip-cpd {
key "id";
leaf-list int-cpd {
type leafref {
path "../../vdu/int-cpd/int-virtual-link-desc";
}
description
"Reference to the internal VDU CPD which is used to
instantiate internal CPs. These internal CPs share the
virtual IP addresses allocated when a VipCp instance
is created from the VipCpd.";
reference
"GS NFV IFA011: Section 7.1.x, VipCpd information element.";
}
leaf-list vnf-ext-cpd {
type leafref {
path "../../ext-cpd/id";
}
description
"Reference to the VNF external CPD which is used to
instantiate external CPs. These external CPs share the
virtual IP addresses allocated when a VipCp instance is
created from the VipCpd.";
reference
"GS NFV IFA011: Section 7.1.x, VipCpd information element.";
}