projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from master
[osm/SO.git]
/
models
/
plugins
/
yang
/
rw-vnfr.yang
diff --git
a/models/plugins/yang/rw-vnfr.yang
b/models/plugins/yang/rw-vnfr.yang
index
6337cad
..
6614f16
100644
(file)
--- a/
models/plugins/yang/rw-vnfr.yang
+++ b/
models/plugins/yang/rw-vnfr.yang
@@
-27,14
+27,16
@@
module rw-vnfr
prefix "manotypes";
}
prefix "manotypes";
}
- import rw-pb-ext { prefix "rwpb"; }
+ import rw-pb-ext {
+ prefix "rwpb";
+ }
import vnfr {
prefix "vnfr";
}
import vnfr {
prefix "vnfr";
}
- import vnfd {
- prefix "vnfd";
+ import
project-
vnfd {
+ prefix "
project-
vnfd";
}
import rw-cloud {
}
import rw-cloud {
@@
-57,7
+59,7
@@
module rw-vnfr
prefix "rw-project";
}
prefix "rw-project";
}
- revision 2017-02-
0
8 {
+ revision 2017-02-
2
8 {
description
"Update model to support projects.";
}
description
"Update model to support projects.";
}
@@
-288,7
+290,7
@@
module rw-vnfr
leaf vnfd-id-ref {
description "Reference to VNFD";
type leafref {
leaf vnfd-id-ref {
description "Reference to VNFD";
type leafref {
- path "../../../
vnfd:vnfd-catalog/vnfd:vnfd/
vnfd:id";
+ path "../../../
project-vnfd:vnfd-catalog/project-vnfd:vnfd/project-
vnfd:id";
}
}
leaf instance-ref-count {
}
}
leaf instance-ref-count {