Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
NFV - Network Functions Virtualisation
SOL006
Commits
ffd1ff0f
Commit
ffd1ff0f
authored
Mar 27, 2019
by
jethanandani
Browse files
Merge branch 'bug#225' into 'master'
Fix for bug#225 See merge request
!34
parents
cb62bb4c
99084012
Pipeline
#509
passed with stage
in 0 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
example-data/nfv.xml
View file @
ffd1ff0f
...
...
@@ -36,7 +36,7 @@
</virtual-compute-desc>
<virtual-storage-descriptor>
<id>
asa-vsd
</id>
<type-of-storage>
root
</type-of-storage>
<type-of-storage>
root
-storage
</type-of-storage>
<size-of-storage>
0
</size-of-storage>
</virtual-storage-descriptor>
<sw-image-desc>
...
...
@@ -131,7 +131,7 @@
</virtual-compute-desc>
<virtual-storage-descriptor>
<id>
csr-vsd
</id>
<type-of-storage>
root
</type-of-storage>
<type-of-storage>
root
-storage
</type-of-storage>
<size-of-storage>
0
</size-of-storage>
</virtual-storage-descriptor>
<sw-image-desc>
...
...
src/yang/etsi-nfv-common.yang
View file @
ffd1ff0f
...
...
@@ -216,7 +216,30 @@ submodule etsi-nfv-common {
reference
"GS NFV IFA011: Section 7.1.6.10 Checksum information element."
;
}
identity
storage-type
{
description
"Base type of storage that identities can derive from."
;
}
identity
root-storage
{
base
storage-type
;
description
"Root type of storage."
;
}
identity
swap-storage
{
base
storage-type
;
description
"Swap type of storage."
;
}
identity
ephemeral-storage
{
base
storage-type
;
description
"Ephemeral type of storage."
;
}
/*
* Typedefs
*/
...
...
src/yang/etsi-nfv-vnf.yang
View file @
ffd1ff0f
...
...
@@ -727,12 +727,10 @@ submodule etsi-nfv-vnf {
leaf
type-of-storage
{
// Needed to be able to onboard images
type
enumeration
{
enum
"root"
;
enum
"swap"
;
enum
"ephemeral"
;
}
default
"root"
;
default
"root-storage"
;
type
identityref
{
base
storage-type
;
}
description
"Type of virtualised storage resource (e.g. volume,
object)."
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment