projects
/
osm
/
IM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor manotypes:vnf-configuration
[osm/IM.git]
/
models
/
yang
/
vnfd.yang
diff --git
a/models/yang/vnfd.yang
b/models/yang/vnfd.yang
index
51bb9f7
..
60fc757
100644
(file)
--- a/
models/yang/vnfd.yang
+++ b/
models/yang/vnfd.yang
@@
-27,14
+27,6
@@
module vnfd
prefix "manotypes";
}
prefix "manotypes";
}
- import rw-pb-ext {
- prefix "rwpb";
- }
-
- import ietf-yang-types {
- prefix "yang";
- }
-
import ietf-inet-types {
prefix "inet";
}
import ietf-inet-types {
prefix "inet";
}
@@
-157,7
+149,9
@@
module vnfd
type string;
}
type string;
}
- uses manotypes:vnf-configuration;
+ container vnf-configuration {
+ uses manotypes:vca-configuration;
+ }
container mgmt-interface {
description
container mgmt-interface {
description
@@
-363,6
+357,10
@@
module vnfd
uses manotypes:image-properties;
uses manotypes:image-properties;
+ container vdu-configuration {
+ uses manotypes:vca-configuration;
+ }
+
choice cloud-init-input {
description
"Indicates how the contents of cloud-init script are provided.
choice cloud-init-input {
description
"Indicates how the contents of cloud-init script are provided.