X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=mappingservice%2Fimplementation%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Flispflowmapping%2Fimplementation%2Futil%2FRPCInputConvertorUtil.java;h=5629a8c707907276346f6a0b1049702645a4b215;hb=970c3dbd56428e43f2c13f7c2fdb13dd0696aeaf;hp=66c6f60faccbf4f109a04ab35233a6960e48ffcd;hpb=21057aba188ba36de60d984519005eec6b6a0319;p=lispflowmapping.git

diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/RPCInputConvertorUtil.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/RPCInputConvertorUtil.java
index 66c6f60fa..5629a8c70 100644
--- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/RPCInputConvertorUtil.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/RPCInputConvertorUtil.java
@@ -7,18 +7,19 @@
  */
 package org.opendaylight.lispflowmapping.implementation.util;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.AddKeyInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.AddMappingInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.EidUri;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.MappingOrigin;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.RemoveKeyInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.RemoveMappingInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.UpdateKeyInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.UpdateMappingInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.db.instance.AuthenticationKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.db.instance.AuthenticationKeyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.db.instance.Mapping;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150314.db.instance.MappingBuilder;
+import org.opendaylight.lispflowmapping.lisp.util.LispAddressStringifier;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150820.AddKeyInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150820.AddMappingInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150820.EidUri;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150820.MappingOrigin;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150820.RemoveKeyInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150820.RemoveMappingInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150820.UpdateKeyInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150820.UpdateMappingInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150820.db.instance.AuthenticationKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150820.db.instance.AuthenticationKeyBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150820.db.instance.Mapping;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150820.db.instance.MappingBuilder;
 
 /**
  * Converts RPC *Input object to other object types
@@ -29,7 +30,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mapping.database.rev150
 public class RPCInputConvertorUtil {
     public static AuthenticationKey toAuthenticationKey(AddKeyInput input) {
         AuthenticationKeyBuilder akb = new AuthenticationKeyBuilder();
-        akb.setEid(new EidUri(LispAFIConvertor.toString(input.getLispAddressContainer())));
+        akb.setEid(new EidUri(LispAddressStringifier.getURIString(
+                input.getLispAddressContainer())));
         akb.setLispAddressContainer(input.getLispAddressContainer());
         akb.setMaskLength(input.getMaskLength());
         akb.setKeyType(input.getKeyType());
@@ -39,7 +41,8 @@ public class RPCInputConvertorUtil {
 
     public static AuthenticationKey toAuthenticationKey(UpdateKeyInput input) {
         AuthenticationKeyBuilder akb = new AuthenticationKeyBuilder();
-        akb.setEid(new EidUri(LispAFIConvertor.toString(input.getEid().getLispAddressContainer())));
+        akb.setEid(new EidUri(LispAddressStringifier.getURIString(
+                input.getEid().getLispAddressContainer())));
         akb.setLispAddressContainer(input.getEid().getLispAddressContainer());
         akb.setMaskLength(input.getEid().getMaskLength());
         akb.setKeyType(input.getKey().getKeyType());
@@ -49,7 +52,8 @@ public class RPCInputConvertorUtil {
 
     public static AuthenticationKey toAuthenticationKey(RemoveKeyInput input) {
         AuthenticationKeyBuilder akb = new AuthenticationKeyBuilder();
-        akb.setEid(new EidUri(LispAFIConvertor.toString(input.getLispAddressContainer())));
+        akb.setEid(new EidUri(LispAddressStringifier.getURIString(
+                input.getLispAddressContainer())));
         akb.setLispAddressContainer(input.getLispAddressContainer());
         akb.setMaskLength(input.getMaskLength());
         return akb.build();
@@ -57,7 +61,8 @@ public class RPCInputConvertorUtil {
 
     public static Mapping toMapping(AddMappingInput input) {
         MappingBuilder mb = new MappingBuilder();
-        mb.setEid(new EidUri(LispAFIConvertor.toString(input.getLispAddressContainer())));
+        mb.setEid(new EidUri(LispAddressStringifier.getURIString(
+                input.getLispAddressContainer())));
         mb.setOrigin(MappingOrigin.Northbound);
         mb.setRecordTtl(input.getRecordTtl());
         mb.setMaskLength(input.getMaskLength());
@@ -71,7 +76,8 @@ public class RPCInputConvertorUtil {
 
     public static Mapping toMapping(UpdateMappingInput input) {
         MappingBuilder mb = new MappingBuilder();
-        mb.setEid(new EidUri(LispAFIConvertor.toString(input.getLispAddressContainer())));
+        mb.setEid(new EidUri(LispAddressStringifier.getURIString(
+                input.getLispAddressContainer())));
         mb.setOrigin(MappingOrigin.Northbound);
         mb.setRecordTtl(input.getRecordTtl());
         mb.setMaskLength(input.getMaskLength());
@@ -85,7 +91,8 @@ public class RPCInputConvertorUtil {
 
     public static Mapping toMapping(RemoveMappingInput input) {
         MappingBuilder mb = new MappingBuilder();
-        mb.setEid(new EidUri(LispAFIConvertor.toString(input.getLispAddressContainer())));
+        mb.setEid(new EidUri(LispAddressStringifier.getURIString(
+                input.getLispAddressContainer())));
         mb.setOrigin(MappingOrigin.Northbound);
         mb.setMaskLength(input.getMaskLength());
         mb.setLispAddressContainer(input.getLispAddressContainer());