import org.opendaylight.controller.config.api.jmx.CommitStatus;
import org.opendaylight.controller.config.util.ConfigRegistryClient;
import org.opendaylight.controller.netconf.api.NetconfDocumentedException;
-import org.opendaylight.controller.netconf.api.NetconfDocumentedException.ErrorSeverity;
-import org.opendaylight.controller.netconf.api.NetconfDocumentedException.ErrorTag;
-import org.opendaylight.controller.netconf.api.NetconfDocumentedException.ErrorType;
import org.opendaylight.controller.netconf.confignetconfconnector.transactions.TransactionProvider;
import org.opendaylight.controller.netconf.util.xml.XmlElement;
import org.opendaylight.controller.netconf.util.xml.XmlNetconfConstants;
+import org.opendaylight.controller.netconf.util.xml.XmlUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import java.util.HashMap;
-import java.util.Map;
+import com.google.common.base.Optional;
public class Commit extends AbstractConfigNetconfOperation {
this.transactionProvider = transactionProvider;
}
- private static void checkXml(XmlElement xml) {
+ private static void checkXml(XmlElement xml) throws NetconfDocumentedException {
xml.checkName(XmlNetconfConstants.COMMIT);
xml.checkNamespace(XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0);
}
}
@Override
- protected Element handle(Document document, XmlElement xml) throws NetconfDocumentedException {
- checkXml(xml);
+ protected Element handleWithNoSubsequentOperations(Document document, XmlElement xml) throws NetconfDocumentedException {
+ checkXml(xml);
CommitStatus status;
try {
status = this.transactionProvider.commitTransaction();
- } catch (final IllegalStateException e) {
- // FIXME: when can IllegalStateException occur?
- logger.warn("Commit failed: ", e);
- final Map<String, String> errorInfo = new HashMap<>();
- errorInfo.put(ErrorTag.operation_failed.name(),
- "Operation failed. Use 'get-config' or 'edit-config' before triggering 'commit' operation");
- throw new NetconfDocumentedException(e.getMessage(), e, ErrorType.application, ErrorTag.operation_failed,
- ErrorSeverity.error, errorInfo);
- } catch (ValidationException e) {
+ logger.trace("Datastore {} committed successfully: {}", Datastore.candidate, status);
+ } catch (ConflictingVersionException | ValidationException e) {
throw NetconfDocumentedException.wrap(e);
- } catch (ConflictingVersionException e) {
- throw NetconfDocumentedException.wrap(e);
-
}
logger.trace("Datastore {} committed successfully: {}", Datastore.candidate, status);
- return document.createElement(XmlNetconfConstants.OK);
+ return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.<String>absent());
}
}