From: Robert Varga <rovarga@cisco.com>
Date: Wed, 16 Dec 2015 21:28:13 +0000 (+0100)
Subject: BUG-1014: adjust compatibility tests
X-Git-Tag: release/beryllium~72
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=081b7c2541d901f752cf04a395347ede337be8c2

BUG-1014: adjust compatibility tests

Hydrogen compatibility tests used operational data with configuration
datastore, preventing merge job from completing. Switch to using
operational datastore.

Change-Id: Ifb0dac52523f87d0b6482e4741036ef8395ff3a8
Signed-off-by: Robert Varga <rovarga@cisco.com>
---

diff --git a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/DataServiceIT.java b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/DataServiceIT.java
index b73cb42198..dd95e03131 100644
--- a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/DataServiceIT.java
+++ b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/DataServiceIT.java
@@ -65,11 +65,11 @@ public class DataServiceIT extends AbstractIT {
         assertNotNull(transaction);
 
         InstanceIdentifier<UnorderedList> node1 = createNodeRef("0");
-        DataObject node = consumerDataService.readConfigurationData(node1);
+        DataObject node = consumerDataService.readOperationalData(node1);
         assertNull(node);
         UnorderedList nodeData1 = createNode("0");
 
-        transaction.putConfigurationData(node1, nodeData1);
+        transaction.putOperationalData(node1, nodeData1);
         Future<RpcResult<TransactionStatus>> commitResult = transaction.commit();
         assertNotNull(commitResult);
 
@@ -79,14 +79,14 @@ public class DataServiceIT extends AbstractIT {
         assertNotNull(result.getResult());
         assertEquals(TransactionStatus.COMMITED, result.getResult());
 
-        UnorderedList readedData = (UnorderedList) consumerDataService.readConfigurationData(node1);
+        UnorderedList readedData = (UnorderedList) consumerDataService.readOperationalData(node1);
         assertNotNull(readedData);
         assertEquals(nodeData1.getKey(), readedData.getKey());
 
         DataModificationTransaction transaction2 = consumerDataService.beginTransaction();
         assertNotNull(transaction2);
 
-        transaction2.removeConfigurationData(node1);
+        transaction2.removeOperationalData(node1);
 
         Future<RpcResult<TransactionStatus>> commitResult2 = transaction2.commit();
         assertNotNull(commitResult2);
@@ -97,7 +97,7 @@ public class DataServiceIT extends AbstractIT {
         assertNotNull(result2.getResult());
         assertEquals(TransactionStatus.COMMITED, result2.getResult());
 
-        DataObject readedData2 = consumerDataService.readConfigurationData(node1);
+        DataObject readedData2 = consumerDataService.readOperationalData(node1);
         assertNull(readedData2);
     }