Commit 82f542ca authored by Mahesh Jethanandani's avatar Mahesh Jethanandani

Merge branch 'bug#226' into 'master'

Fix for bug#226

See merge request !35
parents ffd1ff0f 081346e0
Pipeline #510 passed with stage
in 0 seconds
...@@ -41,9 +41,16 @@ ...@@ -41,9 +41,16 @@
</virtual-storage-descriptor> </virtual-storage-descriptor>
<sw-image-desc> <sw-image-desc>
<id>asa-image</id> <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> <container-format>bare</container-format>
<disk-format>qcow2</disk-format> <disk-format>qcow2</disk-format>
<min-ram>2.0</min-ram> <min-ram>2.0</min-ram>
<size>1</size>
<image>http://www.cisco.com/asa.qcow2</image> <image>http://www.cisco.com/asa.qcow2</image>
</sw-image-desc> </sw-image-desc>
<ext-cpd> <ext-cpd>
...@@ -136,9 +143,16 @@ ...@@ -136,9 +143,16 @@
</virtual-storage-descriptor> </virtual-storage-descriptor>
<sw-image-desc> <sw-image-desc>
<id>csr-image</id> <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> <container-format>bare</container-format>
<disk-format>qcow2</disk-format> <disk-format>qcow2</disk-format>
<min-ram>2.0</min-ram> <min-ram>2.0</min-ram>
<size>1</size>
<image>http://www.cisco.com/csr.qcow2</image> <image>http://www.cisco.com/csr.qcow2</image>
</sw-image-desc> </sw-image-desc>
<ext-cpd> <ext-cpd>
......
...@@ -804,6 +804,7 @@ submodule etsi-nfv-vnf { ...@@ -804,6 +804,7 @@ submodule etsi-nfv-vnf {
information element"; information element";
} }
leaf name { leaf name {
mandatory true;
type string; type string;
description description
"The name of this software image."; "The name of this software image.";
...@@ -811,7 +812,9 @@ submodule etsi-nfv-vnf { ...@@ -811,7 +812,9 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.5 SwImageDesc "GS NFV IFA011: Section 7.1.6.5 SwImageDesc
information element."; information element.";
} }
leaf version { leaf version {
mandatory true;
type string; type string;
description description
"The version of this software image."; "The version of this software image.";
...@@ -819,8 +822,11 @@ submodule etsi-nfv-vnf { ...@@ -819,8 +822,11 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.5 SwImageDesc "GS NFV IFA011: Section 7.1.6.5 SwImageDesc
information element."; information element.";
} }
container checksum { container checksum {
leaf algorithm { leaf algorithm {
mandatory true;
type identityref { type identityref {
base checksum-algorithm; base checksum-algorithm;
} }
...@@ -831,7 +837,9 @@ submodule etsi-nfv-vnf { ...@@ -831,7 +837,9 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.10 ChecksumData "GS NFV IFA011: Section 7.1.6.10 ChecksumData
information element."; information element.";
} }
leaf hash { leaf hash {
mandatory true;
type string; type string;
description description
"Contains the result of applying the algorithm "Contains the result of applying the algorithm
...@@ -847,6 +855,7 @@ submodule etsi-nfv-vnf { ...@@ -847,6 +855,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.5 SwImageDesc "GS NFV IFA011: Section 7.1.6.5 SwImageDesc
information element."; information element.";
} }
leaf container-format { leaf container-format {
default "bare"; default "bare";
type enumeration { type enumeration {
...@@ -887,6 +896,7 @@ submodule etsi-nfv-vnf { ...@@ -887,6 +896,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.5 SwImageDesc "GS NFV IFA011: Section 7.1.6.5 SwImageDesc
information element."; information element.";
} }
leaf disk-format { leaf disk-format {
default "qcow2"; default "qcow2";
type enumeration { type enumeration {
...@@ -945,6 +955,7 @@ submodule etsi-nfv-vnf { ...@@ -945,6 +955,7 @@ submodule etsi-nfv-vnf {
"The disk format of a software image is the format of "The disk format of a software image is the format of
the underlying disk image."; the underlying disk image.";
} }
leaf min-disk { leaf min-disk {
type uint64; type uint64;
units "GB"; units "GB";
...@@ -959,6 +970,7 @@ submodule etsi-nfv-vnf { ...@@ -959,6 +970,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.5, SwImageDesc "GS NFV IFA011: Section 7.1.6.5, SwImageDesc
information element."; information element.";
} }
leaf min-ram { leaf min-ram {
type decimal64 { type decimal64 {
fraction-digits 1; fraction-digits 1;
...@@ -976,7 +988,9 @@ submodule etsi-nfv-vnf { ...@@ -976,7 +988,9 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.5, SwImageDesc "GS NFV IFA011: Section 7.1.6.5, SwImageDesc
information element."; information element.";
} }
leaf size { leaf size {
mandatory true;
type uint64; type uint64;
units "GB"; units "GB";
description description
...@@ -985,6 +999,7 @@ submodule etsi-nfv-vnf { ...@@ -985,6 +999,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.5, SwImageDesc "GS NFV IFA011: Section 7.1.6.5, SwImageDesc
information element."; information element.";
} }
leaf image { leaf image {
default "."; default ".";
type inet:uri; type inet:uri;
...@@ -996,6 +1011,7 @@ submodule etsi-nfv-vnf { ...@@ -996,6 +1011,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.5, SwImageDesc "GS NFV IFA011: Section 7.1.6.5, SwImageDesc
information element."; information element.";
} }
leaf operating-system { leaf operating-system {
type string; type string;
description description
...@@ -1006,6 +1022,7 @@ submodule etsi-nfv-vnf { ...@@ -1006,6 +1022,7 @@ submodule etsi-nfv-vnf {
"GS NFV IFA011: Section 7.1.6.5, SwImageDesc "GS NFV IFA011: Section 7.1.6.5, SwImageDesc
information element."; information element.";
} }
leaf-list supported-virtualization-environment { leaf-list supported-virtualization-environment {
type string; type string;
description 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