GNPy client refactor

[transportpce.git] / pce / src / test / java / org / opendaylight / transportpce / pce / PceSendingPceRPCsTest.java

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java
index 5291e5ce081735cc2de0a6c670b49942a7cdccd4..299d9379ea61ffb2ef559f32cf0c2884cb1bb5a7 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java
@@ -18,8 +18,9 @@ import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.dom.codec.spi.BindingDOMCodecServices;
 import org.opendaylight.transportpce.common.network.NetworkTransactionImpl;
 import org.opendaylight.transportpce.common.network.RequestProcessor;
-import org.opendaylight.transportpce.pce.gnpy.ConnectToGnpyServer;
 import org.opendaylight.transportpce.pce.gnpy.JerseyServer;
+import org.opendaylight.transportpce.pce.gnpy.consumer.GnpyConsumer;
+import org.opendaylight.transportpce.pce.gnpy.consumer.GnpyConsumerImpl;
 import org.opendaylight.transportpce.pce.utils.PceTestData;
 import org.opendaylight.transportpce.pce.utils.PceTestUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
@@ -36,6 +37,7 @@ public class PceSendingPceRPCsTest extends AbstractTest {
     private BindingDOMCodecServices bindingDOMCodecServices;
     private JerseyServer jerseyServer = new JerseyServer();
     private DataBroker dataBroker;
+    private GnpyConsumer gnpyConsumer;
 
 
     @Before
@@ -43,8 +45,10 @@ public class PceSendingPceRPCsTest extends AbstractTest {
         this.dataBroker = getNewDataBroker();
         networkTransaction = new NetworkTransactionImpl(new RequestProcessor(this.dataBroker));
         PceTestUtils.writeNetworkInDataStore(this.dataBroker);
+        gnpyConsumer = new GnpyConsumerImpl("http://localhost:9998",
+                "mylogin", "mypassword", getDataStoreContextUtil().getBindingDOMCodecServices());
         pceSendingPceRPCs = new PceSendingPceRPCs(PceTestData.getPCE_test1_request_54(),
-                        networkTransaction, bindingDOMCodecServices);
+                        networkTransaction, gnpyConsumer);
     }
 
     @Test
@@ -58,11 +62,10 @@ public class PceSendingPceRPCsTest extends AbstractTest {
         jerseyServer.setUp();
         pceSendingPceRPCs =
                 new PceSendingPceRPCs(PceTestData.getGnpyPCERequest("XPONDER-1", "XPONDER-2"),
-                        networkTransaction, null);
+                        networkTransaction, gnpyConsumer);
 
         pceSendingPceRPCs.pathComputation();
-        ConnectToGnpyServer connectToGnpy = new ConnectToGnpyServer();
-        Assert.assertTrue(connectToGnpy.isGnpyURLExist());
+        Assert.assertTrue(gnpyConsumer.isAvailable());
         jerseyServer.tearDown();
 
     }