projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "RIFT-15099 Model changes and implementation for passing meta-data and custom...
[osm/SO.git]
/
models
/
plugins
/
yang
/
vnfd.yang
diff --git
a/models/plugins/yang/vnfd.yang
b/models/plugins/yang/vnfd.yang
index
81bb2aa
..
dab7499
100644
(file)
--- a/
models/plugins/yang/vnfd.yang
+++ b/
models/plugins/yang/vnfd.yang
@@
-115,14
+115,7
@@
module vnfd
}
}
}
}
- container vnfd-catalog {
-
- description
- "Virtual Network Function Descriptor (VNFD).";
-
- list vnfd {
- key "id";
-
+ grouping vnfd-descriptor {
leaf id {
description "Identifier for the VNFD.";
type string;
leaf id {
description "Identifier for the VNFD.";
type string;
@@
-366,6
+359,8
@@
module vnfd
}
}
}
}
+ uses manotypes:custom-boot-data;
+
list internal-connection-point {
key "id";
description
list internal-connection-point {
key "id";
description
@@
-490,7
+485,7
@@
module vnfd
key "name";
uses manotypes:placement-group-info;
key "name";
uses manotypes:placement-group-info;
-
+
list member-vdus {
description
list member-vdus {
description
@@
-504,7
+499,17
@@
module vnfd
}
}
}
}
}
}
- }
+ }
+
+ container vnfd-catalog {
+ description
+ "Virtual Network Function Descriptor (VNFD).";
+
+ list vnfd {
+ key "id";
+
+ uses vnfd-descriptor;
+ }
}
}
}
}