Merge "Bug 4224 - remote_ip_prefix of metering rule should be type of ip-prefix"

[neutron.git] / transcriber / src / main / java / org / opendaylight / neutron / transcriber / NeutronFirewallInterface.java

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java
index 2527ae3e92dedad40e4e7470b166b3fe6e793e44..9e6aa068ac9157e977251cd0e06b75d2bb0293f0 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java
@@ -41,24 +41,16 @@ public class NeutronFirewallInterface extends AbstractNeutronInterface<Firewall,
 
     @Override
     public boolean neutronFirewallExists(String uuid) {
-        Firewall firewall = readMd(createInstanceIdentifier(toMd(uuid)));
-        if (firewall == null) {
-            return false;
-        }
-        return true;
+        return exists(uuid);
     }
 
     @Override
     public NeutronFirewall getNeutronFirewall(String uuid) {
-        Firewall firewall = readMd(createInstanceIdentifier(toMd(uuid)));
-        if (firewall == null) {
-            return null;
-        }
-        return fromMd(firewall);
+        return get(uuid);
     }
 
     @Override
-    public List<NeutronFirewall> getAllNeutronFirewalls() {
+    public List<NeutronFirewall> getAll() {
         Set<NeutronFirewall> allFirewalls = new HashSet<NeutronFirewall>();
         Firewalls firewalls = readMd(createInstanceIdentifier());
         if (firewalls != null) {
@@ -72,35 +64,29 @@ public class NeutronFirewallInterface extends AbstractNeutronInterface<Firewall,
         return ans;
     }
 
+    @Override
+    public List<NeutronFirewall> getAllNeutronFirewalls() {
+        return getAll();
+    }
+
     @Override
     public boolean addNeutronFirewall(NeutronFirewall input) {
-        if (neutronFirewallExists(input.getID())) {
-            return false;
-        }
-        addMd(input);
-        return true;
+        return add(input);
     }
 
     @Override
     public boolean removeNeutronFirewall(String uuid) {
-        if (!neutronFirewallExists(uuid)) {
-            return false;
-        }
-        return removeMd(toMd(uuid));
+        return remove(uuid);
     }
 
     @Override
     public boolean updateNeutronFirewall(String uuid, NeutronFirewall delta) {
-        if (!neutronFirewallExists(uuid)) {
-            return false;
-        }
-        updateMd(delta);
-        return true;
+        return update(uuid, delta);
     }
 
     @Override
     public boolean neutronFirewallInUse(String firewallUUID) {
-        return !neutronFirewallExists(firewallUUID);
+        return !exists(firewallUUID);
     }
 
     @Override
@@ -124,7 +110,7 @@ public class NeutronFirewallInterface extends AbstractNeutronInterface<Firewall,
             answer.setFirewallName(firewall.getName());
         }
         if (firewall.getTenantId() != null) {
-            answer.setFirewallTenantID(firewall.getTenantId().getValue().replace("-",""));
+            answer.setTenantID(firewall.getTenantId().getValue().replace("-",""));
         }
         answer.setFirewallAdminStateIsUp(firewall.isAdminStateUp());
         if (firewall.getStatus() != null) {
@@ -151,8 +137,8 @@ public class NeutronFirewallInterface extends AbstractNeutronInterface<Firewall,
         if (firewall.getFirewallName() != null) {
             firewallBuilder.setName(firewall.getFirewallName());
         }
-        if (firewall.getFirewallTenantID() != null) {
-            firewallBuilder.setTenantId(toUuid(firewall.getFirewallTenantID()));
+        if (firewall.getTenantID() != null) {
+            firewallBuilder.setTenantId(toUuid(firewall.getTenantID()));
         }
         if (firewall.getFirewallAdminStateIsUp() != null) {
             firewallBuilder.setAdminStateUp(firewall.getFirewallAdminStateIsUp());