X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2FRestconfImpl.xtend;h=d9ac53589fa5415bcba3e59467576fcbb98d069e;hb=refs%2Fchanges%2F21%2F2921%2F1;hp=a41a48287df87f887dd37c12b0fd88f4539f7597;hpb=5da475147b19f8d9e601813da1e356f2c677d131;p=controller.git diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.xtend b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.xtend index a41a48287d..d9ac53589f 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.xtend +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.xtend @@ -1,10 +1,12 @@ package org.opendaylight.controller.sal.restconf.impl import java.util.List +import javax.ws.rs.core.Response import org.opendaylight.controller.sal.rest.api.RestconfService import org.opendaylight.yangtools.yang.data.api.CompositeNode import org.opendaylight.yangtools.yang.model.api.DataNodeContainer import org.opendaylight.yangtools.yang.model.api.DataSchemaNode +import org.opendaylight.controller.md.sal.common.api.TransactionStatus class RestconfImpl implements RestconfService { @@ -48,13 +50,21 @@ class RestconfImpl implements RestconfService { override createConfigurationData(String identifier, CompositeNode payload) { val identifierWithSchemaNode = identifier.toInstanceIdentifier val value = resolveNodeNamespaceBySchema(payload, identifierWithSchemaNode.schemaNode) - return broker.commitConfigurationDataPut(identifierWithSchemaNode.instanceIdentifier,value).get(); + val status = broker.commitConfigurationDataPut(identifierWithSchemaNode.instanceIdentifier,value).get(); + switch status.result { + case TransactionStatus.COMMITED: Response.status(Response.Status.OK).build + default: Response.status(Response.Status.INTERNAL_SERVER_ERROR).build + } } override updateConfigurationData(String identifier, CompositeNode payload) { val identifierWithSchemaNode = identifier.toInstanceIdentifier val value = resolveNodeNamespaceBySchema(payload, identifierWithSchemaNode.schemaNode) - return broker.commitConfigurationDataPut(identifierWithSchemaNode.instanceIdentifier,value).get(); + val status = broker.commitConfigurationDataPut(identifierWithSchemaNode.instanceIdentifier,value).get(); + switch status.result { + case TransactionStatus.COMMITED: Response.status(Response.Status.NO_CONTENT).build + default: Response.status(Response.Status.INTERNAL_SERVER_ERROR).build + } } override invokeRpc(String identifier, CompositeNode payload) { @@ -88,13 +98,21 @@ class RestconfImpl implements RestconfService { override createOperationalData(String identifier, CompositeNode payload) { val identifierWithSchemaNode = identifier.toInstanceIdentifier val value = resolveNodeNamespaceBySchema(payload, identifierWithSchemaNode.schemaNode) - return broker.commitOperationalDataPut(identifierWithSchemaNode.instanceIdentifier,value).get(); + val status = broker.commitOperationalDataPut(identifierWithSchemaNode.instanceIdentifier,value).get(); + switch status.result { + case TransactionStatus.COMMITED: Response.status(Response.Status.OK).build + default: Response.status(Response.Status.INTERNAL_SERVER_ERROR).build + } } override updateOperationalData(String identifier, CompositeNode payload) { val identifierWithSchemaNode = identifier.toInstanceIdentifier val value = resolveNodeNamespaceBySchema(payload, identifierWithSchemaNode.schemaNode) - return broker.commitOperationalDataPut(identifierWithSchemaNode.instanceIdentifier,value).get(); + val status = broker.commitOperationalDataPut(identifierWithSchemaNode.instanceIdentifier,value).get(); + switch status.result { + case TransactionStatus.COMMITED: Response.status(Response.Status.NO_CONTENT).build + default: Response.status(Response.Status.INTERNAL_SERVER_ERROR).build + } } private def CompositeNode resolveNodeNamespaceBySchema(CompositeNode node, DataSchemaNode schema) {