From 7908b273f5dac90fda49c5a80aff1ac17afb4f19 Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <isaku.yamahata@intel.com>
Date: Tue, 10 Jan 2017 15:09:25 -0800
Subject: [PATCH] neutorn-spi: more remove neutron prefix of field

The changeset of a2f1a28cb8b6c226f49716434cd8ccc34c43eaa4
the change id of I81984a294b4601bfb18b24140d03d615dba1424a was
imcomplete somehow.This patch removes remaining neutron prefix in spi.

Change-Id: I935e2028fc436cd01e8eb930eb5811f4dca26575
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
---
 .../opendaylight/neutron/spi/NeutronFirewall.java  |  8 ++++----
 .../neutron/spi/NeutronL2gatewayDevice.java        |  2 +-
 .../neutron/spi/NeutronLoadBalancerPool.java       | 14 +++++++-------
 .../spi/NeutronLoadBalancerPoolJAXBTest.java       |  2 +-
 .../api/NeutronLoadBalancerPoolNorthbound.java     |  2 +-
 .../NeutronLoadBalancerPoolInterface.java          |  6 +++---
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java
index 3417868f0..13e33f829 100644
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java
@@ -44,7 +44,7 @@ public final class NeutronFirewall extends NeutronBaseAttributes<NeutronFirewall
     Boolean firewallIsShared;
 
     @XmlElement(name = "firewall_policy_id")
-    String neutronFirewallPolicyID;
+    String firewallPolicyID;
 
     public Boolean getFirewallAdminStateIsUp() {
         return firewallAdminStateIsUp;
@@ -63,11 +63,11 @@ public final class NeutronFirewall extends NeutronBaseAttributes<NeutronFirewall
     }
 
     public String getFirewallPolicyID() {
-        return neutronFirewallPolicyID;
+        return firewallPolicyID;
     }
 
     public void setFirewallPolicyID(String firewallPolicy) {
-        this.neutronFirewallPolicyID = firewallPolicy;
+        this.firewallPolicyID = firewallPolicy;
     }
 
     public NeutronFirewall extractFields(List<String> fields) {
@@ -91,6 +91,6 @@ public final class NeutronFirewall extends NeutronBaseAttributes<NeutronFirewall
     public String toString() {
         return "NeutronFirewall{" + "firewallUUID='" + uuid + '\'' + ", firewallTenantID='" + tenantID + '\''
                 + ", firewallName='" + name + '\'' + ", firewallAdminStateIsUp=" + firewallAdminStateIsUp
-                + ", firewallIsShared=" + firewallIsShared + ", firewallRulePolicyID=" + neutronFirewallPolicyID + '}';
+                + ", firewallIsShared=" + firewallIsShared + ", firewallRulePolicyID=" + firewallPolicyID + '}';
     }
 }
diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDevice.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDevice.java
index ff4392d50..e5d35cbf5 100644
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDevice.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDevice.java
@@ -41,7 +41,7 @@ public final class NeutronL2gatewayDevice extends NeutronID implements Serializa
 
     @Override
     public String toString() {
-        return "NeutronL2gatewayDevice [" + "id=" + uuid + ", neutronL2gwDeviceInterfaces="
+        return "NeutronL2gatewayDevice [" + "id=" + uuid + ", l2gwDeviceInterfaces="
                 + l2gatewayDeviceInterfaces + ", deviceName=" + deviceName + "]";
     }
 }
diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java
index 6b0bb3ae6..ae481f36b 100644
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java
@@ -48,7 +48,7 @@ public final class NeutronLoadBalancerPool extends NeutronBaseAttributes<Neutron
     String loadBalancerPoolLbAlgorithm;
 
     @XmlElement(name = "healthmonitor_id")
-    String neutronLoadBalancerPoolHealthMonitorID;
+    String loadBalancerPoolHealthMonitorID;
 
     @XmlElement(defaultValue = "true", name = "admin_state_up")
     Boolean loadBalancerPoolAdminStateIsUp;
@@ -82,12 +82,12 @@ public final class NeutronLoadBalancerPool extends NeutronBaseAttributes<Neutron
         this.loadBalancerPoolLbAlgorithm = loadBalancerPoolLbAlgorithm;
     }
 
