Commit cd8c03e1 authored by Mahesh Jethanandani's avatar Mahesh Jethanandani

Merge branch 'v3.3.1'

parents 23266bdb 06657ae3
Pipeline #4505 passed with stage
in 0 seconds
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
...@@ -122,12 +122,18 @@ ...@@ -122,12 +122,18 @@
<connectivity-type> <connectivity-type>
<layer-protocol>ipv4</layer-protocol> <layer-protocol>ipv4</layer-protocol>
</connectivity-type> </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>
<int-virtual-link-desc> <int-virtual-link-desc>
<id>mgmt</id> <id>mgmt</id>
<connectivity-type> <connectivity-type>
<layer-protocol>ipv4</layer-protocol> <layer-protocol>ipv4</layer-protocol>
</connectivity-type> </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>
<ext-cpd> <ext-cpd>
<id>in</id> <id>in</id>
...@@ -157,17 +163,26 @@ ...@@ -157,17 +163,26 @@
<min-number-of-instances>1</min-number-of-instances> <min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>1</max-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> <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>
<vdu-profile> <vdu-profile>
<id>control-plane-standby</id> <id>control-plane-standby</id>
<min-number-of-instances>1</min-number-of-instances> <min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>1</max-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> <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>
<vdu-profile> <vdu-profile>
<id>data-plane</id> <id>data-plane</id>
<min-number-of-instances>2</min-number-of-instances> <min-number-of-instances>2</min-number-of-instances>
<max-number-of-instances>8</max-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> </vdu-profile>
<instantiation-level> <instantiation-level>
<id>il-1</id> <id>il-1</id>
...@@ -210,6 +225,18 @@ ...@@ -210,6 +225,18 @@
<operate-vnf-op-config> <operate-vnf-op-config>
<min-graceful-stop-timeout>1</min-graceful-stop-timeout> <min-graceful-stop-timeout>1</min-graceful-stop-timeout>
</operate-vnf-op-config> </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> </lcm-operations-configuration>
<affinity-or-anti-affinity-group> <affinity-or-anti-affinity-group>
<id>control-plane</id> <id>control-plane</id>
...@@ -224,17 +251,26 @@ ...@@ -224,17 +251,26 @@
<min-number-of-instances>1</min-number-of-instances> <min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>1</max-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> <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>
<vdu-profile> <vdu-profile>
<id>control-plane-standby</id> <id>control-plane-standby</id>
<min-number-of-instances>1</min-number-of-instances> <min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>1</max-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> <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>
<vdu-profile> <vdu-profile>
<id>data-plane</id> <id>data-plane</id>
<min-number-of-instances>1</min-number-of-instances> <min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>4</max-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> </vdu-profile>
<instantiation-level> <instantiation-level>
<id>il-1</id> <id>il-1</id>
...@@ -277,6 +313,18 @@ ...@@ -277,6 +313,18 @@
<operate-vnf-op-config> <operate-vnf-op-config>
<min-graceful-stop-timeout>1</min-graceful-stop-timeout> <min-graceful-stop-timeout>1</min-graceful-stop-timeout>
</operate-vnf-op-config> </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> </lcm-operations-configuration>
<affinity-or-anti-affinity-group> <affinity-or-anti-affinity-group>
<id>control-plane</id> <id>control-plane</id>
......
...@@ -87,6 +87,9 @@ ...@@ -87,6 +87,9 @@
<id>firewall</id> <id>firewall</id>
<min-number-of-instances>1</min-number-of-instances> <min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>2</max-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> </vdu-profile>
<instantiation-level> <instantiation-level>
<id>double</id> <id>double</id>
...@@ -103,6 +106,20 @@ ...@@ -103,6 +106,20 @@
</vdu-level> </vdu-level>
</instantiation-level> </instantiation-level>
<default-instantiation-level>single</default-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> </df>
</vnfd> </vnfd>
<nsd> <nsd>
......
...@@ -74,6 +74,9 @@ ...@@ -74,6 +74,9 @@
<id>firewall</id> <id>firewall</id>
<min-number-of-instances>1</min-number-of-instances> <min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>2</max-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> </vdu-profile>
<instantiation-level> <instantiation-level>
<id>double</id> <id>double</id>
...@@ -90,5 +93,19 @@ ...@@ -90,5 +93,19 @@
</vdu-level> </vdu-level>
</instantiation-level> </instantiation-level>
<default-instantiation-level>single</default-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> </df>
</vnfd> </vnfd>
...@@ -71,6 +71,9 @@ ...@@ -71,6 +71,9 @@
<connectivity-type> <connectivity-type>
<layer-protocol>ethernet</layer-protocol> <layer-protocol>ethernet</layer-protocol>
</connectivity-type> </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>
<ext-cpd> <ext-cpd>
<id>inside</id> <id>inside</id>
...@@ -99,6 +102,9 @@ ...@@ -99,6 +102,9 @@
<id>firewall</id> <id>firewall</id>
<min-number-of-instances>1</min-number-of-instances> <min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>2</max-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> </vdu-profile>
<virtual-link-profile> <virtual-link-profile>
<id>inside-vl</id> <id>inside-vl</id>
...@@ -145,6 +151,18 @@ ...@@ -145,6 +151,18 @@
<operate-vnf-op-config> <operate-vnf-op-config>
<min-graceful-stop-timeout>1</min-graceful-stop-timeout> <min-graceful-stop-timeout>1</min-graceful-stop-timeout>
</operate-vnf-op-config> </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> </lcm-operations-configuration>
</df> </df>
</vnfd> </vnfd>
...@@ -236,6 +254,9 @@ ...@@ -236,6 +254,9 @@
<id>router</id> <id>router</id>
<min-number-of-instances>1</min-number-of-instances> <min-number-of-instances>1</min-number-of-instances>
<max-number-of-instances>2</max-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> </vdu-profile>
<instantiation-level> <instantiation-level>
<id>double</id> <id>double</id>
...@@ -262,6 +283,18 @@ ...@@ -262,6 +283,18 @@
<operate-vnf-op-config> <operate-vnf-op-config>
<min-graceful-stop-timeout>1</min-graceful-stop-timeout> <min-graceful-stop-timeout>1</min-graceful-stop-timeout>
</operate-vnf-op-config> </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> </lcm-operations-configuration>
</df> </df>
</vnfd> </vnfd>
......
...@@ -3,12 +3,28 @@ submodule etsi-nfv-common { ...@@ -3,12 +3,28 @@ submodule etsi-nfv-common {
belongs-to etsi-nfv-descriptors { belongs-to etsi-nfv-descriptors {
prefix nfv; prefix nfv;
} }
import ietf-yang-types {
prefix yang;
reference
"RFC 6991: Common YANG Data Types.";
}
organization organization
"European Telecommunications Standards Institute (ETSI)"; "European Telecommunications Standards Institute (ETSI)";
description description
"Common data types for ETSI data models."; "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 { revision 2020-06-01 {
description description
"Version 2.8.1. "Version 2.8.1.
...@@ -26,6 +42,7 @@ submodule etsi-nfv-common { ...@@ -26,6 +42,7 @@ submodule etsi-nfv-common {
ETSI GS NFV-IFA 014 Ed271v264 ETSI GS NFV-IFA 014 Ed271v264
ETSI GS NFV-IFA 011 Ed271v264"; ETSI GS NFV-IFA 011 Ed271v264";
} }
revision 2019-04-25 { revision 2019-04-25 {
description description
"Initial revision "Initial revision
...@@ -378,6 +395,7 @@ submodule etsi-nfv-common { ...@@ -378,6 +395,7 @@ submodule etsi-nfv-common {
enum "zone-group"; enum "zone-group";
enum "zone"; enum "zone";
enum "nfvi-pop"; enum "nfvi-pop";
enum "network-link-and-node";
} }
} }
...@@ -399,6 +417,12 @@ submodule etsi-nfv-common { ...@@ -399,6 +417,12 @@ submodule etsi-nfv-common {
enum "end-vnf-ext-conn-change"; enum "end-vnf-ext-conn-change";
enum "start-vnfinfo-modification"; enum "start-vnfinfo-modification";
enum "end-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 { ...@@ -412,30 +436,123 @@ submodule etsi-nfv-common {
enum "vnf-operation-change"; enum "vnf-operation-change";
enum "vnf-ext-conn-change"; enum "vnf-ext-conn-change";
enum "vnfinfo-modification"; enum "vnfinfo-modification";
enum "vnf-snapshot-creation";
enum "vnf-snapshot-reverting-to";
enum "change-current-vnf-package";
} }
} }
grouping local-affinity-or-anti-affinity-rule { grouping nfvi-maintenance-info {
list local-affinity-or-anti-affinity-rule { container nfvi-maintenance-info {
key "type scope";
leaf type { leaf impact-notification-lead-time {
type affinity-type; type yang:timeticks;
mandatory true;
description description
"Specifies whether the rule is an affinity rule or an "The value specifies the minimum notification lead time
anti-affinity rule."; requested for upcoming impact of the virtualised resource
or their group (i.e. between the notification and the
action causing the impact).";
reference reference
"GS NFV IFA011: Section 7.1.8.11, "GS NFV-IFA011: Section 7.1.8.17, NfviMaintenanceInfo
LocalAffinityOrAntiAffinityRule information element."; information element";
} }
leaf scope { leaf is-impact-mitigation-requested {
type affinity-scope; type boolean;
description description
"Specifies the scope of the rule, possible values are "When set to True, it is requested that at the time of the
'NFVI-PoP', 'Zone', 'ZoneGroup', 'NFVI-node'."; 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 reference
"GS NFV IFA011: Section 7.1.8.11, "GS NFV-IFA011: Section 7.1.8.17, NfviMaintenanceInfo
LocalAffinityOrAntiAffinityRule information element."; 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";
}
} }
} }
} }
......
...@@ -14,6 +14,14 @@ module etsi-nfv-descriptors { ...@@ -14,6 +14,14 @@ module etsi-nfv-descriptors {
description description
"Network Function Virtualization Descriptors"; "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 { revision 2020-06-01 {
description description
"Version 2.8.1. "Version 2.8.1.
...@@ -29,6 +37,7 @@ module etsi-nfv-descriptors { ...@@ -29,6 +37,7 @@ module etsi-nfv-descriptors {
NSD and PNFD according to ETSI GS NFV-IFA 014 Ed271v264 NSD and PNFD according to ETSI GS NFV-IFA 014 Ed271v264
VNFD according to ETSI GS NFV-IFA 011 Ed271v264."; VNFD according to ETSI GS NFV-IFA 011 Ed271v264.";
} }
revision 2019-04-25 { revision 2019-04-25 {
description description
"Initial revision. "Initial revision.
...@@ -70,7 +79,7 @@ module etsi-nfv-descriptors { ...@@ -70,7 +79,7 @@ module etsi-nfv-descriptors {
key "id"; key "id";
description 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 enabling on-boarding PNFs and referencing them from an
NSD. It focuses on connectivity aspects only."; NSD. It focuses on connectivity aspects only.";
reference reference
......
...@@ -11,6 +11,13 @@ submodule etsi-nfv-ns { ...@@ -11,6 +11,13 @@ submodule etsi-nfv-ns {
description description
"Models for NS according to ETSI GS NFV-IFA 014."; "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 { revision 2020-06-01 {
description description
"Version 2.8.1. "Version 2.8.1.
...@@ -22,7 +29,8 @@ submodule etsi-nfv-ns { ...@@ -22,7 +29,8 @@ submodule etsi-nfv-ns {
description description
"Version 2.7.1. "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 { revision 2019-04-25 {
...@@ -47,6 +55,31 @@ submodule etsi-nfv-ns { ...@@ -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 { grouping nsd {
leaf id { leaf id {
...@@ -322,17 +355,16 @@ submodule etsi-nfv-ns { ...@@ -322,17 +355,16 @@ submodule etsi-nfv-ns {
} }
leaf service-availability-level { leaf service-availability-level {
type enumeration { type uint32;
enum "level-1";
enum "level-2";
enum "level-3";
}
description description
"Specifies one of the three levels defined in ETSI "If present, specifies the service availability level
ETSI GS NFV-REL 001 [i.5] for the VL instance created from this DF.
* Level 1.
* Level 2. THE FOLLOWING STATEMENT IS SUBJECT TO CHANGE:
* Level 3.";
Either the serviceAvailabilityLevel attribute of NS DF
or the serviceAvailabilityLevel attribute of the VL DF
may be provided, but not both.";
reference reference
"GS NFV IFA014: Section 6.5.4.2 VirtualLinkDf "GS NFV IFA014: Section 6.5.4.2 VirtualLinkDf
information element"; information element";
...@@ -583,7 +615,7 @@ submodule etsi-nfv-ns { ...@@ -583,7 +615,7 @@ submodule etsi-nfv-ns {
list position-desc { list position-desc {
key "id"; key "id";
min-elements 1; min-elements 1;
leaf id { leaf id {
type string; type string;
...@@ -761,7 +793,7 @@ submodule etsi-nfv-ns { ...@@ -761,7 +793,7 @@ submodule etsi-nfv-ns {
mandatory true; mandatory true;
type leafref { type leafref {
path "deref(../flavour-id)/../nfv:instantiation-level/" + path "deref(../flavour-id)/../nfv:instantiation-level/" +
"nfv:id"; "nfv:id";
} }
description description
"Identifier of the instantiation level of the VNF DF "Identifier of the instantiation level of the VNF DF
...@@ -795,7 +827,7 @@ submodule etsi-nfv-ns { ...@@ -795,7 +827,7 @@ submodule etsi-nfv-ns {
element"; element";
} }
uses local-affinity-or-anti-affinity-rule; uses ns-local-affinity-or-anti-affinity-rule;
leaf-list affinity-or-anti-affinity-group-id { leaf-list affinity-or-anti-affinity-group-id {
type leafref { type leafref {
...@@ -868,6 +900,21 @@ submodule etsi-nfv-ns { ...@@ -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 { list pnf-profile {
...@@ -1002,7 +1049,7 @@ submodule etsi-nfv-ns { ...@@ -1002,7 +1049,7 @@ submodule etsi-nfv-ns {
information element"; information element";
} }