yang model revise: neutron-lbaasv2.yang

This patch revises yang model for neutron lbaasv2 and the related codes.
- drops decr for consistency, which isn't very useful
- fixes range of port/weight to match neutron lbaasv2 api
- eliminates deprecated methods in neutron-spi

Change-Id: Ic50d1c420dc22d19e6e2878f44d5624dc7d6bc88
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Signed-off-by: Ritu Sood <ritu.sood@intel.com>

diff --git a/model/src/main/yang/neutron-lbaasv2.yang b/model/src/main/yang/neutron-lbaasv2.yang
index 7d6bbff2161da4bde31cfee6a397d955057e5c07..799741caa19c96c786938cd471edb7f61943dc2f 100644 (file)
--- a/model/src/main/yang/neutron-lbaasv2.yang
+++ b/model/src/main/yang/neutron-lbaasv2.yang
@@ -32,11 +32,6 @@ module neutron-lbaasv2 {
 
     grouping loadbalancer-attributes {
         description "LBaaSV2.0 load balancer attributes.";
-        leaf descr {
-            type string;
-            description "Load balancer description.";
-            default "";
-        }
         leaf vip-address {
             type inet:ip-address;
             description "The IP address of the VIP.";
@@ -58,10 +53,6 @@ module neutron-lbaasv2 {
                         down (false).";
             default "true";
         }
-        leaf descr {
-            type string;
-            description "Detailed description of the listener.";
-        }
         leaf protocol {
             description "The protocol the front end listens for.";
             type identityref {
@@ -71,7 +62,7 @@ module neutron-lbaasv2 {
         leaf protocol-port {
             description "The port on which the front end listens.";
             type uint16 {
-                range 1..65535;
+                range 0..65535;
             }
         }
         leaf-list loadbalancers {
@@ -92,10 +83,6 @@ module neutron-lbaasv2 {
             description "The administrative state of the pool, which is up (true) or
                         down (false).";
         }
-        leaf descr {
-            type string;
-            description "Detailed description of the listener.";
-        }
         leaf protocol {
             description "The protocol the front end listens for.";
             type identityref {
@@ -151,13 +138,13 @@ module neutron-lbaasv2 {
         leaf protocol-port {
             description "The port on which the application is hosted.";
             type uint16 {
-                range 1..65535;
+                range 0..65535;
             }
         }
         leaf weight {
             description "Weight of member.";
             type uint16 {
-                range 1..65535;
+                range 0..256;
             }
             default "1";
         }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java
index 10817aa3d16e7fdf5a78b153bbe5c54baee99ee0..0d61c4c22cb006527727cf72fcf97465d1cfe415 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java
@@ -25,7 +25,6 @@ import java.util.List;
  * id                 uuid-str
  * tenant_id          uuid-str
  * name               String
- * description        String
  * status             String
  * vip_address        IP address
  * vip_subnet         uuid-str
@@ -41,9 +40,6 @@ public class NeutronLoadBalancer extends NeutronObject implements Serializable,
     @XmlElement (name = "name")
     String loadBalancerName;
 
-    @XmlElement (name = "description")
-    String loadBalancerDescription;
-
     @XmlElement (name = "status")
     String loadBalancerStatus;
 
@@ -56,26 +52,6 @@ public class NeutronLoadBalancer extends NeutronObject implements Serializable,
     @XmlElement (name = "vip_subnet_id")
     String loadBalancerVipSubnetID;
 
-    // @deprecated use getID()
-    public String getLoadBalancerID() {
-        return getID();
-    }
-
-    // @deprecated use setID()
-    public void setLoadBalancerID(String uuid) {
-        setID(uuid);
-    }
-
-    @Deprecated
-    public String getLoadBlancerTenantID() {
-        return getTenantID();
-    }
-
-    @Deprecated
-    public void setLoadBalancerTenantID(String tenantID) {
-        setTenantID(tenantID);
-    }
-
     public String getLoadBalancerName() {
         return loadBalancerName;
     }
@@ -84,14 +60,6 @@ public class NeutronLoadBalancer extends NeutronObject implements Serializable,
         this.loadBalancerName = loadBalancerName;
     }
 
-    public String getLoadBalancerDescription() {
-        return loadBalancerDescription;
-    }
-
-    public void setLoadBalancerDescription(String loadBalancerDescription) {
-        this.loadBalancerDescription = loadBalancerDescription;
-    }
-
     public String getLoadBalancerStatus() {
         return loadBalancerStatus;
     }
@@ -138,9 +106,6 @@ public class NeutronLoadBalancer extends NeutronObject implements Serializable,
             if (s.equals("name")) {
                 ans.setLoadBalancerName(this.getLoadBalancerName());
             }
-            if(s.equals("description")) {
-                ans.setLoadBalancerDescription(this.getLoadBalancerDescription());
-            }
             if (s.equals("vip_address")) {
                 ans.setLoadBalancerVipAddress(this.getLoadBalancerVipAddress());
             }
@@ -162,7 +127,6 @@ public class NeutronLoadBalancer extends NeutronObject implements Serializable,
                 "loadBalancerID='" + uuid + '\'' +
                 ", loadBalancerTenantID='" + tenantID + '\'' +
                 ", loadBalancerName='" + loadBalancerName + '\'' +
-                ", loadBalancerDescription='" + loadBalancerDescription + '\'' +
                 ", loadBalancerStatus='" + loadBalancerStatus + '\'' +
                 ", loadBalancerAdminStateUp='" + loadBalancerAdminStateUp + '\'' +
                 ", loadBalancerVipAddress='" + loadBalancerVipAddress + '\'' +

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java
index f371ce4201137acd54f27de3cbd66aa0ee8df819..93e4db1008f4620f4a5451d79b7e14c42217744d 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java
@@ -72,26 +72,6 @@ public class NeutronLoadBalancerHealthMonitor
     @XmlElement (name = "pools")
     List<Neutron_ID> loadBalancerHealthMonitorPools;
 
-    // @deprecated use getID()
-    public String getLoadBalancerHealthMonitorID() {
-        return getID();
-    }
-
-    // @deprecated use setID()
-    public void setLoadBalancerHealthMonitorID(String uuid) {
-        setID(uuid);
-    }
-
-    @Deprecated
-    public String getLoadBalancerHealthMonitorTenantID() {
-        return getTenantID();
-    }
-
-    @Deprecated
-    public void setLoadBalancerHealthMonitorTenantID(String tenantID) {
-        setTenantID(tenantID);
-    }
-
     public String getLoadBalancerHealthMonitorType() {
         return loadBalancerHealthMonitorType;
     }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java
index 2a3715451c81de4f9c729bbc27c4929da0eb900a..39d22c490ca3dda41e176ea46f9c2732fba28964 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java
@@ -26,7 +26,6 @@ import java.util.List;
  * default_pool_id    String
  * tenant_id          uuid-str
  * name               String
- * description        String
  * shared             Bool
  * protocol           String
  * protocol_port      String
@@ -54,9 +53,6 @@ public class NeutronLoadBalancerListener
     @XmlElement (name = "name")
     String loadBalancerListenerName;
 
-    @XmlElement (name = "description")
-    String loadBalancerListenerDescription;
-
     @XmlElement (defaultValue = "true", name = "admin_state_up")
     Boolean loadBalancerListenerAdminStateIsUp;
 
@@ -69,26 +65,6 @@ public class NeutronLoadBalancerListener
     @XmlElement (name = "load_balancers")
     List<Neutron_ID> neutronLoadBalancerListenerLoadBalancerIDs;
 
-    // @deprecated use getID()
-    public String getLoadBalancerListenerID() {
-        return getID();
-    }
-
-    // @deprecated use setID()
-    public void setLoadBalancerListenerID(String uuid) {
-        setID(uuid);
-    }
-
-    @Deprecated
-    public String getLoadBalancerListenerTenantID() {
-        return getTenantID();
-    }
-
-    @Deprecated
-    public void setLoadBalancerListenerTenantID(String tenantID) {
-        setTenantID(tenantID);
-    }
-
     public String getLoadBalancerListenerName() {
         return loadBalancerListenerName;
     }
@@ -97,14 +73,6 @@ public class NeutronLoadBalancerListener
         this.loadBalancerListenerName = loadBalancerListenerName;
     }
 
-    public String getLoadBalancerListenerDescription() {
-        return loadBalancerListenerDescription;
-    }
-
-    public void setLoadBalancerListenerDescription(String loadBalancerListenerDescription) {
-        this.loadBalancerListenerDescription = loadBalancerListenerDescription;
-    }
-
     public Boolean getLoadBalancerListenerAdminStateIsUp() {
         return loadBalancerListenerAdminStateIsUp;
     }
@@ -170,9 +138,6 @@ public class NeutronLoadBalancerListener
             if (s.equals("name")) {
                 ans.setLoadBalancerListenerName(this.getLoadBalancerListenerName());
             }
-            if(s.equals("description")) {
-                ans.setLoadBalancerListenerDescription(this.getLoadBalancerListenerDescription());
-            }
             if (s.equals("protocol")) {
                 ans.setNeutronLoadBalancerListenerProtocol(this.getNeutronLoadBalancerListenerProtocol());
             }
@@ -193,7 +158,6 @@ public class NeutronLoadBalancerListener
                 ", neutronLoadBalancerListenerConnectionLimit='" + neutronLoadBalancerListenerConnectionLimit + '\'' +
                 ", loadBalancerListenerTenantID='" + tenantID + '\'' +
                 ", loadBalancerListenerName='" + loadBalancerListenerName + '\'' +
-                ", loadBalancerListenerDescription='" + loadBalancerListenerDescription + '\'' +
                 ", loadBalancerListenerAdminStateIsUp=" + loadBalancerListenerAdminStateIsUp +
                 ", neutronLoadBalancerListenerProtocol='" + neutronLoadBalancerListenerProtocol + '\'' +
                 ", neutronLoadBalancerListenerProtocolPort='" + neutronLoadBalancerListenerProtocolPort + '\'' +

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 68baf4ba81a6c63bd1d0e9d8b924f3518bf86fd6..21c0dd5cbd03af9a98cb04c864fc913789d51968 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java
@@ -25,7 +25,6 @@ import java.util.List;
  * id                 uuid-str
  * tenant_id          uuid-str
  * name               String
- * description        String
  * protocol           String
  * lb_algorithm       String
  * healthmonitor_id   String
@@ -44,9 +43,6 @@ public class NeutronLoadBalancerPool extends NeutronObject implements Serializab
     @XmlElement (name = "name")
     String loadBalancerPoolName;
 
-    @XmlElement (name = "description")
-    String loadBalancerPoolDescription;
-
     @XmlElement (name = "protocol")
     String loadBalancerPoolProtocol;
 
@@ -72,26 +68,6 @@ public class NeutronLoadBalancerPool extends NeutronObject implements Serializab
         loadBalancerPoolMembers = new ArrayList<NeutronLoadBalancerPoolMember>();
     }
 
-    // @deprecated use getID()
-    public String getLoadBalancerPoolID() {
-        return getID();
-    }
-
-    // @deprecated use setID()
-    public void setLoadBalancerPoolID(String uuid) {
-        setID(uuid);
-    }
-
-    @Deprecated
-    public String getLoadBalancerPoolTenantID() {
-        return getTenantID();
-    }
-
-    @Deprecated
-    public void setLoadBalancerPoolTenantID(String tenantID) {
-        setTenantID(tenantID);
-    }
-
     public String getLoadBalancerPoolName() {
         return loadBalancerPoolName;
     }
@@ -100,14 +76,6 @@ public class NeutronLoadBalancerPool extends NeutronObject implements Serializab
         this.loadBalancerPoolName = loadBalancerPoolName;
     }
 
-    public String getLoadBalancerPoolDescription() {
-        return loadBalancerPoolDescription;
-    }
-
-    public void setLoadBalancerPoolDescription(String loadBalancerPoolDescription) {
-        this.loadBalancerPoolDescription = loadBalancerPoolDescription;
-    }
-
     public String getLoadBalancerPoolProtocol() {
         return loadBalancerPoolProtocol;
     }
@@ -203,9 +171,6 @@ public class NeutronLoadBalancerPool extends NeutronObject implements Serializab
             if (s.equals("name")) {
                 ans.setLoadBalancerPoolName(this.getLoadBalancerPoolName());
             }
-            if(s.equals("description")) {
-                ans.setLoadBalancerPoolDescription(this.getLoadBalancerPoolDescription());
-            }
             if(s.equals("protocol")) {
                 ans.setLoadBalancerPoolProtocol(this.getLoadBalancerPoolProtocol());
             }
@@ -231,7 +196,6 @@ public class NeutronLoadBalancerPool extends NeutronObject implements Serializab
             "id='" + uuid + '\'' +
             ", tenantID='" + tenantID + '\'' +
             ", name='" + loadBalancerPoolName + '\'' +
-            ", description='" + loadBalancerPoolDescription + '\'' +
             ", protocol=" + loadBalancerPoolProtocol +'\''+
             ", lbAlgorithm='" + loadBalancerPoolLbAlgorithm + '\'' +
             ", healthmonitorID=" + neutronLoadBalancerPoolHealthMonitorID +

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java
index fc248964a1375e4428cdec1e444477f139262b08..01c8112e1bf3645c46f586b22847d4c0f51ca0b6 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java
@@ -58,26 +58,6 @@ public class NeutronLoadBalancerPoolMember
         this.poolID = poolID;
     }
 
-    // @deprecated use getID()
-    public String getPoolMemberID() {
-        return getID();
-    }
-
-    // @deprecated use setID()
-    public void setPoolMemberID(String uuid) {
-        setID(uuid);
-    }
-
-    @Deprecated
-    public String getPoolMemberTenantID() {
-        return getTenantID();
-    }
-
-    @Deprecated
-    public void setPoolMemberTenantID(String tenantID) {
-        setTenantID(tenantID);
-    }
-
     public String getPoolMemberAddress() {
         return poolMemberAddress;
     }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerJAXBTest.java
index 8feb6f6b29e7d792a521fdaaeea62a4af9de3780..e050660e2d90212a36e47a0da3538b3f21c6c615 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerJAXBTest.java
@@ -34,9 +34,6 @@ public class NeutronLoadBalancerJAXBTest {
             Assert.assertEquals("NeutronLoadBalancer JAXB Test 2: Testing LoadBalancer Name failed",
                     "NeutronLoadBalancer", testObject.getLoadBalancerName());
 
-            Assert.assertEquals("NeutronLoadBalancer JAXB Test 3: Testing LoadBalancer Description failed",
-                    "NeutronLoadBalancer_Description", testObject.getLoadBalancerDescription());
-
             Assert.assertEquals("NeutronLoadBalancer JAXB Test 4: Testing status failed", "ACTIVE",
                     testObject.getLoadBalancerStatus());
 

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListenerJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListenerJAXBTest.java
index 3755b092d22f5997633ef97fd2d5ddd3c176ebb2..bc4fd05d1795f7a786c4fcbc5f734242f8c6f2be 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListenerJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListenerJAXBTest.java
@@ -43,10 +43,6 @@ public class NeutronLoadBalancerListenerJAXBTest {
             Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 4: Testing LoadBalancer listener name failed",
                     "LoadBalancerListener", testObject.getLoadBalancerListenerName());
 
-            Assert.assertEquals(
-                    "NeutronLoadBalancerListener JAXB Test 5: Testing LoadBalancer listener Description failed",
-                    "NeutronLoadBalancerListener_Description", testObject.getLoadBalancerListenerDescription());
-
             Assert.assertFalse(
                     "NeutronLoadBalancerListener JAXB Test 6: Testing LoadBalancer listener admin_state_up failed",
                     testObject.getLoadBalancerListenerAdminStateIsUp());

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 bb714bf818721a1c6698c5219e44fa5a6013eb41..7d77d8175c53a558fa3816d3554eb437415ad62c 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java
@@ -52,9 +52,6 @@ public class NeutronLoadBalancerPoolJAXBTest {
             Assert.assertTrue("NeutronLoadBalancerPool JAXB Test 3: Testing admin_state_up failed",
                     testObject.getLoadBalancerPoolAdminIsStateIsUp());
 
-            Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 4: Testing Description failed",
-                    "simple pool", testObject.getLoadBalancerPoolDescription());
-
             Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 5: Testing LbAlgorithm failed", "ROUND_ROBIN",
                     testObject.getLoadBalancerPoolLbAlgorithm());
 

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java
index fdcd6751587f894965505314616e1795bc95694e..39476dcef07671d4733cb12d9b3ae5e0b38c53e4 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java
@@ -139,7 +139,6 @@ public class NeutronLoadBalancerListenerNorthbound
             @QueryParam("default_pool_id") String queryLoadBalancerListenerDefaultPoolID,
             @QueryParam("tenant_id") String queryLoadBalancerListenerTenantID,
             @QueryParam("name") String queryLoadBalancerListenerName,
-            @QueryParam("description") String queryLoadBalancerListenerDescription,
             @QueryParam("protocol") String queryLoadBalancerListenerProtocol,
             @QueryParam("protocol_port") String queryLoadBalancerListenerProtocolPort,
             @QueryParam("admin_state_up") Boolean queryLoadBalancerListenerAdminIsUp,
@@ -163,8 +162,6 @@ public class NeutronLoadBalancerListenerNorthbound
                             queryLoadBalancerListenerTenantID.equals(nsg.getTenantID())) &&
                     (queryLoadBalancerListenerName == null ||
                             queryLoadBalancerListenerName.equals(nsg.getLoadBalancerListenerName())) &&
-                    (queryLoadBalancerListenerDescription == null ||
-                            queryLoadBalancerListenerDescription.equals(nsg.getLoadBalancerListenerDescription())) &&
                     (queryLoadBalancerListenerProtocol == null ||
                             queryLoadBalancerListenerProtocol.equals(nsg.getNeutronLoadBalancerListenerProtocol())) &&
                     (queryLoadBalancerListenerProtocolPort == null ||

diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java
index 304cd3a0ebea6b8a8e01d71f3ec9bc30d7b997a6..da391dc789f91d2dd27b3e404ad135a7694cd872 100644 (file)
--- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java
@@ -138,7 +138,6 @@ public class NeutronLoadBalancerNorthbound
             @QueryParam("id") String queryLoadBalancerID,
             @QueryParam("tenant_id") String queryLoadBalancerTenantID,
             @QueryParam("name") String queryLoadBalancerName,
-            @QueryParam("description") String queryLoadBalancerDescription,
             @QueryParam("status") String queryLoadBalancerStatus,
             @QueryParam("vip_address") String queryLoadBalancerVipAddress,
             @QueryParam("vip_subnet") String queryLoadBalancerVipSubnet,
@@ -160,8 +159,6 @@ public class NeutronLoadBalancerNorthbound
                             queryLoadBalancerTenantID.equals(nsg.getTenantID())) &&
                     (queryLoadBalancerName == null ||
                             queryLoadBalancerName.equals(nsg.getLoadBalancerName())) &&
-                    (queryLoadBalancerDescription == null ||
-                            queryLoadBalancerDescription.equals(nsg.getLoadBalancerDescription())) &&
                     (queryLoadBalancerVipAddress == null ||
                             queryLoadBalancerVipAddress.equals(nsg.getLoadBalancerVipAddress())) &&
                     (queryLoadBalancerVipSubnet == null ||

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 649faf425c3355e2966e6da4b515a13168c80bf8..fb7d4c8f7bd9a588e01029992c320833b633be59 100644 (file)
--- 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
@@ -152,7 +152,6 @@ public class NeutronLoadBalancerPoolNorthbound
             @QueryParam("id") String queryLoadBalancerPoolID,
             @QueryParam("tenant_id") String queryLoadBalancerPoolTenantID,
             @QueryParam("name") String queryLoadBalancerPoolName,
-            @QueryParam("description") String queryLoadBalancerDescription,
             @QueryParam("protocol") String queryLoadBalancerProtocol,
             @QueryParam("lb_algorithm") String queryLoadBalancerPoolLbAlgorithm,
             @QueryParam("healthmonitor_id") String queryLoadBalancerPoolHealthMonitorID,
@@ -176,8 +175,6 @@ public class NeutronLoadBalancerPoolNorthbound
                             queryLoadBalancerPoolTenantID.equals(nsg.getTenantID())) &&
                     (queryLoadBalancerPoolName == null ||
                             queryLoadBalancerPoolName.equals(nsg.getLoadBalancerPoolName())) &&
-                    (queryLoadBalancerDescription == null ||
-                            queryLoadBalancerDescription.equals(nsg.getLoadBalancerPoolDescription())) &&
                     (queryLoadBalancerPoolLbAlgorithm == null ||
                             queryLoadBalancerPoolLbAlgorithm.equals(nsg.getLoadBalancerPoolLbAlgorithm())) &&
                     (queryLoadBalancerPoolHealthMonitorID == null ||

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerInterface.java
index 4606b963d591e00ab14c973e23710f440eed8c04..fb36e47348b1915043e57e1e7784b8cfa444f25d 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerInterface.java
@@ -98,9 +98,6 @@ public class NeutronLoadBalancerInterface extends AbstractNeutronInterface<Loadb
         if (loadBalancer.isAdminStateUp() != null) {
             answer.setLoadBalancerAdminStateUp(loadBalancer.isAdminStateUp());
         }
-        if (loadBalancer.getDescr() != null) {
-            answer.setLoadBalancerDescription(loadBalancer.getDescr());
-        }
         if (loadBalancer.getName() != null) {
             answer.setLoadBalancerName(loadBalancer.getName());
         }
@@ -126,9 +123,6 @@ public class NeutronLoadBalancerInterface extends AbstractNeutronInterface<Loadb
     protected Loadbalancer toMd(NeutronLoadBalancer loadBalancer) {
         final LoadbalancerBuilder loadBalancerBuilder = new LoadbalancerBuilder();
         loadBalancerBuilder.setAdminStateUp(loadBalancer.getLoadBalancerAdminStateUp());
-        if (loadBalancer.getLoadBalancerDescription() != null) {
-            loadBalancerBuilder.setDescr(loadBalancer.getLoadBalancerDescription());
-        }
         if (loadBalancer.getLoadBalancerName() != null) {
             loadBalancerBuilder.setName(loadBalancer.getLoadBalancerName());
         }

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java
index 8c6458d42d93152c785eb812fbcfd327c2d8f8e7..3d9e78dd19344c2ff3f0175ff2b256c18c033fc5 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java
@@ -120,9 +120,6 @@ public class NeutronLoadBalancerListenerInterface extends AbstractNeutronInterfa
         if (listener.getNeutronLoadBalancerListenerDefaultPoolID() != null) {
             listenerBuilder.setDefaultPoolId(toUuid(listener.getNeutronLoadBalancerListenerDefaultPoolID()));
         }
-        if (listener.getLoadBalancerListenerDescription() != null) {
-            listenerBuilder.setDescr(listener.getLoadBalancerListenerDescription());
-        }
         if (listener.getNeutronLoadBalancerListenerLoadBalancerIDs() != null) {
             final List<Uuid> listLoadBalancers = new ArrayList<Uuid>();
             for (final Neutron_ID neutron_id : listener.getNeutronLoadBalancerListenerLoadBalancerIDs()) {
@@ -163,9 +160,6 @@ public class NeutronLoadBalancerListenerInterface extends AbstractNeutronInterfa
         if (listener.getDefaultPoolId() != null) {
             answer.setNeutronLoadBalancerListenerDefaultPoolID(listener.getDefaultPoolId().getValue());
         }
-        if (listener.getDescr() != null) {
-            answer.setLoadBalancerListenerDescription(listener.getDescr());
-        }
         if (listener.getLoadbalancers() != null) {
             final List<Neutron_ID> list = new ArrayList<Neutron_ID>();
             for (final Uuid id : listener.getLoadbalancers()) {

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 cd7e35ba9ce96e342befbcf39a4ef3a247b839c0..8b73aa6f504c9999f01be9efa32968fdc029a1bc 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
@@ -130,9 +130,6 @@ public class NeutronLoadBalancerPoolInterface extends AbstractNeutronInterface<P
     protected Pool toMd(NeutronLoadBalancerPool pool) {
         final PoolBuilder poolBuilder = new PoolBuilder();
         poolBuilder.setAdminStateUp(pool.getLoadBalancerPoolAdminIsStateIsUp());
-        if (pool.getLoadBalancerPoolDescription() != null) {
-            poolBuilder.setDescr(pool.getLoadBalancerPoolDescription());
-        }
         if (pool.getNeutronLoadBalancerPoolHealthMonitorID() != null) {
             poolBuilder.setHealthmonitorId(toUuid(pool.getNeutronLoadBalancerPoolHealthMonitorID()));
         }
@@ -179,9 +176,6 @@ public class NeutronLoadBalancerPoolInterface extends AbstractNeutronInterface<P
         if (pool.isAdminStateUp() != null) {
             answer.setLoadBalancerPoolAdminStateIsUp(pool.isAdminStateUp());
         }
-        if (pool.getDescr() != null) {
-            answer.setLoadBalancerPoolDescription(pool.getDescr());
-        }
         if (pool.getHealthmonitorId() != null) {
             answer.setNeutronLoadBalancerPoolHealthMonitorID(pool.getHealthmonitorId().getValue());
         }