Fixed performance issues with implementation of BA-to-BI mapping

[controller.git] / opendaylight / md-sal / sal-binding-broker / src / test / java / org / opendaylight / controller / sal / binding / test / connect / dom / BrokerIntegrationTest.java

diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/BrokerIntegrationTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/BrokerIntegrationTest.java
index 0448238665dc0cbb7ea9f31d3f69ee3353b05f9f..0e35ee650e91041a592d6526a186bb9d4580fab3 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/BrokerIntegrationTest.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/BrokerIntegrationTest.java
@@ -14,7 +14,9 @@ import org.opendaylight.controller.sal.binding.api.data.DataModificationTransact
 import org.opendaylight.controller.sal.binding.api.data.DataProviderService;
 import org.opendaylight.controller.sal.binding.impl.DataBrokerImpl;
 import org.opendaylight.controller.sal.binding.impl.connect.dom.BindingIndependentDataServiceConnector;
+import org.opendaylight.controller.sal.binding.impl.connect.dom.BindingIndependentMappingService;
 import org.opendaylight.controller.sal.binding.impl.connect.dom.MappingServiceImpl;
+import org.opendaylight.controller.sal.binding.impl.connect.dom.RuntimeGeneratedMappingServiceImpl;
 import org.opendaylight.controller.sal.core.api.data.DataBrokerService;
 import org.opendaylight.controller.sal.dom.broker.impl.HashMapDataStore;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
@@ -34,8 +36,8 @@ public class BrokerIntegrationTest {
 
     DataBrokerService biDataService;
     DataProviderService baDataService;
-    private MappingServiceImpl mappingServiceImpl;
-    private MappingServiceImpl mappingService;
+    private RuntimeGeneratedMappingServiceImpl mappingServiceImpl;
+    private BindingIndependentMappingService mappingService;
     private DataBrokerImpl baDataImpl;
     private org.opendaylight.controller.sal.dom.broker.DataBrokerImpl biDataImpl;
     private ListeningExecutorService executor;
@@ -60,9 +62,9 @@ public class BrokerIntegrationTest {
         biDataImpl.registerOperationalReader(treeRoot, dataStore);
         biDataImpl.registerCommitHandler(treeRoot, dataStore);
         
-        mappingServiceImpl = new MappingServiceImpl();
+        mappingServiceImpl = new RuntimeGeneratedMappingServiceImpl();
         mappingService = mappingServiceImpl;
-        
+        mappingServiceImpl.start();
         
         connectorServiceImpl = new BindingIndependentDataServiceConnector();
         connectorServiceImpl.setBaDataService(baDataService);
@@ -73,20 +75,21 @@ public class BrokerIntegrationTest {
         String[] yangFiles = new String[] { "yang-ext.yang", "ietf-inet-types.yang", "ietf-yang-types.yang",
         "node-inventory.yang" };
         
-        mappingService.onGlobalContextUpdated(MappingServiceTest.getContext(yangFiles));
+        mappingServiceImpl.onGlobalContextUpdated(MappingServiceTest.getContext(yangFiles));
+        
     }
     
     @Test
     public void simpleModifyOperation() throws Exception {
         
-        DataModificationTransaction transaction = baDataService.beginTransaction();
-        assertNotNull(transaction);
         
         NodeRef node1 = createNodeRef("0");
         DataObject  node = baDataService.readConfigurationData(node1.getValue());
         assertNull(node);
         Node nodeData1 = createNode("0");
         
+        
+        DataModificationTransaction transaction = baDataService.beginTransaction();
         transaction.putConfigurationData(node1.getValue(), nodeData1);
         Future<RpcResult<TransactionStatus>> commitResult = transaction.commit();
         assertNotNull(commitResult);
@@ -102,18 +105,50 @@ public class BrokerIntegrationTest {
         assertEquals(nodeData1.getKey(), readedData.getKey());
         
         
-        DataModificationTransaction transaction2 = baDataService.beginTransaction();
+        NodeRef nodeFoo = createNodeRef("foo");
+        NodeRef nodeBar = createNodeRef("bar");
+        Node nodeFooData = createNode("foo");
+        Node nodeBarData = createNode("bar");
+        
+        
+        DataModificationTransaction insertMoreTr = baDataService.beginTransaction();
+        insertMoreTr.putConfigurationData(nodeFoo.getValue(), nodeFooData);
+        insertMoreTr.putConfigurationData(nodeBar.getValue(), nodeBarData);
+        RpcResult<TransactionStatus> result2 = insertMoreTr.commit().get();
+        
+        assertNotNull(result2);
+        assertNotNull(result2.getResult());
+        assertEquals(TransactionStatus.COMMITED, result.getResult());
+        
+        Nodes allNodes = (Nodes) baDataService.readConfigurationData(InstanceIdentifier.builder().node(Nodes.class).toInstance());
+        assertNotNull(allNodes);
+        assertNotNull(allNodes.getNode());
+        assertEquals(3, allNodes.getNode().size());
+        
+        
+        /**
+         * We create transaction no 2
+         * 
+         */
+        DataModificationTransaction removalTransaction = baDataService.beginTransaction();
         assertNotNull(transaction);
         
-        transaction2.removeConfigurationData(node1.getValue());
+        /**
+         * We remove node 1
+         * 
+         */
+        removalTransaction.removeConfigurationData(node1.getValue());
         
-        Future<RpcResult<TransactionStatus>> commitResult2 = transaction2.commit();
+        /**
+         * We commit transaction
+         */
+        Future<RpcResult<TransactionStatus>> commitResult2 = removalTransaction.commit();
         assertNotNull(commitResult2);
         
-        RpcResult<TransactionStatus> result2 = commitResult2.get();
+        RpcResult<TransactionStatus> result3 = commitResult2.get();
         
-        assertNotNull(result2);
-        assertNotNull(result2.getResult());
+        assertNotNull(result3);
+        assertNotNull(result3.getResult());
         assertEquals(TransactionStatus.COMMITED, result2.getResult());
     
         DataObject readedData2 = baDataService.readConfigurationData(node1.getValue());