Skip to content

GitLab

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

Address comments received in SOL#96

parent 29b957e3
Pipeline #740 passed with stage
in 0 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 16 deletions
example-data/nfv.xml
View file @ d1fb2181
......@@ -43,6 +43,7 @@
<id>asa-image</id>
<container-format>bare</container-format>
<disk-format>qcow2</disk-format>
<min-disk>1</min-disk>
<min-ram>2.0</min-ram>
<image>http://www.cisco.com/asa.qcow2</image>
</sw-image-desc>
......@@ -92,6 +93,17 @@
</vdu-level>
</instantiation-level>
<default-instantiation-level>single</default-instantiation-level>
<lcm-operations-configuration>
<scale-vnf-to-level-op-config>
<arbitrary-target-levels-supported>true</arbitrary-target-levels-supported>
</scale-vnf-to-level-op-config>
<terminate-vnf-op-config>
<min-graceful-termination>1</min-graceful-termination>
</terminate-vnf-op-config>
<operate-vnf-op-config>
<min-graceful-stop-timeout>1</min-graceful-stop-timeout>
</operate-vnf-op-config>
</lcm-operations-configuration>
</df>
</vnfd>
<vnfd>
......@@ -138,6 +150,7 @@
<id>csr-image</id>
<container-format>bare</container-format>
<disk-format>qcow2</disk-format>
<min-disk>1</min-disk>
<min-ram>2.0</min-ram>
<image>http://www.cisco.com/csr.qcow2</image>
</sw-image-desc>
......@@ -187,6 +200,17 @@
</vdu-level>
</instantiation-level>
<default-instantiation-level>single</default-instantiation-level>
<lcm-operations-configuration>
<scale-vnf-to-level-op-config>
<arbitrary-target-levels-supported>true</arbitrary-target-levels-supported>
</scale-vnf-to-level-op-config>
<terminate-vnf-op-config>
<min-graceful-termination>1</min-graceful-termination>
</terminate-vnf-op-config>
<operate-vnf-op-config>
<min-graceful-stop-timeout>1</min-graceful-stop-timeout>
</operate-vnf-op-config>
</lcm-operations-configuration>
</df>
</vnfd>
<nsd>
......
src/yang/etsi-nfv-common.yang
View file @ d1fb2181
......@@ -469,7 +469,7 @@ submodule etsi-nfv-common {
when "../type='mac-address'";
leaf mac-address-assignment {
type boolean;
default true;
mandatory true;
description
"Specify if the MAC address assignment is the
responsibility of management and orchestration function
......@@ -495,7 +495,7 @@ submodule etsi-nfv-common {
when "../type='ip-address'";
leaf ip-address-assignment {
type boolean;
default "true";
mandatory true;
description
"Specify if the address assignment is the responsibility
of management and orchestration function or not. If it
......@@ -508,7 +508,7 @@ submodule etsi-nfv-common {
leaf floating-ip-activated {
type boolean;
default "true";
mandatory true;
description
"Specify if the floating IP scheme is activated on the CP
or not.";
......
src/yang/etsi-nfv-ns.yang
View file @ d1fb2181
......@@ -754,7 +754,7 @@ submodule etsi-nfv-ns {
}
leaf min-number-of-instances {
default 1;
mandatory true;
type uint16;
description
"Minimum number of instances of the VNF based on this
......@@ -765,7 +765,7 @@ submodule etsi-nfv-ns {
}
leaf max-number-of-instances {
default 1;
mandatory true;
type uint16;
description
"Maximum number of instances of the VNF based on this
......@@ -1178,7 +1178,7 @@ submodule etsi-nfv-ns {
}
leaf number-of-instances {
default 1;
mandatory true;
type uint32;
description
"Specifies the number of VNF instances required for
......@@ -1238,7 +1238,7 @@ submodule etsi-nfv-ns {
}
leaf number-of-instances {
default 1;
mandatory true;
type uint32;
description
"Specifies the number of nested NS instances required
......@@ -1342,9 +1342,10 @@ submodule etsi-nfv-ns {
"GS NFV IFA014: Section 6.3.11.2 NsProfile information
element";
}
leaf min-number-of-instances {
type uint16;
default 1;
mandatory true;
description
"Minimum number of nested NS instances based on the
referenced NSD that is permitted to exist for this
......@@ -1355,7 +1356,7 @@ submodule etsi-nfv-ns {
}
leaf max-number-of-instances {
type uint16;
default 1;
mandatory true;
description
"Maximum number of nested NS instances based on the
referenced NSD that is permitted to exist for this
......
src/yang/etsi-nfv-vnf.yang
View file @ d1fb2181
......@@ -551,7 +551,7 @@ submodule etsi-nfv-vnf {
range "0..max";
}
units "GB";
default 1;
mandatory true;
description
"Amount of virtual memory in GB.";
reference
......@@ -749,7 +749,7 @@ submodule etsi-nfv-vnf {
leaf size-of-storage {
type uint64;
units "GB";
default 0;
mandatory true;
description
"Size of virtualised storage resource (e.g. size of
volume, in GB)";
......@@ -936,7 +936,7 @@ submodule etsi-nfv-vnf {
leaf min-disk {
type uint64;
units "GB";
default 0;
mandatory true;
description
"The minimal disk size requirement for this software
image. The value of the 'size of storage' attribute
......@@ -1466,7 +1466,7 @@ submodule etsi-nfv-vnf {
enum ipv4;
enum ipv6;
}
default "ipv4";
mandatory true;
description
"Specifies IP version of this L3 protocol.
Value:
......@@ -1783,7 +1783,7 @@ submodule etsi-nfv-vnf {
leaf arbitrary-target-levels-supported {
type boolean;
default "false";
mandatory true;
description
"Signals whether scaling according to the parameter
'scaleInfo' is supported by this VNF.";
......@@ -1837,7 +1837,7 @@ submodule etsi-nfv-vnf {
leaf min-graceful-termination {
type yang:timeticks;
default "1";
mandatory true;
description
"Minimum timeout value for graceful termination of
a VNF instance.";
......@@ -1889,7 +1889,7 @@ submodule etsi-nfv-vnf {
leaf min-graceful-stop-timeout {
type yang:timeticks;
default "1";
mandatory true;
description
"Minimum timeout value for graceful stop of a VNF
instance.";
......
Markdown is supported
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