projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 113 add VNFD copy to VNFR
[osm/SO.git]
/
models
/
plugins
/
yang
/
vnfr.yang
diff --git
a/models/plugins/yang/vnfr.yang
b/models/plugins/yang/vnfr.yang
index
4a427d4
..
14a2d81
100644
(file)
--- a/
models/plugins/yang/vnfr.yang
+++ b/
models/plugins/yang/vnfr.yang
@@
-199,11
+199,17
@@
module vnfr
type uint32;
}
type uint32;
}
- leaf vnfd-ref {
- description "Reference to VNFD";
- type leafref {
- path "/vnfd:vnfd-catalog/vnfd:vnfd/vnfd:id";
- }
+ leaf uptime {
+ description
+ "Active period of this Virtual Network Function.
+ Uptime is expressed in seconds";
+
+ type uint32;
+ }
+
+ container vnfd {
+ description "VNF descriptor used to instantiate this VNF";
+ uses vnfd:vnfd-descriptor;
}
// Use parameters provided here to configure this VNF
}
// Use parameters provided here to configure this VNF
@@
-288,9
+294,7
@@
module vnfr
leaf vdu-id-ref {
type leafref {
leaf vdu-id-ref {
type leafref {
- path "/vnfd:vnfd-catalog/vnfd:vnfd"
- + "[vnfd:id = current()/../../vnfr:vnfd-ref]"
- + "/vnfd:vdu/vnfd:id";
+ path "../../vnfd/vdu/id";
}
}
}
}
@@
-330,6
+334,22
@@
module vnfr
uses manotypes:hypervisor-epa;
uses manotypes:host-epa;
uses manotypes:hypervisor-epa;
uses manotypes:host-epa;
+ list volumes {
+ key "name";
+
+ leaf name {
+ description "Name of the disk-volumes, e.g. vda, vdb etc";
+ type string;
+ }
+
+ leaf volume-id {
+ description "VIM assigned volume id";
+ type string;
+ }
+
+ uses manotypes:volume-info;
+ }
+
list alarms {
description
"A list of the alarms that have been created for this VDU";
list alarms {
description
"A list of the alarms that have been created for this VDU";