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

Merge branch 'dev-v3.3.1' into issue#7

parents 3d8f2e5c f9b84424
Pipeline #2187 passed with stage
in 0 seconds
Hide whitespace changes
Inline Side-by-side
example-data/complex-vnfd.xml
View file @ b7019d01
......@@ -210,6 +210,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>
......@@ -281,6 +293,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 @ b7019d01
......@@ -100,6 +100,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 @ b7019d01
......@@ -87,5 +87,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 @ b7019d01
......@@ -141,6 +141,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>
......@@ -255,6 +267,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 @ b7019d01
......@@ -390,6 +390,10 @@ 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";
}
......
src/yang/etsi-nfv-descriptors.yang
View file @ b7019d01
......@@ -61,7 +61,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 @ b7019d01
......@@ -578,7 +578,7 @@ submodule etsi-nfv-ns {
list position-desc {
key "id";
min-elements 1;
min-elements 1;
leaf id {
type string;
......@@ -756,7 +756,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
......@@ -1268,7 +1268,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.";
......@@ -1306,7 +1306,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.";
......@@ -1327,7 +1327,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 Scale Ns
operation.";
......@@ -1348,7 +1348,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 Heal Ns
operation.";
......@@ -1367,7 +1367,7 @@ submodule etsi-nfv-ns {
}
must "boolean(../../nested-nsd-id[.=current()/nsd-id])" {
error-message
"PNFDs in the profile has to be listed as a " +
"PNFDs in the profile has to be listed as a " +
"dependency of the network service " +
"descriptor.";
}
......@@ -1400,7 +1400,7 @@ submodule etsi-nfv-ns {
element";
}
leaf ns-df-id {
leaf ns-df-id {
mandatory true;
type leafref {
path "deref(../nsd-id)/../df/id";
......@@ -1413,7 +1413,7 @@ submodule etsi-nfv-ns {
element";
}
leaf instantiation-level-id {
leaf instantiation-level-id {
mandatory true;
type leafref {
path "deref(../ns-df-id)/../ns-instantiation-level/id";
......@@ -1428,7 +1428,7 @@ submodule etsi-nfv-ns {
element";
}
leaf min-number-of-instances {
leaf min-number-of-instances {
type uint16;
default 1;
description
......@@ -1440,7 +1440,7 @@ submodule etsi-nfv-ns {
element";
}
leaf max-number-of-instances {
leaf max-number-of-instances {
type uint16;
default 1;
description
......@@ -1553,7 +1553,7 @@ submodule etsi-nfv-ns {
information element";
}
choice secondary-id {
choice secondary-id {
leaf secondary-vnf-profile {
type leafref {
path "../../vnf-profile/vnfd-id";
......@@ -1591,7 +1591,7 @@ submodule etsi-nfv-ns {
information element";
}
leaf vnf-indicator {
leaf vnf-indicator {
mandatory true;
type leafref {
path "deref(../vnfd-id)/../nfv:indicator/nfv:id";
......
src/yang/etsi-nfv-nsd.yang
View file @ b7019d01
......@@ -33,7 +33,7 @@ module etsi-nfv-nsd {
max-elements 1;
uses nfv:nsd;
description
"The NSD information element is a deployment template whose
"The NSD information element is a deployment template whose
instances are used by the NFVO for the lifecycle management
of NSs.";
reference
......
src/yang/etsi-nfv-vnf.yang
View file @ b7019d01
......@@ -770,6 +770,22 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.9.2.4,
VirtualCpuPinningData information element.";
}
leaf-list cpu-policy {
type enumeration {
enum "dedicated";
enum "shared";
}
description
"Shows the list of dedicated virtual CPU cores and
shared virtual CPU cores in a VM. Dedicated refers to
a virtual CPU core occupies one physical CPU core.
Shared refers to multi virtual CPU cores shared one
physical CPU core.";
reference
"GS NFV IFA011: Section 7.1.9.2.4,
VirtualCpuPinningData information element.";
}
description
"The virtual CPU pinning configuration for the
virtualised compute resource.";
......@@ -2215,31 +2231,93 @@ submodule etsi-nfv-vnf {
VnfLcmOperationsConfiguration information element";
}
container change-current-vnf-package-op-config {
container create-snapshot-vnf-op-config {
description
"Configuration parameters for the Create VNF Snapshot
operation.";
reference
"GS NFV IFA011: Section 7.1.5.2
VnfLcmOperationsConfiguration information element";
list parameter {
key "key";
min-elements 1;
leaf key {
type string;
}
leaf value {
type string;
}
description
"Array of KVP requirements for VNF-specific parameters
to be passed when invoking the change current VNF
Package operation.";
to be passed when invoking the
CreateSnapshotVnfOpConfig operation.";
reference
"GS NFV IFA011: Section 7.1.5.13
ChangeCurrentVnfPackageOpConfig information
"GS NFV IFA011: Section 7.1.5.11
CreateSnapshotVnfOpConfig information
element";
}
}
container revert-to-snapshot-vnf-op-config {
description
"Configuration parameters for the ModifyVnfSoftware
"Configuration parameters for the Revert-To VNF Snapshot
operation.";
reference
"GS NFV IFA011: Section 7.1.5.2
VnfLcmOperationsConfiguration information element";
list parameter {
key "key";
min-elements 1;
leaf key {
type string;
}
leaf value {
type string;
}
description
"Array of KVP requirements for VNF-specific parameters
to be passed when invoking the
RevertToSnapshotVnfOpConfig operation.";
reference
"GS NFV IFA011: Section 7.1.5.12
RevertToSnapshotVnfOpConfig information
element";
}
}
container change-current-vnf-package-op-config {
description
"Configuration parameters for the
ChangeCurrentVnfPackageOpConfig operation.";
reference
"GS NFV IFA011: Section 7.1.5.2
VnfLcmOperationsConfiguration information element";
list parameter {
key "key";
leaf key {
type string;
}
leaf value {
type string;
}
description
"Array of KVP requirements for VNF-specific parameters
to be passed when invoking the change current VNF
Package operation.";
reference
"GS NFV IFA011: Section 7.1.5.13
ChangeCurrentVnfPackageOpConfig information
element";
}
}
}
......@@ -3124,7 +3202,7 @@ submodule etsi-nfv-vnf {
leaf additional-params-id {
type leafref {
path "../../df/lcm-operations-configuration/" +
"change-current-vnf-package-op-config/parameter/key";
"change-current-vnf-package-op-config/parameter/key";
}
description
"References the ChangeCurrentVnfPackageOpConfig information
......@@ -3164,9 +3242,9 @@ submodule etsi-nfv-vnf {
}
leaf-list additional-modification-description {
type string;
description
"A VNF provider may define additional information to
type string;
description
"A VNF provider may define additional information to
qualify further the change between the two versions,
such as 'VNF upgrade', 'VNF update', 'VNF downgrade',
etc.";
......@@ -3229,11 +3307,11 @@ submodule etsi-nfv-vnf {
}
leaf lcm-script-id {
type leafref {
path "../../lifecycle-management-script/id";
}
description
"Reference to a lifecycle management script that is executed
type leafref {
path "../../lifecycle-management-script/id";
}
description
"Reference to a lifecycle management script that is executed
as part of this 'change current VNF Package' process.";
reference
"GS NFV IFA011: Section 7.1.15.2 VnfPackageChangeInfo
......@@ -3241,11 +3319,11 @@ submodule etsi-nfv-vnf {
}
leaf coordination-id {
type leafref {
path "../../lcm-operations-coordination/id";
}
description
"Reference to applicable VNF LCM operation coordination
type leafref {
path "../../lcm-operations-coordination/id";
}
description
"Reference to applicable VNF LCM operation coordination
actions.";
reference
"GS NFV IFA011: Section 7.1.15.2 VnfPackageChangeInfo
......@@ -3253,11 +3331,11 @@ submodule etsi-nfv-vnf {
}
leaf dst-flavour-id {
type leafref {
path "../../df/id";
}
description
"Identifies the deployment flavour in the destination VNF
type leafref {
path "../../df/id";
}
description
"Identifies the deployment flavour in the destination VNF
package for which this change applies. The flavour ID is
defined in the destination VNF package.";
reference
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment