projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v1.0'
[osm/SO.git]
/
models
/
plugins
/
yang
/
nsr.yang
diff --git
a/models/plugins/yang/nsr.yang
b/models/plugins/yang/nsr.yang
index
c6bb4ec
..
e8b65ae
100644
(file)
--- a/
models/plugins/yang/nsr.yang
+++ b/
models/plugins/yang/nsr.yang
@@
-98,7
+98,9
@@
module nsr
leaf key-pair-ref {
description "A reference to the key pair entry in the global key pair table";
leaf key-pair-ref {
description "A reference to the key pair entry in the global key pair table";
- type string;
+ type leafref {
+ path "/nsr:key-pair/nsr:name";
+ }
}
}
list user {
}
}
list user {
@@
-113,19
+115,17
@@
module nsr
description "The user name's real name";
type string;
}
description "The user name's real name";
type string;
}
- list key-pair {
- key "name";
- description "Used to configure the list of public keys to be injected as part
- of ns instantiation";
+ list ssh-authorized-key {
+ key "key-pair-ref";
- leaf name {
- description "Name of this key pair";
- type string;
- }
+ description "Used to configure the list of public keys to be injected as part
+ of ns instantiation";
- leaf key {
- description "Key associated with this key pair";
- type string;
+ leaf key-pair-ref {
+ description "A reference to the key pair entry in the global key pair table";
+ type leafref {
+ path "/nsr:key-pair/nsr:name";
+ }
}
}
}
}
}
}
@@
-133,7
+133,7
@@
module nsr
list key-pair {
key "name";
list key-pair {
key "name";
- description "Used to configure the list of public keys to be injected as part
+ description "Used to configure the list of public keys to be injected as part
of ns instantiation";
leaf name {
description "Name of this key pair";
of ns instantiation";
leaf name {
description "Name of this key pair";
@@
-151,13
+151,15
@@
module nsr
input {
leaf name {
mandatory true;
input {
leaf name {
mandatory true;
- description "Name of the Network Service";
+ description "Name of the Network Service";
type string;
}
leaf nsd-ref {
description "Reference to NSR ID ref";
mandatory true;
type string;
}
leaf nsd-ref {
description "Reference to NSR ID ref";
mandatory true;
- type string;
+ type leafref {
+ path "/nsd:nsd-catalog/nsd:nsd/nsd:id";
+ }
}
uses ns-instance-config-params;
}
}
uses ns-instance-config-params;
}
@@
-263,8
+265,8
@@
module nsr
key "placement-group-ref vnfd-id-ref";
leaf vnfd-id-ref {
key "placement-group-ref vnfd-id-ref";
leaf vnfd-id-ref {
- description
- "A reference to a vnfd. This is a
+ description
+ "A reference to a vnfd. This is a
leafref to path:
../../../../nsd:constituent-vnfd
+ [nsr:id = current()/../nsd:id-ref]
leafref to path:
../../../../nsd:constituent-vnfd
+ [nsr:id = current()/../nsd:id-ref]
@@
-325,7
+327,7
@@
module nsr
"The SDN account to use when requesting resources for
this vnffgr";
type leafref {
"The SDN account to use when requesting resources for
this vnffgr";
type leafref {
- path "/rwsdn:sdn
-
account/rwsdn:name";
+ path "/rwsdn:sdn
/rwsdn:
account/rwsdn:name";
}
}
}
}
@@
-611,6
+613,14
@@
module nsr
type uint32;
}
type uint32;
}
+ leaf uptime {
+ description
+ "Active period of this Network Service.
+ Uptime is expressed in seconds";
+
+ type uint32;
+ }
+
list connection-point {
description
"List for external connection points.
list connection-point {
description
"List for external connection points.