X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2FBrokerFacade.xtend;h=6e05d3f24a5c46e7e479e8bada1e00d5b4c3c1f1;hp=343601865d80bfeaf3ca5899bdb59c08cee25041;hb=4142ab5dce3021e6f6551aada26c7523cd134844;hpb=ea29b59d27064ff61a23d9ac3081bd1669acd14f diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/BrokerFacade.xtend b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/BrokerFacade.xtend index 343601865d..6e05d3f24a 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/BrokerFacade.xtend +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/BrokerFacade.xtend @@ -10,6 +10,7 @@ import org.opendaylight.yangtools.yang.common.RpcResult import org.opendaylight.yangtools.yang.data.api.CompositeNode import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier import org.slf4j.LoggerFactory +import org.opendaylight.controller.sal.core.api.mount.MountInstance class BrokerFacade implements DataReader { @@ -41,15 +42,27 @@ class BrokerFacade implements DataReader { override readConfigurationData(InstanceIdentifier path) { checkPreconditions - LOG.info("Read Configuration via Restconf: {}", path) + LOG.trace("Read Configuration via Restconf: {}", path) return dataService.readConfigurationData(path); } + + def readConfigurationDataBehindMountPoint(MountInstance mountPoint, InstanceIdentifier path) { + checkPreconditions + LOG.trace("Read Configuration via Restconf: {}", path) + return mountPoint.readConfigurationData(path); + } override readOperationalData(InstanceIdentifier path) { checkPreconditions - LOG.info("Read Operational via Restconf: {}", path) + LOG.trace("Read Operational via Restconf: {}", path) return dataService.readOperationalData(path); } + + def readOperationalDataBehindMountPoint(MountInstance mountPoint, InstanceIdentifier path) { + checkPreconditions + LOG.trace("Read Operational via Restconf: {}", path) + return mountPoint.readOperationalData(path); + } def RpcResult invokeRpc(QName type, CompositeNode payload) { checkPreconditions @@ -60,7 +73,15 @@ class BrokerFacade implements DataReader { def commitConfigurationDataPut(InstanceIdentifier path, CompositeNode payload) { checkPreconditions val transaction = dataService.beginTransaction; - LOG.info("Put Configuration via Restconf: {}", path) + LOG.trace("Put Configuration via Restconf: {}", path) + transaction.putConfigurationData(path, payload); + return transaction.commit + } + + def commitConfigurationDataPutBehindMountPoint(MountInstance mountPoint, InstanceIdentifier path, CompositeNode payload) { + checkPreconditions + val transaction = mountPoint.beginTransaction; + LOG.trace("Put Configuration via Restconf: {}", path) transaction.putConfigurationData(path, payload); return transaction.commit } @@ -70,16 +91,37 @@ class BrokerFacade implements DataReader { val transaction = dataService.beginTransaction; transaction.putConfigurationData(path, payload); if (payload == transaction.createdConfigurationData.get(path)) { - LOG.info("Post Configuration via Restconf: {}", path) + LOG.trace("Post Configuration via Restconf: {}", path) + return transaction.commit + } + LOG.trace("Post Configuration via Restconf was not executed because data already exists: {}", path) + return null; + } + + def commitConfigurationDataPostBehindMountPoint(MountInstance mountPoint, InstanceIdentifier path, CompositeNode payload) { + checkPreconditions + val transaction = mountPoint.beginTransaction; + transaction.putConfigurationData(path, payload); + if (payload == transaction.createdConfigurationData.get(path)) { + LOG.trace("Post Configuration via Restconf: {}", path) return transaction.commit } - LOG.info("Post Configuration via Restconf was not executed because data already exists: {}", path) + LOG.trace("Post Configuration via Restconf was not executed because data already exists: {}", path) return null; } def commitConfigurationDataDelete(InstanceIdentifier path) { checkPreconditions val transaction = dataService.beginTransaction; + LOG.info("Delete Configuration via Restconf: {}", path) + transaction.removeConfigurationData(path) + return transaction.commit + } + + def commitConfigurationDataDeleteBehindMountPoint(MountInstance mountPoint, InstanceIdentifier path) { + checkPreconditions + val transaction = mountPoint.beginTransaction; + LOG.info("Delete Configuration via Restconf: {}", path) transaction.removeConfigurationData(path) return transaction.commit }