Commit 081346e0 authored by Mahesh Jethanandani's avatar Mahesh Jethanandani

Fix for bug#226

parent ff2f13fa
Pipeline #459 passed with stage
in 0 seconds
......@@ -41,9 +41,16 @@
</virtual-storage-descriptor>
<sw-image-desc>
<id>asa-image</id>
<name>ASA image</name>
<version>1.1</version>
<checksum>
<algorithm>sha-224</algorithm>
<hash>deadbeef</hash>
</checksum>
<container-format>bare</container-format>
<disk-format>qcow2</disk-format>
<min-ram>2.0</min-ram>
<size>1</size>
<image>http://www.cisco.com/asa.qcow2</image>
</sw-image-desc>
<ext-cpd>
......@@ -136,9 +143,16 @@
</virtual-storage-descriptor>
<sw-image-desc>
<id>csr-image</id>
<name>CSR image</name>
<version>1.1</version>
<checksum>
<algorithm>sha-224</algorithm>
<hash>deadbeef</hash>
</checksum>
<container-format>bare</container-format>
<disk-format>qcow2</disk-format>
<min-ram>2.0</min-ram>
<size>1</size>
<image>http://www.cisco.com/csr.qcow2</image>
</sw-image-desc>
<ext-cpd>
......
......@@ -812,6 +812,7 @@ submodule etsi-nfv-vnf {
information element";
}
leaf name {
mandatory true;
type string;
description
"The name of this software image.";
......@@ -819,7 +820,9 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.5 SwImageDesc
information element.";
}
leaf version {
mandatory true;
type string;
description
"The version of this software image.";
......@@ -827,8 +830,11 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.5 SwImageDesc
information element.";
}
container checksum {
leaf algorithm {
mandatory true;
type identityref {
base checksum-algorithm;
}
......@@ -839,7 +845,9 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.10 ChecksumData
information element.";
}
leaf hash {
mandatory true;
type string;
description
"Contains the result of applying the algorithm
......@@ -855,6 +863,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.5 SwImageDesc
information element.";
}
leaf container-format {
default "bare";
type enumeration {
......@@ -895,6 +904,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.5 SwImageDesc
information element.";
}
leaf disk-format {
default "qcow2";
type enumeration {
......@@ -953,6 +963,7 @@ submodule etsi-nfv-vnf {
"The disk format of a software image is the format of
the underlying disk image.";
}
leaf min-disk {
type uint64;
units "GB";
......@@ -967,6 +978,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.5, SwImageDesc
information element.";
}
leaf min-ram {
type decimal64 {
fraction-digits 1;
......@@ -984,7 +996,9 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.5, SwImageDesc
information element.";
}
leaf size {
mandatory true;
type uint64;
units "GB";
description
......@@ -993,6 +1007,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.5, SwImageDesc
information element.";
}
leaf image {
default ".";
type inet:uri;
......@@ -1004,6 +1019,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.5, SwImageDesc
information element.";
}
leaf operating-system {
type string;
description
......@@ -1014,6 +1030,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.5, SwImageDesc
information element.";
}
leaf-list supported-virtualization-environment {
type string;
description
......
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