projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "358 - Handling Vnf delete conflicts from RO"
[osm/SO.git]
/
models
/
plugins
/
yang
/
nsr.tailf.yang
diff --git
a/models/plugins/yang/nsr.tailf.yang
b/models/plugins/yang/nsr.tailf.yang
index
b68872e
..
6d5d882
100644
(file)
--- a/
models/plugins/yang/nsr.tailf.yang
+++ b/
models/plugins/yang/nsr.tailf.yang
@@
-1,7
+1,7
@@
/*
*
/*
*
- * Copyright 2016 RIFT.IO Inc
+ * Copyright 2016
-2017
RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-31,22
+31,23
@@
module nsr-annotation
prefix nsr;
}
prefix nsr;
}
- tailf:annotate "/nsr:ns-instance-opdata" {
+ import rw-project {
+ prefix "rw-project";
+ }
+
+ tailf:annotate "/rw-project:project/nsr:ns-instance-opdata" {
tailf:callpoint rw_callpoint;
}
tailf:annotate "/nsr:exec-ns-service-primitive" {
tailf:actionpoint rw_actionpoint;
}
tailf:callpoint rw_callpoint;
}
tailf:annotate "/nsr:exec-ns-service-primitive" {
tailf:actionpoint rw_actionpoint;
}
- tailf:annotate "/nsr:
exec-scale-out
" {
+ tailf:annotate "/nsr:
get-ns-service-primitive-values
" {
tailf:actionpoint rw_actionpoint;
}
tailf:annotate "/nsr:exec-scale-in" {
tailf:actionpoint rw_actionpoint;
}
tailf:actionpoint rw_actionpoint;
}
tailf:annotate "/nsr:exec-scale-in" {
tailf:actionpoint rw_actionpoint;
}
- tailf:annotate "/nsr:get-ns-service-primitive-values" {
- tailf:actionpoint rw_actionpoint;
- }
- tailf:annotate "/nsr:start-network-service" {
+ tailf:annotate "/nsr:exec-scale-out" {
tailf:actionpoint rw_actionpoint;
}
}
tailf:actionpoint rw_actionpoint;
}
}