AbstractConfigTest - exposed BundleContext and ServiceRegistration mock.

[controller.git] / opendaylight / md-sal / sal-rest-connector / src / main / java / org / opendaylight / controller / sal / restconf / impl / BrokerFacade.xtend

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 e4cff4d6b14d54c93a80509d70fd386fc8477018..3c31c5a313ec0b45a9a8390729638331d4a7a7a0 100644 (file)
--- 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
@@ -7,15 +7,28 @@ import org.opendaylight.yangtools.yang.common.QName
 import org.opendaylight.yangtools.yang.common.RpcResult
 import org.opendaylight.yangtools.yang.data.api.CompositeNode
 import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier
+import static org.opendaylight.controller.sal.restconf.impl.BrokerFacade.*
 
 class BrokerFacade implements DataReader<InstanceIdentifier, CompositeNode> {
 
+    val static BrokerFacade INSTANCE = new BrokerFacade
+
     @Property
     private ConsumerSession context;
-    
+
     @Property
     private DataBrokerService dataService;
     
+    private new() {
+        if (INSTANCE != null) {
+            throw new IllegalStateException("Already instantiated");
+        }
+    }
+    
+    def static BrokerFacade getInstance() {
+        return INSTANCE
+    }
+
     override readConfigurationData(InstanceIdentifier path) {
         return dataService.readConfigurationData(path);
     }
@@ -23,21 +36,21 @@ class BrokerFacade implements DataReader<InstanceIdentifier, CompositeNode> {
     override readOperationalData(InstanceIdentifier path) {
         return dataService.readOperationalData(path);
     }
-    
+
     def RpcResult<CompositeNode> invokeRpc(QName type, CompositeNode payload) {
         val future = context.rpc(type, payload);
         return future.get;
     }
-    
-    def commitConfigurationDataUpdate(InstanceIdentifier path, CompositeNode payload) {
+
+    def commitConfigurationDataPut(InstanceIdentifier path, CompositeNode payload) {
         val transaction = dataService.beginTransaction;
         transaction.putConfigurationData(path, payload);
         return transaction.commit()
     }
-    
-    def commitConfigurationDataCreate(InstanceIdentifier path, CompositeNode payload) {
+
+    def commitOperationalDataPut(InstanceIdentifier path, CompositeNode payload) {
         val transaction = dataService.beginTransaction;
-        transaction.putConfigurationData(path, payload);
+        transaction.putOperationalData(path, payload);
         return transaction.commit()
     }