From b8cf23cd61c2d3f57f9450570236534bce69232e Mon Sep 17 00:00:00 2001
From: Jan Srnicek <jsrnicek@cisco.com>
Date: Tue, 15 Aug 2017 11:30:28 +0200
Subject: HONEYCOMB-386 - Hc2vpp Customizers update

Utilizes new default update implementation

Change-Id: I9bf8473336274ba5fcfc18804f7b414937b3708e
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
---
 .../java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizer.java    | 9 ---------
 .../main/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizer.java | 9 ---------
 .../main/java/io/fd/hc2vpp/nat/write/NatInstaceCustomizer.java   | 7 -------
 .../fd/hc2vpp/nat/write/ifc/AbstractInterfaceNatCustomizer.java  | 8 --------
 4 files changed, 33 deletions(-)

(limited to 'nat/nat2vpp/src/main')

diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizer.java
index 505318c22..61fedbd48 100644
--- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ExternalIpPoolCustomizer.java
@@ -59,15 +59,6 @@ final class ExternalIpPoolCustomizer implements ListWriterCustomizer<ExternalIpA
         LOG.debug("Address range: {} added successfully", id);
     }
 
-    @Override
-    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<ExternalIpAddressPool> id,
-                                        @Nonnull final ExternalIpAddressPool dataBefore,
-                                        @Nonnull final ExternalIpAddressPool dataAfter,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        throw new WriteFailedException.UpdateFailedException(id, dataBefore, dataAfter,
-                new UnsupportedOperationException("Address range update is not supported"));
-    }
-
     @Override
     public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<ExternalIpAddressPool> id,
                                         @Nonnull final ExternalIpAddressPool dataBefore,
diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizer.java
index 0d08a5587..35ed9e2d8 100644
--- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/MappingEntryCustomizer.java
@@ -126,15 +126,6 @@ final class MappingEntryCustomizer implements ListWriterCustomizer<MappingEntry,
         return false;
     }
 
-    @Override
-    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<MappingEntry> id,
-                                        @Nonnull final MappingEntry dataBefore,
-                                        @Nonnull final MappingEntry dataAfter,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        deleteCurrentAttributes(id, dataBefore, writeContext);
-        writeCurrentAttributes(id, dataAfter, writeContext);
-    }
-
     @Override
     public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<MappingEntry> id,
                                         @Nonnull final MappingEntry dataBefore,
diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatInstaceCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatInstaceCustomizer.java
index 5d1c2b53c..fa5cfa8e2 100644
--- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatInstaceCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/NatInstaceCustomizer.java
@@ -37,13 +37,6 @@ final class NatInstaceCustomizer implements ListWriterCustomizer<NatInstance, Na
         LOG.trace("Writing nat-instance: {}", id);
     }
 
-    @Override
-    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<NatInstance> id,
-                                        @Nonnull final NatInstance dataBefore, @Nonnull final NatInstance dataAfter,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        LOG.trace("Updating nat-instance: {}", id);
-    }
-
     @Override
     public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<NatInstance> id,
                                         @Nonnull final NatInstance dataBefore, @Nonnull final WriteContext writeContext)
diff --git a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/AbstractInterfaceNatCustomizer.java b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/AbstractInterfaceNatCustomizer.java
index 82af93481..76d6549f8 100644
--- a/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/AbstractInterfaceNatCustomizer.java
+++ b/nat/nat2vpp/src/main/java/io/fd/hc2vpp/nat/write/ifc/AbstractInterfaceNatCustomizer.java
@@ -65,14 +65,6 @@ abstract class AbstractInterfaceNatCustomizer<D extends InterfaceNatVppFeatureAt
         getLog().debug("NAT {} enabled successfully on: {}, reply: {}", dataAfter, ifcName, reply);
     }
 
-    @Override
-    public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<D> id,
-                                        @Nonnull final D dataBefore, @Nonnull final D dataAfter,
-                                        @Nonnull final WriteContext writeContext) throws WriteFailedException {
-        throw new WriteFailedException.UpdateFailedException(id, dataBefore, dataAfter,
-                new UnsupportedOperationException("Unable to update NAT feature"));
-    }
-
     @Override
     public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<D> id,
                                         @Nonnull final D dataBefore, @Nonnull final WriteContext writeContext)
-- 
cgit 1.2.3-korg