Cleanup of Lisp in VPP renderer

[groupbasedpolicy.git] / renderers / vpp / src / main / java / org / opendaylight / groupbasedpolicy / renderer / vpp / commands / LoopbackCommandWrapper.java

diff --git a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/commands/LoopbackCommandWrapper.java b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/commands/LoopbackCommandWrapper.java
index 94c52614dcabd733c891a3d44fffa305cba64b5c..95c89934d2742ef4974ef2548ab8e410f32e4625 100644 (file)
--- a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/commands/LoopbackCommandWrapper.java
+++ b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/commands/LoopbackCommandWrapper.java
@@ -14,49 +14,20 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 
 public class LoopbackCommandWrapper {
 
-    public static LoopbackCommand simpleLoopbackPutCommand(String interfaceName,
-                                                    long vrf,
-                                                    IpAddress ipAddress,
-                                                    IpPrefix cidr) {
+    public static LoopbackCommand simpleLoopbackPutCommand(String interfaceName, long vrf, IpAddress ipAddress,
+        IpPrefix cidr) {
         LoopbackCommand.LoopbackCommandBuilder simpleLoopbackCommandBuilder =
-                simpleLoopbackCommandBuilder(interfaceName, vrf, ipAddress, cidr);
-        simpleLoopbackCommandBuilder.setOperation(General.Operations.PUT);
+                simpleLoopbackCommandBuilder(interfaceName, vrf, ipAddress, cidr).setOperation(General.Operations.PUT);
         return simpleLoopbackCommandBuilder.build();
     }
 
-    public static LoopbackCommand bviLoopbackPutCommand(String interfaceName,
-                                                 long vrf,
-                                                 IpAddress ipAddress,
-                                                 IpPrefix cidr,
-                                                 String bridgeDomainName) {
-        LoopbackCommand.LoopbackCommandBuilder bviLoopbackCommandBuilder =
-                bviLoopbackCommandBuilder(interfaceName, vrf, ipAddress, cidr, bridgeDomainName);
-        bviLoopbackCommandBuilder.setOperation(General.Operations.PUT);
-        return bviLoopbackCommandBuilder.build();
-    }
-
-    private static LoopbackCommand.LoopbackCommandBuilder simpleLoopbackCommandBuilder(String interfaceName,
-                                                                                       long vrf,
-                                                                                       IpAddress ipAddress,
-                                                                                       IpPrefix cidr) {
-        LoopbackCommand.LoopbackCommandBuilder loopbackCommandBuilder = new LoopbackCommand.LoopbackCommandBuilder();
-        loopbackCommandBuilder.setInterfaceName(interfaceName);
-        loopbackCommandBuilder.setEnabled(true);
-        loopbackCommandBuilder.setVrfId(vrf);
-        loopbackCommandBuilder.setIpAddress(ipAddress);
-        loopbackCommandBuilder.setIpPrefix(cidr);
-        return loopbackCommandBuilder;
-    }
-
-    private static LoopbackCommand.LoopbackCommandBuilder bviLoopbackCommandBuilder(String interfaceName,
-                                                                                    long vrf,
-                                                                                    IpAddress ipAddress,
-                                                                                    IpPrefix cidr,
-                                                                                    String bridgeDomainName) {
-        LoopbackCommand.LoopbackCommandBuilder simpleLoopbackCommandBuilder =
-                simpleLoopbackCommandBuilder(interfaceName, vrf, ipAddress, cidr);
-        simpleLoopbackCommandBuilder.setBridgeDomain(bridgeDomainName);
-        simpleLoopbackCommandBuilder.setBvi(true);
-        return simpleLoopbackCommandBuilder;
+    private static LoopbackCommand.LoopbackCommandBuilder simpleLoopbackCommandBuilder(String interfaceName, long vrf,
+        IpAddress ipAddress, IpPrefix cidr) {
+        return new LoopbackCommand.LoopbackCommandBuilder()
+            .setInterfaceName(interfaceName)
+            .setEnabled(true)
+            .setVrfId(vrf)
+            .setIpAddress(ipAddress)
+            .setIpPrefix(cidr);
     }
 }