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 1029: Remove dead code: sal-schema-repository-api"
[controller.git]
/
opendaylight
/
md-sal
/
samples
/
toaster-provider
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sample
/
toaster
/
provider
/
OpendaylightToaster.java
diff --git
a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java
b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java
index b4da5a3d226f05bfd02fe21890ea0307e7efb2ce..2ecd7e7b684fe8bdafd6af17527cbb21daeee83f 100644
(file)
--- a/
opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java
+++ b/
opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java
@@
-37,7
+37,9
@@
import org.opendaylight.controller.sal.binding.api.data.DataChangeListener;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.common.RpcError;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.common.RpcError;
+import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yangtools.yang.common.RpcError.ErrorSeverity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@
-157,14
+159,15
@@
public class OpendaylightToaster implements ToasterService, ToasterProviderRunti
LOG.info( "Toaster is already making toast" );
RpcResult<Void> result = Rpcs.<Void> getRpcResult(false, null, Arrays.asList(
LOG.info( "Toaster is already making toast" );
RpcResult<Void> result = Rpcs.<Void> getRpcResult(false, null, Arrays.asList(
- RpcErrors.getRpcError(
null, null, null, null
,
- "Toaster is busy",
null
, null ) ) );
+ RpcErrors.getRpcError(
"", "in-use", null, ErrorSeverity.WARNING
,
+ "Toaster is busy",
ErrorType.APPLICATION
, null ) ) );
return Futures.immediateFuture(result);
}
else if( outOfBread() ) {
RpcResult<Void> result = Rpcs.<Void> getRpcResult(false, null, Arrays.asList(
return Futures.immediateFuture(result);
}
else if( outOfBread() ) {
RpcResult<Void> result = Rpcs.<Void> getRpcResult(false, null, Arrays.asList(
- RpcErrors.getRpcError( null, null, null, null,
- "Toaster is out of bread", null, null ) ) );
+ RpcErrors.getRpcError( "out-of-stock", "resource-denied", null, null,
+ "Toaster is out of bread",
+ ErrorType.APPLICATION, null ) ) );
return Futures.immediateFuture(result);
}
else {
return Futures.immediateFuture(result);
}
else {