-    public String getNeutronLoadBalancerPoolHealthMonitorID() {
-        return neutronLoadBalancerPoolHealthMonitorID;
+    public String getLoadBalancerPoolHealthMonitorID() {
+        return loadBalancerPoolHealthMonitorID;
     }
 
-    public void setNeutronLoadBalancerPoolHealthMonitorID(String neutronLoadBalancerPoolHealthMonitorID) {
-        this.neutronLoadBalancerPoolHealthMonitorID = neutronLoadBalancerPoolHealthMonitorID;
+    public void setLoadBalancerPoolHealthMonitorID(String loadBalancerPoolHealthMonitorID) {
+        this.loadBalancerPoolHealthMonitorID = loadBalancerPoolHealthMonitorID;
     }
 
     public Boolean getLoadBalancerPoolAdminIsStateIsUp() {
@@ -161,7 +161,7 @@ public final class NeutronLoadBalancerPool extends NeutronBaseAttributes<Neutron
                 ans.setLoadBalancerPoolLbAlgorithm(this.getLoadBalancerPoolLbAlgorithm());
             }
             if (s.equals("healthmonitor_id")) {
-                ans.setNeutronLoadBalancerPoolHealthMonitorID(this.getNeutronLoadBalancerPoolHealthMonitorID());
+                ans.setLoadBalancerPoolHealthMonitorID(this.getLoadBalancerPoolHealthMonitorID());
             }
             if (s.equals("admin_state_up")) {
                 ans.setLoadBalancerPoolAdminStateIsUp(loadBalancerPoolAdminStateIsUp);
@@ -177,7 +177,7 @@ public final class NeutronLoadBalancerPool extends NeutronBaseAttributes<Neutron
     public String toString() {
         return "NeutronLoadBalancerPool{" + "id='" + uuid + '\'' + ", tenantID='" + tenantID + '\'' + ", name='"
                 + name + '\'' + ", protocol=" + loadBalancerPoolProtocol + '\'' + ", lbAlgorithm='"
-                + loadBalancerPoolLbAlgorithm + '\'' + ", healthmonitorID=" + neutronLoadBalancerPoolHealthMonitorID
+                + loadBalancerPoolLbAlgorithm + '\'' + ", healthmonitorID=" + loadBalancerPoolHealthMonitorID
                 + ", adminStateUp=" + loadBalancerPoolAdminStateIsUp + '}';
      // todo: add loadBalancerPoolMembers as joined string
     }
diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java
index 055577cac..52c3bd85a 100644
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java
@@ -48,7 +48,7 @@ public class NeutronLoadBalancerPoolJAXBTest {
                 "1a3e005cf9ce40308c900bcb08e5320c", testObject.getTenantID());
 
         Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 8: Testing HealthMonitorID failed",
-                "00066a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getNeutronLoadBalancerPoolHealthMonitorID());
+                "00066a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getLoadBalancerPoolHealthMonitorID());
 
         List<NeutronID> testListeners = testObject.getLoadBalancerPoolListeners();
         Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 9.1: Testing Listeners failed", 1,
diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java
index 7253e2e09..7f6f1d900 100644
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java
@@ -102,7 +102,7 @@ public final class NeutronLoadBalancerPoolNorthbound extends AbstractNeutronNort
                     && (queryLoadBalancerPoolLbAlgorithm == null
                             || queryLoadBalancerPoolLbAlgorithm.equals(nsg.getLoadBalancerPoolLbAlgorithm()))
                     && (queryLoadBalancerPoolHealthMonitorID == null || queryLoadBalancerPoolHealthMonitorID
-                            .equals(nsg.getNeutronLoadBalancerPoolHealthMonitorID()))
+                            .equals(nsg.getLoadBalancerPoolHealthMonitorID()))
                     && (queryLoadBalancerIsAdminStateUp == null
                             || queryLoadBalancerIsAdminStateUp.equals(nsg.getLoadBalancerPoolAdminIsStateIsUp()))
                     && (queryLoadBalancerPoolMembers.size() == 0
diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
index c0261f1cd..d660c05e7 100644
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
@@ -70,8 +70,8 @@ public final class NeutronLoadBalancerPoolInterface
     protected Pool toMd(NeutronLoadBalancerPool pool) {
         final PoolBuilder poolBuilder = new PoolBuilder();
         poolBuilder.setAdminStateUp(pool.getLoadBalancerPoolAdminIsStateIsUp());
-        if (pool.getNeutronLoadBalancerPoolHealthMonitorID() != null) {
-            poolBuilder.setHealthmonitorId(toUuid(pool.getNeutronLoadBalancerPoolHealthMonitorID()));
+        if (pool.getLoadBalancerPoolHealthMonitorID() != null) {
+            poolBuilder.setHealthmonitorId(toUuid(pool.getLoadBalancerPoolHealthMonitorID()));
         }
         if (pool.getLoadBalancerPoolLbAlgorithm() != null) {
             poolBuilder.setLbAlgorithm(pool.getLoadBalancerPoolLbAlgorithm());
@@ -117,7 +117,7 @@ public final class NeutronLoadBalancerPoolInterface
             answer.setLoadBalancerPoolAdminStateIsUp(pool.isAdminStateUp());
         }
         if (pool.getHealthmonitorId() != null) {
-            answer.setNeutronLoadBalancerPoolHealthMonitorID(pool.getHealthmonitorId().getValue());
+            answer.setLoadBalancerPoolHealthMonitorID(pool.getHealthmonitorId().getValue());
         }
         if (pool.getLbAlgorithm() != null) {
             answer.setLoadBalancerPoolLbAlgorithm(pool.getLbAlgorithm());
-- 
2.36.6