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 "Implement finding a primary based on the shard name and do basic wiring of...
[controller.git]
/
opendaylight
/
md-sal
/
sal-dom-broker
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
dom
/
broker
/
MountPointImpl.java
diff --git
a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/MountPointImpl.java
b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/MountPointImpl.java
index dc554a072769ae0ecadf74601aa059cdbfc2d4eb..623bbdb19514ce15ffa0b9102959fbac77cb51d2 100644
(file)
--- a/
opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/MountPointImpl.java
+++ b/
opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/MountPointImpl.java
@@
-9,7
+9,6
@@
package org.opendaylight.controller.sal.dom.broker;
import java.util.List;
import java.util.Set;
import java.util.List;
import java.util.Set;
-import java.util.concurrent.Future;
import org.opendaylight.controller.md.sal.common.api.RegistrationListener;
import org.opendaylight.controller.md.sal.common.api.data.DataCommitHandler;
import org.opendaylight.controller.md.sal.common.api.RegistrationListener;
import org.opendaylight.controller.md.sal.common.api.data.DataCommitHandler;
@@
-41,6
+40,8
@@
import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
+import com.google.common.util.concurrent.ListenableFuture;
+
public class MountPointImpl implements MountProvisionInstance, SchemaContextProvider {
private final SchemaAwareRpcBroker rpcs;
public class MountPointImpl implements MountProvisionInstance, SchemaContextProvider {
private final SchemaAwareRpcBroker rpcs;
@@
-122,9
+123,8
@@
public class MountPointImpl implements MountProvisionInstance, SchemaContextProv
return rpcs.getSupportedRpcs();
}
return rpcs.getSupportedRpcs();
}
-
@Override
@Override
- public
RpcResult<CompositeNode
> invokeRpc(QName rpc, CompositeNode input) {
+ public
ListenableFuture<RpcResult<CompositeNode>
> invokeRpc(QName rpc, CompositeNode input) {
return rpcs.invokeRpc(rpc, input);
}
return rpcs.invokeRpc(rpc, input);
}
@@
-133,10
+133,9
@@
public class MountPointImpl implements MountProvisionInstance, SchemaContextProv
return rpcs.addRpcRegistrationListener(listener);
}
return rpcs.addRpcRegistrationListener(listener);
}
-
@Override
@Override
- public Future<RpcResult<CompositeNode>> rpc(QName type, CompositeNode input) {
- return
null
;
+ public
Listenable
Future<RpcResult<CompositeNode>> rpc(QName type, CompositeNode input) {
+ return
rpcs.invokeRpc( type, input )
;
}
@Override
}
@Override
@@
-227,6
+226,4
@@
public class MountPointImpl implements MountProvisionInstance, SchemaContextProv
L listener) {
return rpcs.registerRouteChangeListener(listener);
}
L listener) {
return rpcs.registerRouteChangeListener(listener);
}
-
-
}
}