New API for GNPy

[transportpce.git] / pce / src / main / java / org / opendaylight / transportpce / pce / gnpy / consumer / GnpyConsumerImpl.java

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/consumer/GnpyConsumerImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/consumer/GnpyConsumerImpl.java
index 4913624a5b034c62dc806c242e3b7e4ad9f53f6f..cd4b6eb69913b9f7c070c8101772948ef6f504d8 100644 (file)
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/consumer/GnpyConsumerImpl.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/consumer/GnpyConsumerImpl.java
@@ -17,8 +17,8 @@ import org.glassfish.jersey.jackson.JacksonFeature;
 import org.glassfish.jersey.logging.LoggingFeature;
 import org.opendaylight.mdsal.binding.dom.codec.spi.BindingDOMCodecServices;
 import org.opendaylight.transportpce.common.converter.JsonStringConverter;
-import org.opendaylight.yang.gen.v1.gnpy.gnpy.api.rev190103.GnpyApi;
-import org.opendaylight.yang.gen.v1.gnpy.path.rev200909.Result;
+import org.opendaylight.yang.gen.v1.gnpy.gnpy.api.rev220221.Request;
+import org.opendaylight.yang.gen.v1.gnpy.path.rev220221.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,14 +26,15 @@ public class GnpyConsumerImpl implements GnpyConsumer {
     private static final Logger LOG = LoggerFactory.getLogger(GnpyConsumerImpl.class);
 
     private GnpyResource api;
-    private JsonStringConverter<GnpyApi> gnpyApiConverter;
-    private JsonStringConverter<Result> resultConverter;
+    JsonStringConverter<Request> gnpyRequestConverter;
+    JsonStringConverter<Result> resultConverter;
 
     public GnpyConsumerImpl(String baseUrl, String username, String password,
             BindingDOMCodecServices bindingDOMCodecServices) {
-        gnpyApiConverter = new JsonStringConverter<>(bindingDOMCodecServices);
+        gnpyRequestConverter = new JsonStringConverter<>(bindingDOMCodecServices);
         resultConverter = new JsonStringConverter<>(bindingDOMCodecServices);
-        JsonConfigurator jsonConfigurator = new JsonConfigurator(gnpyApiConverter, resultConverter);
+
+        JsonConfigurator jsonConfigurator = new JsonConfigurator(gnpyRequestConverter, resultConverter);
         Client client = ClientBuilder.newClient();
         HttpAuthenticationFeature authFeature = HttpAuthenticationFeature.basic(username, password);
         client.register(authFeature);
@@ -45,7 +46,7 @@ public class GnpyConsumerImpl implements GnpyConsumer {
     @Override
     public boolean isAvailable() {
         try {
-            api.checkStatus();
+            api.getStatus();
             LOG.info("GNPy is available");
             return true;
         } catch (WebApplicationException | ProcessingException e) {
@@ -55,7 +56,7 @@ public class GnpyConsumerImpl implements GnpyConsumer {
     }
 
     @Override
-    public Result computePaths(GnpyApi request) {
+    public Result computePaths(Request request) {
         try {
             return api.computePathRequest(request);
         } catch (WebApplicationException | ProcessingException e) {