projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Build on jenkins nodes with label docker"
[osm/SO.git]
/
models
/
plugins
/
yang
/
nsr.yang
diff --git
a/models/plugins/yang/nsr.yang
b/models/plugins/yang/nsr.yang
index
97c32de
..
a3f9f57
100644
(file)
--- a/
models/plugins/yang/nsr.yang
+++ b/
models/plugins/yang/nsr.yang
@@
-271,11
+271,7
@@
module nsr
../../../../nsd:constituent-vnfd
+ [nsr:id = current()/../nsd:id-ref]
+ /nsd:vnfd-id-ref
../../../../nsd:constituent-vnfd
+ [nsr:id = current()/../nsd:id-ref]
+ /nsd:vnfd-id-ref
- NOTE: An issue with confd is preventing the
- use of xpath. Seems to be an issue with leafref
- to leafref, whose target is in a different module.
- Once that is resovled this will switched to use
- leafref";
+ NOTE: confd limitations prevent the use of xpath";
type yang:uuid;
}
type yang:uuid;
}
@@
-413,7
+409,7
@@
module nsr
description
"Type of Service Function.
NOTE: This needs to map with Service Function Type in ODL to
description
"Type of Service Function.
NOTE: This needs to map with Service Function Type in ODL to
- support VNFFG. Service Function Type is man
a
datory param in ODL
+ support VNFFG. Service Function Type is mandatory param in ODL
SFC. This is temporarily set to string for ease of use";
type string;
}
SFC. This is temporarily set to string for ease of use";
type string;
}
@@
-859,7
+855,7
@@
module nsr
leaf member-vnf-index-ref {
description
"Reference to member-vnf within constituent-vnfds";
leaf member-vnf-index-ref {
description
"Reference to member-vnf within constituent-vnfds";
- type
string
;
+ type
uint64
;
}
leaf vnfd-id-ref {
}
leaf vnfd-id-ref {
@@
-869,11
+865,7
@@
module nsr
../../../../nsd:constituent-vnfd
+ [nsd:id = current()/../nsd:id-ref]
+ /nsd:vnfd-id-ref
../../../../nsd:constituent-vnfd
+ [nsd:id = current()/../nsd:id-ref]
+ /nsd:vnfd-id-ref
- NOTE: An issue with confd is preventing the
- use of xpath. Seems to be an issue with leafref
- to leafref, whose target is in a different module.
- Once that is resovled this will switched to use
- leafref";
+ NOTE: confd limitations prevent the use of xpath";
type string;
}
type string;
}
@@
-931,12
+923,17
@@
module nsr
}
list parameter {
}
list parameter {
+ description
+ "List of parameters for the initial config primitive";
key "name";
leaf name {
key "name";
leaf name {
+ description "Name of the intitial config parameter";
type string;
}
leaf value {
type string;
}
leaf value {
+ description "Value associated with the initial config
+ parameter";
type string;
}
}
type string;
}
}
@@
-1178,11
+1175,7
@@
module nsr
../../../../nsd:constituent-vnfd
+ [nsd:id = current()/../nsd:id-ref]
+ /nsd:vnfd-id-ref
../../../../nsd:constituent-vnfd
+ [nsd:id = current()/../nsd:id-ref]
+ /nsd:vnfd-id-ref
- NOTE: An issue with confd is preventing the
- use of xpath. Seems to be an issue with leafref
- to leafref, whose target is in a different module.
- Once that is resovled this will switched to use
- leafref";
+ NOTE: confd limitations prevent the use of xpath";
type string;
}
type string;
}