Skip to content
GitLab
Commit cd8c03e1 authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files

Merge branch 'v3.3.1'

parents 23266bdb 06657ae3
Pipeline #4505 passed with stage
in 0 seconds
Expand all Hide whitespace changes
Inline Side-by-side
README.md 0 → 100644
View file @ cd8c03e1
Note: At this time this document is in draft state, and subject to change till the final approval. As such, files accessed/used from this repository are subject to change. Do not use as reference material.
When approved, this README will be updated to reflect the status of the document.
\ No newline at end of file
example-data/complex-vnfd.xml
View file @ cd8c03e1
......@@ -122,12 +122,18 @@
<connectivity-type>
<layer-protocol>ipv4</layer-protocol>
</connectivity-type>
<nfvi-maintenance-info>
<impact-notification-lead-time>1</impact-notification-lead-time>
</nfvi-maintenance-info>
</int-virtual-link-desc>
<int-virtual-link-desc>
<id>mgmt</id>
<connectivity-type>
<layer-protocol>ipv4</layer-protocol>
</connectivity-type>
<nfvi-maintenance-info>
<impact-notification-lead-time>1</impact-notification-lead-time>
</nfvi-maintenance-info>
</int-virtual-link-desc>
<ext-cpd>
<id>in</id>
......@@ -157,17 +163,26 @@
<min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>1</max-number-of-instances>
<affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>
<nfvi-maintenance-info>
<impact-notification-lead-time>1</impact-notification-lead-time>
</nfvi-maintenance-info>
</vdu-profile>
<vdu-profile>
<id>control-plane-standby</id>
<min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>1</max-number-of-instances>
<affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>
<nfvi-maintenance-info>
<impact-notification-lead-time>1</impact-notification-lead-time>
</nfvi-maintenance-info>
</vdu-profile>
<vdu-profile>
<id>data-plane</id>
<min-number-of-instances>2</min-number-of-instances>
<max-number-of-instances>8</max-number-of-instances>
<nfvi-maintenance-info>
<impact-notification-lead-time>1</impact-notification-lead-time>
</nfvi-maintenance-info>
</vdu-profile>
<instantiation-level>
<id>il-1</id>
......@@ -210,6 +225,18 @@
<operate-vnf-op-config>
<min-graceful-stop-timeout>1</min-graceful-stop-timeout>
</operate-vnf-op-config>
<create-snapshot-vnf-op-config>
<parameter>
<key>1</key>
<value>1</value>
</parameter>
</create-snapshot-vnf-op-config>
<revert-to-snapshot-vnf-op-config>
<parameter>
<key>1</key>
<value>1</value>
</parameter>
</revert-to-snapshot-vnf-op-config>
</lcm-operations-configuration>
<affinity-or-anti-affinity-group>
<id>control-plane</id>
......@@ -224,17 +251,26 @@
<min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>1</max-number-of-instances>
<affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>
<nfvi-maintenance-info>
<impact-notification-lead-time>1</impact-notification-lead-time>
</nfvi-maintenance-info>
</vdu-profile>
<vdu-profile>
<id>control-plane-standby</id>
<min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>1</max-number-of-instances>
<affinity-or-anti-affinity-group-id>control-plane</affinity-or-anti-affinity-group-id>
<nfvi-maintenance-info>
<impact-notification-lead-time>1</impact-notification-lead-time>
</nfvi-maintenance-info>
</vdu-profile>
<vdu-profile>
<id>data-plane</id>
<min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>4</max-number-of-instances>
<nfvi-maintenance-info>
<impact-notification-lead-time>1</impact-notification-lead-time>
</nfvi-maintenance-info>
</vdu-profile>
<instantiation-level>
<id>il-1</id>
......@@ -277,6 +313,18 @@
<operate-vnf-op-config>
<min-graceful-stop-timeout>1</min-graceful-stop-timeout>
</operate-vnf-op-config>
<create-snapshot-vnf-op-config>
<parameter>
<key>1</key>
<value>1</value>
</parameter>
</create-snapshot-vnf-op-config>
<revert-to-snapshot-vnf-op-config>
<parameter>
<key>1</key>
<value>1</value>
</parameter>
</revert-to-snapshot-vnf-op-config>
</lcm-operations-configuration>
<affinity-or-anti-affinity-group>
<id>control-plane</id>
......
example-data/nfv-nsd.xml
View file @ cd8c03e1
......@@ -87,6 +87,9 @@
<id>firewall</id>
<min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>2</max-number-of-instances>
<nfvi-maintenance-info>
<impact-notification-lead-time>1</impact-notification-lead-time>
</nfvi-maintenance-info>
</vdu-profile>
<instantiation-level>
<id>double</id>
......@@ -103,6 +106,20 @@
</vdu-level>
</instantiation-level>
<default-instantiation-level>single</default-instantiation-level>
<lcm-operations-configuration>
<create-snapshot-vnf-op-config>
<parameter>
<key>1</key>
<value>1</value>
</parameter>
</create-snapshot-vnf-op-config>
<revert-to-snapshot-vnf-op-config>
<parameter>
<key>1</key>
<value>1</value>
</parameter>
</revert-to-snapshot-vnf-op-config>
</lcm-operations-configuration>
</df>
</vnfd>
<nsd>
......
example-data/nfv-vnfd.xml
View file @ cd8c03e1
......@@ -74,6 +74,9 @@
<id>firewall</id>
<min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>2</max-number-of-instances>
<nfvi-maintenance-info>
<impact-notification-lead-time>1</impact-notification-lead-time>
</nfvi-maintenance-info>
</vdu-profile>
<instantiation-level>
<id>double</id>
......@@ -90,5 +93,19 @@
</vdu-level>
</instantiation-level>
<default-instantiation-level>single</default-instantiation-level>
<lcm-operations-configuration>
<create-snapshot-vnf-op-config>
<parameter>
<key>1</key>
<value>1</value>
</parameter>
</create-snapshot-vnf-op-config>
<revert-to-snapshot-vnf-op-config>
<parameter>
<key>1</key>
<value>1</value>
</parameter>
</revert-to-snapshot-vnf-op-config>
</lcm-operations-configuration>
</df>
</vnfd>
example-data/nfv.xml
View file @ cd8c03e1
......@@ -71,6 +71,9 @@
<connectivity-type>
<layer-protocol>ethernet</layer-protocol>
</connectivity-type>
<nfvi-maintenance-info>
<impact-notification-lead-time>1</impact-notification-lead-time>
</nfvi-maintenance-info>
</int-virtual-link-desc>
<ext-cpd>
<id>inside</id>
......@@ -99,6 +102,9 @@
<id>firewall</id>
<min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>2</max-number-of-instances>
<nfvi-maintenance-info>
<impact-notification-lead-time>1</impact-notification-lead-time>
</nfvi-maintenance-info>
</vdu-profile>
<virtual-link-profile>
<id>inside-vl</id>
......@@ -145,6 +151,18 @@
<operate-vnf-op-config>
<min-graceful-stop-timeout>1</min-graceful-stop-timeout>
</operate-vnf-op-config>
<create-snapshot-vnf-op-config>
<parameter>
<key>1</key>
<value>1</value>
</parameter>
</create-snapshot-vnf-op-config>
<revert-to-snapshot-vnf-op-config>
<parameter>
<key>1</key>
<value>1</value>
</parameter>
</revert-to-snapshot-vnf-op-config>
</lcm-operations-configuration>
</df>
</vnfd>
......@@ -236,6 +254,9 @@
<id>router</id>
<min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>2</max-number-of-instances>
<nfvi-maintenance-info>
<impact-notification-lead-time>1</impact-notification-lead-time>
</nfvi-maintenance-info>
</vdu-profile>
<instantiation-level>
<id>double</id>
......@@ -262,6 +283,18 @@
<operate-vnf-op-config>
<min-graceful-stop-timeout>1</min-graceful-stop-timeout>
</operate-vnf-op-config>
<create-snapshot-vnf-op-config>
<parameter>
<key>1</key>
<value>1</value>
</parameter>
</create-snapshot-vnf-op-config>
<revert-to-snapshot-vnf-op-config>
<parameter>
<key>1</key>
<value>1</value>
</parameter>
</revert-to-snapshot-vnf-op-config>
</lcm-operations-configuration>
</df>
</vnfd>
......
src/yang/etsi-nfv-common.yang
View file @ cd8c03e1
......@@ -3,12 +3,28 @@ submodule etsi-nfv-common {
belongs-to etsi-nfv-descriptors {
prefix nfv;
}
import ietf-yang-types {
prefix yang;
reference
"RFC 6991: Common YANG Data Types.";
}
organization
"European Telecommunications Standards Institute (ETSI)";
description
"Common data types for ETSI data models.";
revision 2020-06-10 {
description
"Version 3.3.1.
Common data structures to support VNFD and NSD according to:
ETSI GS NFV-IFA 014 Release 3
ETSI GS NFV-IFA 011 Release 3.";
}
revision 2020-06-01 {
description
"Version 2.8.1.
......@@ -26,6 +42,7 @@ submodule etsi-nfv-common {
ETSI GS NFV-IFA 014 Ed271v264
ETSI GS NFV-IFA 011 Ed271v264";
}
revision 2019-04-25 {
description
"Initial revision
......@@ -378,6 +395,7 @@ submodule etsi-nfv-common {
enum "zone-group";
enum "zone";
enum "nfvi-pop";
enum "network-link-and-node";
}
}
......@@ -399,6 +417,12 @@ submodule etsi-nfv-common {
enum "end-vnf-ext-conn-change";
enum "start-vnfinfo-modification";
enum "end-vnfinfo-modification";
enum "start-vnf-snapshot-creation";
enum "end-vnf-snapshot-creation";
enum "start-vnf-snapshot-reverting-to";
enum "end-vnf-snapshot-reverting-to";
enum "start-change-current-vnf-package";
enum "end-change-current-vnf-package";
}
}
......@@ -412,30 +436,123 @@ submodule etsi-nfv-common {
enum "vnf-operation-change";
enum "vnf-ext-conn-change";
enum "vnfinfo-modification";
enum "vnf-snapshot-creation";
enum "vnf-snapshot-reverting-to";
enum "change-current-vnf-package";
}
}
grouping local-affinity-or-anti-affinity-rule {
list local-affinity-or-anti-affinity-rule {
key "type scope";
leaf type {
type affinity-type;
grouping nfvi-maintenance-info {
container nfvi-maintenance-info {
leaf impact-notification-lead-time {
type yang:timeticks;
mandatory true;
description
"Specifies whether the rule is an affinity rule or an
anti-affinity rule.";
"The value specifies the minimum notification lead time
requested for upcoming impact of the virtualised resource
or their group (i.e. between the notification and the
action causing the impact).";
reference
"GS NFV IFA011: Section 7.1.8.11,
LocalAffinityOrAntiAffinityRule information element.";
"GS NFV-IFA011: Section 7.1.8.17, NfviMaintenanceInfo
information element";
}
leaf scope {
type affinity-scope;
leaf is-impact-mitigation-requested {
type boolean;
description
"Specifies the scope of the rule, possible values are
'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'.";
"When set to True, it is requested that at the time of the
notification of an upcoming change that is expected to have
an impact on the VNF, virtualised resource(s) of the same
characteristics as the impacted ones is/are provided to
compensate for the impact. Cardinality 0 corresponds to the
value False.";
reference
"GS NFV IFA011: Section 7.1.8.11,
LocalAffinityOrAntiAffinityRule information element.";
"GS NFV-IFA011: Section 7.1.8.17, NfviMaintenanceInfo
information element";
}
leaf-list supported-migration-type {
type enumeration {
enum "no-migration";
enum "offline-migration";
enum "live-migration";
}
description
"Applicable to VirtualComputeDesc and VirtualStorageDesc.
When present, specifies the allowed migration types in the
order of preference in case of an impact starting with the
most preferred type. Possible values: NO_MIGRATION,
OFFLINE_MIGRATION, LIVE_MIGRATION.";
reference
"GS NFV-IFA011: Section 7.1.8.17, NfviMaintenanceInfo
information element";
}
leaf max-undetectable-interruption-time {
type yang:timeticks;
description
"Applicable to VirtualComputeDesc and VirtualStorageDesc.
When present, it specifies the maximum interruption time
that can go undetected at the VNF level and therefore
which will not trigger VNFinternal recovery during live
migration.";
reference
"GS NFV-IFA011: Section 7.1.8.17, NfviMaintenanceInfo
information element";
}
leaf min-recovery-time-between-impacts {
type yang:timeticks;
description
"When present, it specifies the time required by the group
to recover from an impact, thus, the minimum time
requested between consecutive impacts of the group.";
reference
"GS NFV-IFA011: Section 7.1.8.17, NfviMaintenanceInfo
information element";
}
list max-number-of-impacted-instances {
key "group-size";
ordered-by user;
must "./max-number-of-impacted-instances <= ./group-size";
leaf group-size {
type uint32;
description
"When present, it determines the size of the group for
which the maxNumberOfImpactedInstances is specified.
Otherwise the size is not limited.
Each groupSize value specified for a group of virtual
resources shall be unique, and it shall be possible
to form an ascending ordered list of groupSizes.
The number of instances in the group for which the
maxNumberOfImpactedInstances is specified may be equal
to groupSize or less. When the number of instances is
less than the groupSize, it shall be at least 1 if this
is the first groupSize in the ordered list of groupSizes,
or it shall be greater by at least 1 than the previous
groupSize in the ordered list of groupSizes.";
reference
"GS NFV-IFA011: Section 7.1.8.17, NfviMaintenanceInfo
information element";
}
leaf max-number-of-impacted-instances {
type uint32 {
range "1 .. max";
}
description
"The maximum number of instances that can be impacted
simultaneously within the group of the specified size.";
reference
"GS NFV-IFA011: Section 7.1.8.17, NfviMaintenanceInfo
information element";
}
}
}
}
......
src/yang/etsi-nfv-descriptors.yang
View file @ cd8c03e1
......@@ -14,6 +14,14 @@ module etsi-nfv-descriptors {
description
"Network Function Virtualization Descriptors";
revision 2020-06-10 {
description
"Version 3.3.1.
NSD and PNFD according to ETSI GS NFV-IFA 014 Release 3
VNFD according to ETSI GS NFV-IFA 011 Release 3.";
}
revision 2020-06-01 {
description
"Version 2.8.1.
......@@ -29,6 +37,7 @@ module etsi-nfv-descriptors {
NSD and PNFD according to ETSI GS NFV-IFA 014 Ed271v264
VNFD according to ETSI GS NFV-IFA 011 Ed271v264.";
}
revision 2019-04-25 {
description
"Initial revision.
......@@ -70,7 +79,7 @@ module etsi-nfv-descriptors {
key "id";
description
"The Pnfd information element is a deployment template
"The Pnfd information element is a deployment template
enabling on-boarding PNFs and referencing them from an
NSD. It focuses on connectivity aspects only.";
reference
......
src/yang/etsi-nfv-ns.yang
View file @ cd8c03e1
......@@ -11,6 +11,13 @@ submodule etsi-nfv-ns {
description
"Models for NS according to ETSI GS NFV-IFA 014.";
revision 2020-06-10 {
description
"Version 3.3.1.
NSD according to ETSI GS NFV-IFA 014 Release 3.";
}
revision 2020-06-01 {
description
"Version 2.8.1.
......@@ -22,7 +29,8 @@ submodule etsi-nfv-ns {
description
"Version 2.7.1.
NSD according to ETSI GS NFV-IFA 014 Ed271v264.";
Common data structures to support NSD according to:
ETSI GS NFV-IFA 014 Ed271v264.";
}
revision 2019-04-25 {
......@@ -47,6 +55,31 @@ submodule etsi-nfv-ns {
}
}
grouping ns-local-affinity-or-anti-affinity-rule {
list local-affinity-or-anti-affinity-rule {
key "type scope";
leaf type {
type affinity-type;
description
"Specifies whether the rule is an affinity rule or an
anti-affinity rule.";
reference
"GS NFV IFA014: Section 6.3.8.2,
LocalAffinityOrAntiAffinityRule information element.";
}
leaf scope {
type affinity-scope;
description
"Specifies the scope of the rule, possible values are
'NFVI-PoP', 'NFVI-node' network-link-and-node etc.";
reference
"GS NFV IFA014: Section 6.3.8.2,
LocalAffinityOrAntiAffinityRule information element.";
}
}
}
grouping nsd {
leaf id {
......@@ -322,17 +355,16 @@ submodule etsi-nfv-ns {
}
leaf service-availability-level {
type enumeration {
enum "level-1";
enum "level-2";
enum "level-3";
}
type uint32;
description
"Specifies one of the three levels defined in ETSI
ETSI GS NFV-REL 001 [i.5]
* Level 1.
* Level 2.
* Level 3.";
"If present, specifies the service availability level
for the VL instance created from this DF.
THE FOLLOWING STATEMENT IS SUBJECT TO CHANGE:
Either the serviceAvailabilityLevel attribute of NS DF
or the serviceAvailabilityLevel attribute of the VL DF
may be provided, but not both.";
reference
"GS NFV IFA014: Section 6.5.4.2 VirtualLinkDf
information element";
......@@ -583,7 +615,7 @@ submodule etsi-nfv-ns {
list position-desc {
key "id";
min-elements 1;
min-elements 1;
leaf id {
type string;
......@@ -761,7 +793,7 @@ submodule etsi-nfv-ns {
mandatory true;
type leafref {
path "deref(../flavour-id)/../nfv:instantiation-level/" +
"nfv:id";
"nfv:id";
}
description
"Identifier of the instantiation level of the VNF DF
......@@ -795,7 +827,7 @@ submodule etsi-nfv-ns {
element";
}
uses local-affinity-or-anti-affinity-rule;
uses ns-local-affinity-or-anti-affinity-rule;
leaf-list affinity-or-anti-affinity-group-id {
type leafref {
......@@ -868,6 +900,21 @@ submodule etsi-nfv-ns {
}
}
}
leaf service-availability-level {
must "not(../../service-availability-level)";
type uint32;
description
"If present, specifies the service availability level for
the VNF instance created from this profile.
Either the serviceAvailabilityLevel attribute of NS DF
or the serviceAvailabilityLevel attribute of the
VnfProfile may be provided, but not both.";
reference
"GS NFV IFA014: Section 6.3.3.2 VnfProfile information
element";
}
}
list pnf-profile {
......@@ -1002,7 +1049,7 @@ submodule etsi-nfv-ns {
information element";
}
uses local-affinity-or-anti-affinity-rule;
uses ns-local-affinity-or-anti-affinity-rule;
leaf-list affinity-or-anti-affinity-group-id {
type leafref {
......@@ -1127,7 +1174,8 @@ submodule etsi-nfv-ns {
type affinity-scope;
description
"Specifies the scope of the affinity or anti-affinity
relationship e.g. a NFVI node, an NFVI PoP, etc.";
relationship e.g. a NFVI node, an NFVI PoP,
network-link-and-node etc.";
reference
"GS NFV IFA014: Section 6.3.5.2 AffinityOrAntiAffinity
information element";
......@@ -1263,7 +1311,7 @@ submodule etsi-nfv-ns {
"count(virtual-link-to-level-mapping) + " +
"count(ns-to-level-mapping)) > 0" {
error-message
"At least one attribute between " +
"At least one attribute between " +
"vnf-to-level-mapping, " +
"virtual-link-to-level-mapping and " +
"ns-to-level-mapping shall be present.";
......@@ -1301,7 +1349,7 @@ submodule etsi-nfv-ns {
leaf value {
type string;
}
description
description
"Array of KVP requirements for additional parameters
of NS to be passed when invoking the Instantiate Ns
operation.";
......@@ -1322,7 +1370,7 @@ submodule etsi-nfv-ns {
leaf value {
type string;
}