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 434cf23277d4e42008035c43f51716e2bbbb398c..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
@@ -110,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) {
@@ -137,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());