Commit 1adbb7a5 authored by Mahesh Jethanandani's avatar Mahesh Jethanandani

NFVSOL(18)000324 Contribution

Change to address comment from Bruno

Change-Id: I0ff65607b16feef196c04f6efb214f7029ae75ba
parent ba9c993a
submodule etsi-nfv-common {
belongs-to etsi-nfv {
prefix nfv;
}
module etsi-nfv-common {
namespace "urn:etsi:params:xml:ns:yang:etsi-nfv-common";
prefix common;
description
"Common types.";
"Common data types for ETSI data models.";
revision 2017-01-20 {
revision 2018-06-19 {
description
"Initial revision
......
......@@ -3,7 +3,9 @@ submodule etsi-nfv-ns {
prefix nfv;
}
include etsi-nfv-common;
import etsi-nfv-common {
prefix common;
}
description
"Models for NS according to ETSI GS NFV-IFA 014.";
......@@ -11,11 +13,11 @@ submodule etsi-nfv-ns {
revision 2017-01-20 {
description
"Initial revision
Common data structure to support NSD
according to:
ETSI GS NFV-IFA 014 V2.1.1 (2016-10)";
Common data structure to support NSD according to:
ETSI GS NFV-IFA 011 Ed251v243";
reference "ETSI GS NFV-IFA 014 V2.1.1 (2016-10)";
reference
"ETSI GS NFV-IFA 011 Ed251v243";
}
grouping security-parameters {
......@@ -77,9 +79,9 @@ submodule etsi-nfv-ns {
leaf-list nested-nsd {
type leafref {
path "../../nfv:nsd/nfv:id";
path "../../nsd/id";
}
must ". != ../nfv:id";
must ". != ../id";
}
list vnfd {
......@@ -90,7 +92,7 @@ submodule etsi-nfv-ns {
descriptor consists of.";
leaf vnfd {
type leafref {
path "/nfv/nfv:vnfd/nfv:id";
path "/nfv/vnfd/id";
}
}
}
......@@ -123,15 +125,17 @@ submodule etsi-nfv-ns {
}
leaf layer-protocol {
type identityref {
base layer-protocol;
base common:layer-protocol;
}
}
leaf role {
type cp-role;
type identityref {
base common:cp-role;
}
}
leaf virtual-link-desc {
type leafref {
path "../../nfv:virtual-link-desc/nfv:id";
path "../../virtual-link-desc/id";
}
description
"Can optionally connect this service-access-point to an virtual-link. If not set,
......@@ -161,7 +165,7 @@ submodule etsi-nfv-ns {
mandatory true;
type string;
}
uses connectivity-type;
uses common:connectivity-type;
list deployment-flavor {
key "id";
......@@ -234,17 +238,17 @@ submodule etsi-nfv-ns {
choice source {
// We have no way of refererencing a VNF MP today
container ns-monitoring-parameter {
uses monitoring-parameter;
uses common:monitoring-parameter;
}
container vnf-indicator {
leaf vnfd {
type leafref {
path "/nfv:nfv/nfv:vnfd/nfv:id";
path "/nfv/vnfd/id";
}
}
leaf indicator {
type leafref {
path "deref(../nfv:vnfd)/../nfv:indicator/nfv:id";
path "deref(../vnfd)/../indicator/id";
}
}
}
......@@ -264,7 +268,7 @@ submodule etsi-nfv-ns {
}
list deployment-flavor {
min-elements 1;
must "nfv:default-instantiation-level or count(nfv:instantiation-level) = 1";
must "default-instantiation-level or count(instantiation-level) = 1";
key "id";
description
"The NsDf information element specifies the properties of a variant of an NS.";
......@@ -275,13 +279,13 @@ submodule etsi-nfv-ns {
leaf flavor-key {
type leafref {
path "../../nfv:monitored-info/nfv:id";
path "../../monitored-info/id";
}
}
list vnf-profile {
must "nfv:min-number-of-instances<=nfv:max-number-of-instances";
must "count(../../nfv:vnfd[vnfd=current()/nfv:vnfd])=1" {
must "min-number-of-instances<=max-number-of-instances";
must "count(../../vnfd[vnfd=current()/vnfd])=1" {
error-message "VNFDs in the profile has to be listed as a dependency of the network service descriptor.";
}
key "id";
......@@ -293,21 +297,21 @@ submodule etsi-nfv-ns {
leaf vnfd {
mandatory true;
type leafref {
path "/nfv:nfv/nfv:vnfd/nfv:id";
path "/nfv/vnfd/id";
}
}
leaf flavor {
mandatory true;
type leafref {
path "deref(../nfv:vnfd)/../nfv:deployment-flavor/nfv:id";
path "deref(../vnfd)/../deployment-flavor/id";
}
}
leaf instantiation-level {
mandatory true;
type leafref {
path "deref(../nfv:flavor)/../nfv:instantiation-level/nfv:id";
path "deref(../flavor)/../instantiation-level/id";
}
}
......@@ -320,13 +324,13 @@ submodule etsi-nfv-ns {
mandatory true;
}
uses local-affinity-or-anti-affinity-rule;
uses common:local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group {
key "id";
leaf id {
type leafref {
path "../../../nfv:affinity-or-anti-affinity-group/nfv:id";
path "../../../affinity-or-anti-affinity-group/id";
}
}
}
......@@ -336,13 +340,13 @@ submodule etsi-nfv-ns {
leaf virtual-link-profile {
type leafref {
path "../../../nfv:virtual-link-profile/nfv:virtual-link-desc";
path "../../../virtual-link-profile/virtual-link-desc";
}
}
leaf cp {
type leafref {
path "deref(../../nfv:vnfd)/../nfv:ext-cpd/nfv:id";
path "deref(../../vnfd)/../ext-cpd/id";
}
}
}
......@@ -353,13 +357,13 @@ submodule etsi-nfv-ns {
leaf sapd {
type leafref {
path "../../../../nfv:service-access-point-descriptor/nfv:id";
path "../../../../service-access-point-descriptor/id";
}
}
leaf cp {
type leafref {
path "deref(../../nfv:vnfd)/../nfv:ext-cpd/nfv:id";
path "deref(../../vnfd)/../ext-cpd/id";
}
}
}
......@@ -369,7 +373,7 @@ submodule etsi-nfv-ns {
key "pnfd";
leaf pnfd {
type leafref {
path "../../../nfv:pnfd";
path "../../../pnfd";
}
}
// no virtual-link-connectivity as we don't have PNFD modelled.
......@@ -380,33 +384,33 @@ submodule etsi-nfv-ns {
leaf virtual-link-desc {
mandatory true;
type leafref {
path "../../../nfv:virtual-link-desc/nfv:id";
path "../../../virtual-link-desc/id";
}
}
leaf flavor {
mandatory true;
type leafref {
path "deref(../nfv:virtual-link-desc)/../nfv:deployment-flavor/nfv:id";
path "deref(../virtual-link-desc)/../deployment-flavor/id";
}
}
uses local-affinity-or-anti-affinity-rule;
uses common:local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group {
key "id";
leaf id {
type leafref {
path "../../../nfv:affinity-or-anti-affinity-group/nfv:id";
path "../../../affinity-or-anti-affinity-group/id";
}
}
}
container max-bitrate-requirements {
uses link-bitrate-requirements;
uses common:link-bitrate-requirements;
}
container min-bitrate-requirements {
uses link-bitrate-requirements;
uses common:link-bitrate-requirements;
}
}
......@@ -423,7 +427,7 @@ submodule etsi-nfv-ns {
}
leaf scaling-level {
type leafref {
path "../../nfv:instantiation-level/nfv:id";
path "../../instantiation-level/id";
}
}
}
......@@ -437,12 +441,12 @@ submodule etsi-nfv-ns {
leaf affinity-type {
mandatory true;
type affinity-type;
type common:affinity-type;
}
leaf affinity-scope {
mandatory true;
type affinity-scope;
type common:affinity-scope;
}
}
......@@ -463,7 +467,7 @@ submodule etsi-nfv-ns {
leaf vnf-profile {
type leafref {
path "../../../nfv:vnf-profile/nfv:id";
path "../../../vnf-profile/id";
}
}
......@@ -478,20 +482,22 @@ submodule etsi-nfv-ns {
leaf virtual-link-profile {
type leafref {
path "../../../nfv:virtual-link-profile/nfv:virtual-link-desc";
path "../../../virtual-link-profile/" +
"virtual-link-desc";
}
}
uses link-bitrate-requirements;
uses common:link-bitrate-requirements;
}
must "(count(nfv:vnf-to-level-mapping) + count(nfv:vl-to-level-mapping)) > 0";
must "(count(vnf-to-level-mapping) + " +
"count(vl-to-level-mapping)) > 0";
list ns-to-level-mapping {
key "ns-profile";
leaf ns-profile {
type leafref {
path "../../../nfv:ns-profile/nfv:nsd";
path "../../../ns-profile/nsd";
}
}
......@@ -504,26 +510,26 @@ submodule etsi-nfv-ns {
leaf default-instantiation-level {
type leafref {
path "../nfv:instantiation-level/nfv:id";
path "../instantiation-level/id";
}
}
list ns-profile {
must "nfv:min-number-of-instances<=nfv:max-number-of-instances";
must "min-number-of-instances<=max-number-of-instances";
key "nsd";
leaf nsd {
type leafref {
path "../../../nfv:nested-nsd";
path "../../../nested-nsd";
}
}
leaf deployment-flavor {
type leafref {
path "/nfv:nfv/nfv:nsd[id=current()/../nfv:nsd]/nfv:deployment-flavor/nfv:id";
path "/nfv/nsd[id=current()/../nsd]/deployment-flavor/id";
}
}
leaf instantiation-level {
type leafref {
path "deref(../nfv:deployment-flavor)/../nfv:instantiation-level/nfv:id";
path "deref(../deployment-flavor)/../instantiation-level/id";
}
}
leaf min-number-of-instances {
......@@ -534,13 +540,13 @@ submodule etsi-nfv-ns {
type uint16;
mandatory true;
}
uses local-affinity-or-anti-affinity-rule;
uses common:local-affinity-or-anti-affinity-rule;
list affinity-or-anti-affinity-group {
key "id";
leaf id {
type leafref {
path "../../../nfv:affinity-or-anti-affinity-group/nfv:id";
path "../../../affinity-or-anti-affinity-group/id";
}
}
}
......@@ -560,24 +566,24 @@ submodule etsi-nfv-ns {
choice primary {
leaf primary-vnf-profile {
type leafref {
path "../../nfv:vnf-profile/nfv:vnfd";
path "../../vnf-profile/vnfd";
}
}
leaf primary-ns-profile {
type leafref {
path "../../nfv:ns-profile/nfv:nsd";
path "../../ns-profile/nsd";
}
}
}
choice secondary {
leaf secondary-vnf-profile {
type leafref {
path "../../nfv:vnf-profile/nfv:vnfd";
path "../../vnf-profile/vnfd";
}
}
leaf secondary-ns-profile {
type leafref {
path "../../nfv:ns-profile/nfv:nsd";
path "../../ns-profile/nsd";
}
}
}
......
......@@ -9,21 +9,23 @@ submodule etsi-nfv-vnf {
import ietf-yang-types {
prefix yang;
}
include etsi-nfv-common;
import etsi-nfv-common {
prefix common;
}
include etsi-nfv-ns;
description
"Models for VNFD according to GS NFV-IFA 011.";
revision 2018-04-24 {
revision 2018-06-19 {
description
"Initial revision.
Common data structure to support VNFD according to:
ETSI GS NFV-IFA 011 V2.1.1 (2016-10)";
VNFD according to ETSI GS NFV-IFA 011 Ed251v243";
reference
"ETSI GS NFV-IFA 011 V2.1.1 (2016-10)";
"ETSI GS NFV-IFA 011 Ed251v243";
}
grouping cpd {
......@@ -42,7 +44,7 @@ submodule etsi-nfv-vnf {
leaf layer-protocol {
mandatory true;
type identityref {
base layer-protocol;
base common:layer-protocol;
}
description
"Identifies which protocol the CP uses for connectivity
......@@ -52,7 +54,9 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.3, Cpd information element.";
}
leaf role {
type cp-role;
type identityref {
base common:cp-role;
}
description
"Identifies the role of the port in the context of the
traffic flow patterns in the VNF or parent NS. For example a
......@@ -78,7 +82,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.3, Cpd information element.";
leaf associated-layer-protocol {
type identityref {
base layer-protocol;
base common:layer-protocol;
}
description
"One of the values of the attribute layerProtocol of the Cpd
......@@ -92,7 +96,7 @@ submodule etsi-nfv-vnf {
key "address-type";
leaf address-type {
type identityref {
base address-type;
base common:address-type;
}
description
"Describes the type of the address to be assigned to the CP
......@@ -394,7 +398,7 @@ submodule etsi-nfv-vnf {
virtual link or to an external connection points.";
leaf int-virtual-link-desc {
type leafref {
path "../../../nfv:virtual-link-desc/nfv:id";
path "../../../nfv:int-virtual-link-desc/nfv:id";
}
description
"Reference of the internal VLD which this internal CPD
......@@ -479,216 +483,16 @@ submodule etsi-nfv-vnf {
}
}
}
container sw-image-desc {
presence
"Can be used to specify image data if the VNF should be
onboarded to the VIM by the NFV";
leaf sw-image-desc {
type leafref {
path "../../sw-image-desc/id";
}
description
"Describes the software image which is directly loaded on
the virtualisation container realising this Vdu.";
reference
"GS NFV IFA011: Section 7.1.6.2, Vdu information element";
list sw-image-desc {
key "id";
leaf id {
type string;
description
"The identifier of this software image.";
reference
"GS NFV IFA011: Section 7.1.6.5, SwImageDesc
information element";
}
leaf name {
type string;
description
"The name of this software image.";
reference
"GS NFV IFA011: Section 7.1.6.5 SwImageDesc
information element.";
}
leaf version {
type string;
description
"The version of this software image.";
reference
"GS NFV IFA011: Section 7.1.6.5 SwImageDesc
information element.";
}
leaf checksum {
type string;
description
"The checksum of the software image file.";
reference
"GS NFV IFA011: Section 7.1.6.5 SwImageDesc
information element.";
}
leaf container-format {
mandatory true;
type enumeration {
enum "aki" {
description
"An Amazon kernel image.";
}
enum "ami" {
description
"An Amazon machine image.";
}
enum "ari" {
description
"An Amazon ramdisk image.";
}
enum "bare" {
description
"The image does not have a container or metadata
envelope.";
}
enum "docker" {
description
"A docker container format.";
}
enum "ova" {
description
"An OVF package in a tarfile.";
}
enum "ovf" {
description
"The OVF container format.";
}
}
description
"The container format describes the container file
format in which software image is provided.";
reference
"GS NFV IFA011: Section 7.1.6.5 SwImageDesc
information element.";
}
leaf disk-format {
mandatory true;
type enumeration {
enum "aki" {
description
"An Amazon kernel image.";
}
enum "ami" {
description
"An Amazon machine image.";
}
enum "ari" {
description
"An Amazon ramdisk image.";
}
enum "iso" {
description
"An archive format for the data contents of an
disk, such as CD-ROM.";
}
enum "qcow2" {
description
"Supported by the QEMU emulator that can expand
dynamically and supports Copy on Write.";
}
enum "raw" {
description
"An unstructured disk image format; if you have a
file without an extension it is possibly a raw
format.";
}
enum "vdi" {
description
"Supported by VirtualBox virtual machine monitor
and the QEMU emulator.";
}
enum "vhd" {
description
"The VHD disk format, a common disk format used by
virtual machine monitors from VMware, Xen,
Microsoft, VirtualBox, and others.";
}
enum "vhdx" {
description
"The VHDX disk format, an enhanced version of the
VHD format, which supports larger disk sizes among
other features.";
}
enum "vmdk" {
description
"Common disk format supported by many common virtual
machine monitors.";
}
}
description
"The disk format of a software image is the format of
the underlying disk image.";
}
leaf min-disk {
type uint64;
units "Gb";
description
"The minimal disk size requirement for this software
image. The value of the 'size of storage' attribute
of the VirtualStorageDesc referencing this
SwImageDesc shall not be smaller than the value of
minDisk.";
reference
"GS NFV IFA011: Section 7.1.6.5, SwImageDesc
information element.";
}
leaf min-ram {
type decimal64 {
fraction-digits 1;
range "0..max";
}
units "Gb";
description
"The minimal RAM requirement for this software image.
The value of the 'size' attribute of
VirtualMemoryData of the Vdu referencing this
SwImageDesc shall not be smaller than the value of
minRam.";
reference
"GS NFV IFA011: Section 7.1.6.5, SwImageDesc
information element.";
}
leaf size {
type uint64;
description
"The size of this software image.";
reference
"GS NFV IFA011: Section 7.1.6.5, SwImageDesc
information element.";
}
leaf image {
mandatory true;
type inet:uri;
description
"This is a reference to the actual software image.
The reference can be relative to the root of the VNF
Package or can be a URL";
reference
"GS NFV IFA011: Section 7.1.6.5, SwImageDesc
information element.";
}
leaf operating-system {
type string;
description
"Identifies the operating system used in the software
image. This attribute may also identify if a 32 bit
or 64 bit software image is used.";
reference
"GS NFV IFA011: Section 7.1.6.5, SwImageDesc
information element.";
}
leaf-list supported-virtualization-environment {
type string;
description
"Identifies the virtualisation environments
(e.g. hypervisor) compatible with this software
image.";
reference
"GS NFV IFA011: Section 7.1.6.5, SwImageDesc
information element.";
}
}
"GS NFV IFA011: Section 7.1.6.2, Vdu information
element.";
}
leaf-list nfvi-constraint {
type string;
......@@ -711,7 +515,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.11.3, MonitoringParameter
information element.";
}
uses monitoring-parameter;
uses common:monitoring-parameter;
}
container configurable-properties {
description
......@@ -720,7 +524,7 @@ submodule etsi-nfv-vnf {
reference
"GS NFV IFA011: Section 7.1.6.2, VDU Information
element.";
leaf auto-scalable {
leaf auto-scalable {
type boolean;
}
leaf auto-healable {
......@@ -847,7 +651,8 @@ submodule etsi-nfv-vnf {
fraction-digits 1;
range "0..max";
}
units "MB";
must ". >= ../../../sw-image-desc[id=current()]/min-ram";
units "Gb";
mandatory true;
description
"Amount of virtual memory in MB.";
......@@ -1022,12 +827,14 @@ submodule etsi-nfv-vnf {
related to Virtual Storage.";
}
leaf size-of-storage {
must ". >= ../../sw-image-desc[id=current()]/min-disk";
type uint64;
units "GB";
units "Gb";
mandatory true;
description
"Size of virtualised storage resource (e.g. size of
volume, in GB)";
volume, in Gb)";
reference
"GS NFV IFA011: Section 7.1.9.4, Information elements
related to Virtual Storage.";
......@@ -1052,13 +859,12 @@ submodule etsi-nfv-vnf {
description
"Indicate if the storage support RDMA.";
reference
"GS NFV IFA011: Section 7.1.9.4, Information elements
"GS NFV IFA011: Section 7.1.9.4, Information elements
related to Virtual Storage.";
}
leaf sw-image-desc {
type leafref {
path "../nfv:vdu/nfv:sw-image-desc/nfv:sw-image-desc/" +
"nfv:id";
path "../../sw-image-desc/id";
}
description
"Software image to be loaded on the VirtualStorage
......@@ -1067,14 +873,216 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.9.4, Information elements
related to Virtual Storage.";
}
/*
swImageDesc
The specification prescribes a reference to a VDU's
software image the VDU already has information of which
image it uses, so this would unnecessarily complicate things.
*/
}
list sw-image-desc {
key "id";
description
"Defines descriptors of software images to be used by the
VNF.";
reference
"GS NFV IFA011: Section 7.1.2, VNFD Information element.";
leaf id {
type string;
description
"The identifier of this software image.";
reference
"GS NFV IFA011: Section 7.1.6.5, SwImageDesc
information element";
}
leaf name {
type string;
description
"The name of this software image.";
reference
"GS NFV IFA011: Section 7.1.6.5 SwImageDesc
information element.";
}
leaf version {
type string;
description
"The version of this software image.";
reference
"GS NFV IFA011: Section 7.1.6.5 SwImageDesc
information element.";
}