Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "BUG-190 Simplify reconnect logic in protocol-framework."
[controller.git]
/
opendaylight
/
md-sal
/
sal-protocolbuffer-encoding
/
src
/
main
/
resources
/
ShardTransaction.proto
diff --git
a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardTransaction.proto
b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardTransaction.proto
index f22a6db84de90896c5a83fa5f86b5755bd1cc945..9684b7d72f57679ad069f31320bf00f0e989380c 100644
(file)
--- a/
opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardTransaction.proto
+++ b/
opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardTransaction.proto
@@
-1,8
+1,8
@@
package org.opendaylight.controller.mdsal;
package org.opendaylight.controller.mdsal;
-import "
SimpleNormalizedNode
.proto";
+import "
Common
.proto";
-option java_package = "org.opendaylight.controller.
cluster.datastore
.transaction";
+option java_package = "org.opendaylight.controller.
protobuff.messages
.transaction";
option java_outer_classname = "ShardTransactionMessages";
message CloseTransaction{
option java_outer_classname = "ShardTransactionMessages";
message CloseTransaction{
@@
-13,11
+13,12
@@
message CloseTransactionReply{
}
message CreateTransaction{
}
message CreateTransaction{
-
+ required string transactionId = 1;
}
message CreateTransactionReply{
}
message CreateTransactionReply{
-required string transactionPath = 1;
+required string transactionActorPath = 1;
+required string transactionId = 2;
}
}
@@
-30,26
+31,36
@@
required string actorPath = 1;
}
message DeleteData {
}
message DeleteData {
-re
peated string
instanceIdentifierPathArguments = 1;
+re
quired InstanceIdentifier
instanceIdentifierPathArguments = 1;
}
message DeleteDataReply{
}
message ReadData {
}
message DeleteDataReply{
}
message ReadData {
-required
string
instanceIdentifierPathArguments=1;
+required
InstanceIdentifier
instanceIdentifierPathArguments=1;
}
message ReadDataReply{
}
message ReadDataReply{
-
required NormalizedNodeXml
normalizedNode=1;
+
optional Node
normalizedNode=1;
}
message WriteData {
}
message WriteData {
- re
peated string
instanceIdentifierPathArguments = 1;
-required No
rmalizedNodeXml
normalizedNode =2;
+ re
quired InstanceIdentifier
instanceIdentifierPathArguments = 1;
+required No
de
normalizedNode =2;
}
message WriteDataReply{
}
message WriteDataReply{
-}
\ No newline at end of file
+}
+
+message MergeData {
+ required InstanceIdentifier instanceIdentifierPathArguments = 1;
+required Node normalizedNode =2;
+
+}
+
+message MergeDataReply{
+
+}