Fix naming Inconsistency for Qos feature

Change-Id: I412a6b5ba4b73d21d614fa0b1980a4976f2688d5
Signed-off-by: Pramod <pramod.raghavendra.jayathirth@intel.com>

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosBandwidthRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosBandwidthLimitRule.java
similarity index 76%
rename from neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosBandwidthRule.java
rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosBandwidthLimitRule.java
index 8a6e573f1ff59f7aef8d79c9a26f5693e7bc0d72..bbc64df5761cc5a5135c37c599882cfd24165fe1 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosBandwidthRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosBandwidthLimitRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2016, 2017 Intel Corporation.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -17,8 +17,8 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronQosBandwidthRule extends NeutronObject<NeutronQosBandwidthRule>
-        implements Serializable, INeutronObject<NeutronQosBandwidthRule> {
+public final class NeutronQosBandwidthLimitRule extends NeutronObject<NeutronQosBandwidthLimitRule>
+        implements Serializable, INeutronObject<NeutronQosBandwidthLimitRule> {
     private static final long serialVersionUID = 1L;
 
     @XmlElement(name = "max_kbps")
@@ -44,7 +44,7 @@ public final class NeutronQosBandwidthRule extends NeutronObject<NeutronQosBandw
     }
 
     @Override
-    public boolean extractField(String field, NeutronQosBandwidthRule ans) {
+    public boolean extractField(String field, NeutronQosBandwidthLimitRule ans) {
         switch (field) {
             case "max_kbps":
                 ans.setMaxKbps(this.getMaxKbps());
@@ -60,8 +60,10 @@ public final class NeutronQosBandwidthRule extends NeutronObject<NeutronQosBandw
 
     @Override
     public String toString() {
-        return "qosBandwidthRules{" + "qosBandwidthRuleUUID='" + uuid + '\'' + ", qosBandwidthRuleTenantID='" + tenantID
-                + '\'' + ", qosBandwidthMaxValue='" + maxKbps + '\'' + ", qosBandwidthMaxBurst='" + maxBurstKbps + '\''
-                + '}';
+        return "qosBandwidthLimitRules{" + "qosBandwidthLimitRuleUUID='" + uuid + '\''
+            + ", qosBandwidthLimitRuleTenantID='" + tenantID + '\'' + ", qosBandwidthLimitRuleMaxValue='" + maxKbps
+            + '\'' + ", qosBandwidthLimitRuleMaxBurst='" + maxBurstKbps
+            + '\''
+            + '}';
     }
 }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosDscpMarkingRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosDscpMarkingRule.java
index 9d5a15c731b39f543697bb22981554ecb006f67c..abc68ec8bddcbbcd5520ce9c3df1031a2118aef8 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosDscpMarkingRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosDscpMarkingRule.java
@@ -45,7 +45,9 @@ public final class NeutronQosDscpMarkingRule extends NeutronObject<NeutronQosDsc
 
     @Override
     public String toString() {
-        return "qosDscpRules{" + "qosDscpRuleUUID='" + uuid + '\'' + ", qosDscpRuleTenantID='" + tenantID + '\''
-                + ", qosDscpRuleDscpMark='" + dscpMark + '\'' + '}';
+        return "qosDscpMarkingRules{" + "qosDscpMarkingRuleUUID='" + uuid + '\'' + ", qosDscpMarkingRuleTenantID='"
+            + tenantID + '\'' + ", qosDscpMarkingRuleDscpMark='" + dscpMark
+            + '\''
+            + '}';
     }
 }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosPolicy.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosPolicy.java
index cf26221fc9dc933f15547f1c116c5c5aacbe715b..46478e618a167eeb36b3345e37f75d0a21e7026c 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosPolicy.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosPolicy.java
@@ -25,10 +25,10 @@ public final class NeutronQosPolicy extends NeutronBaseAttributes<NeutronQosPoli
     Boolean shared;
 
     @XmlElement(name = "bandwidth_limit_rules")
-    List<NeutronQosBandwidthRule> bwLimitRules;
+    List<NeutronQosBandwidthLimitRule> bandwidthLimitRules;
 
     @XmlElement(name = "dscp_marking_rules")
-    List<NeutronQosDscpMarkingRule> dscpRules;
+    List<NeutronQosDscpMarkingRule> dscpMarkingRules;
 
     public Boolean getPolicyIsShared() {
         return shared;
@@ -38,20 +38,20 @@ public final class NeutronQosPolicy extends NeutronBaseAttributes<NeutronQosPoli
         this.shared = qosPolicyIsShared;
     }
 
-    public List<NeutronQosBandwidthRule> getBwLimitRules() {
-        return bwLimitRules;
+    public List<NeutronQosBandwidthLimitRule> getBandwidthLimitRules() {
+        return bandwidthLimitRules;
     }
 
-    public void setQosBwLimitRules(List<NeutronQosBandwidthRule> qosBwLimitRules) {
-        this.bwLimitRules = qosBwLimitRules;
+    public void setQosBandwidthLimitRules(List<NeutronQosBandwidthLimitRule> qosBandwidthLimitRules) {
+        this.bandwidthLimitRules = qosBandwidthLimitRules;
     }
 
-    public List<NeutronQosDscpMarkingRule> getDscpRules() {
-        return dscpRules;
+    public List<NeutronQosDscpMarkingRule> getDscpMarkingRules() {
+        return dscpMarkingRules;
     }
 
-    public void setDscpRules(List<NeutronQosDscpMarkingRule> qosDscpRules) {
-        this.dscpRules = qosDscpRules;
+    public void setDscpMarkingRules(List<NeutronQosDscpMarkingRule> qosDscpMarkingRules) {
+        this.dscpMarkingRules = qosDscpMarkingRules;
     }
 
     @Override
@@ -61,14 +61,14 @@ public final class NeutronQosPolicy extends NeutronBaseAttributes<NeutronQosPoli
                 ans.setPolicyIsShared(this.getPolicyIsShared());
                 break;
             case "bandwidth_limit_rules":
-                List<NeutronQosBandwidthRule> qosBwRuleList = new ArrayList<>();
-                qosBwRuleList.addAll(this.getBwLimitRules());
-                ans.setQosBwLimitRules(qosBwRuleList);
+                List<NeutronQosBandwidthLimitRule> qosBandwidthRuleList = new ArrayList<>();
+                qosBandwidthRuleList.addAll(this.getBandwidthLimitRules());
+                ans.setQosBandwidthLimitRules(qosBandwidthRuleList);
                 break;
             case "dscp_marking_rules":
-                List<NeutronQosDscpMarkingRule> qosDscpRuleList = new ArrayList<>();
-                qosDscpRuleList.addAll(this.getDscpRules());
-                ans.setDscpRules(qosDscpRuleList);
+                List<NeutronQosDscpMarkingRule> qosDscpMarkingRuleList = new ArrayList<>();
+                qosDscpMarkingRuleList.addAll(this.getDscpMarkingRules());
+                ans.setDscpMarkingRules(qosDscpMarkingRuleList);
                 break;
             default:
                 return super.extractField(field, ans);
@@ -79,7 +79,10 @@ public final class NeutronQosPolicy extends NeutronBaseAttributes<NeutronQosPoli
     @Override
     public String toString() {
         return "NeutronQosPolicy{" + "qosPolicyUUID='" + uuid + '\'' + ", qosPolicyTenantID='" + tenantID + '\''
-                + ", qosPolicyName='" + name + '\'' + ", qosPolicyIsShared='" + shared + '\'' + ", qosBwLimitRules='"
-                + bwLimitRules + '\'' + ", qosDscpRules='" + dscpRules + '\'' + '}';
+                + ", qosPolicyName='" + name + '\'' + ", qosPolicyIsShared='" + shared + '\''
+                + ", qosbandwidthLimitRules='" + bandwidthLimitRules + '\'' + ", qosDscpMarkingRules='"
+                + dscpMarkingRules
+                + '\''
+                + '}';
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronQosJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronQosJAXBTest.java
index c80b7d1de35e47a8f90305f89f5112feedc5eda4..d51228c5c23764eac5f07bbc6986559cb7158b64 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronQosJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronQosJAXBTest.java
@@ -42,35 +42,35 @@ public class NeutronQosJAXBTest {
 
         Assert.assertFalse("NeutronQosPolicy JaxB Test 4 : Testing Shared failed", neutronObject.getPolicyIsShared());
 
-        List<NeutronQosBandwidthRule> bwPolicyRules = neutronObject.getBwLimitRules();
+        List<NeutronQosBandwidthLimitRule> bandwidthLimitPolicyRules = neutronObject.getBandwidthLimitRules();
 
         Assert.assertEquals("NeutronQosPolicy JAXB Test 5.0: Testing Bandwidth Policy length failed", 1,
-                bwPolicyRules.size());
+                bandwidthLimitPolicyRules.size());
 
         Assert.assertEquals("NeutronQosPolicy JaxB Test 5.1 : Testing ID failed",
-                "d6220bbb-35f3-48ab-8eae-69c60aef3547", bwPolicyRules.get(0).uuid);
+                "d6220bbb-35f3-48ab-8eae-69c60aef3547", bandwidthLimitPolicyRules.get(0).uuid);
 
         Assert.assertEquals("NeutronQosPolicy JaxB Test 5.2 : Testing Tenant ID failed",
-                "aa902936679e4ea29bfe1158e3450a14", bwPolicyRules.get(0).tenantID);
+                "aa902936679e4ea29bfe1158e3450a14", bandwidthLimitPolicyRules.get(0).tenantID);
 
         Assert.assertEquals("NeutronQosPolicy JaxB Test 5.3 : Testing Max ingress/Egress value failed",
-                new BigInteger("25"), bwPolicyRules.get(0).maxKbps);
+                new BigInteger("25"), bandwidthLimitPolicyRules.get(0).maxKbps);
 
         Assert.assertEquals("NeutronQosPolicy JaxB Test 5.4 : Testing Maximum Burst value failed",
-                new BigInteger("100"), bwPolicyRules.get(0).maxBurstKbps);
+                new BigInteger("100"), bandwidthLimitPolicyRules.get(0).maxBurstKbps);
 
-        List<NeutronQosDscpMarkingRule> dscpPolicyRules = neutronObject.getDscpRules();
+        List<NeutronQosDscpMarkingRule> dscpMarkingPolicyRules = neutronObject.getDscpMarkingRules();
 
         Assert.assertEquals("NeutronQosPolicy JAXB Test 6.0: Testing Bandwidth Policy length failed", 1,
-                dscpPolicyRules.size());
+                dscpMarkingPolicyRules.size());
 
         Assert.assertEquals("NeutronQosPolicy JaxB Test 6.1 : Testing ID failed",
-                "d6220bbb-35f3-48ab-8eae-69c60aef3547", dscpPolicyRules.get(0).uuid);
+                "d6220bbb-35f3-48ab-8eae-69c60aef3547", dscpMarkingPolicyRules.get(0).uuid);
 
         Assert.assertEquals("NeutronQosPolicy JaxB Test 6.2 : Testing Tenant ID failed",
-                "aa902936679e4ea29bfe1158e3450a14", dscpPolicyRules.get(0).tenantID);
+                "aa902936679e4ea29bfe1158e3450a14", dscpMarkingPolicyRules.get(0).tenantID);
 
         Assert.assertEquals("NeutronQosPolicy JaxB Test 6.3 : Testing Max ingress/Egress value failed", new Short("8"),
-                dscpPolicyRules.get(0).dscpMark);
+                dscpMarkingPolicyRules.get(0).dscpMark);
     }
 }

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronQosPolicyInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronQosPolicyInterface.java
index 39eaccbea1ed9444da9b83b278ae5e2b876d2fe6..63bb0b1d658903108ed07eced0aead4d18574c0e 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronQosPolicyInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronQosPolicyInterface.java
@@ -12,7 +12,7 @@ import java.util.ArrayList;
 import java.util.List;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.neutron.spi.INeutronQosPolicyCRUD;
-import org.opendaylight.neutron.spi.NeutronQosBandwidthRule;
+import org.opendaylight.neutron.spi.NeutronQosBandwidthLimitRule;
 import org.opendaylight.neutron.spi.NeutronQosDscpMarkingRule;
 import org.opendaylight.neutron.spi.NeutronQosPolicy;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.qos.rev160613.qos.attributes.QosPolicies;
@@ -43,28 +43,28 @@ public final class NeutronQosPolicyInterface
         if (qosPolicy.getPolicyIsShared() != null) {
             qosPolicyBuilder.setShared(qosPolicy.getPolicyIsShared());
         }
-        if (qosPolicy.getBwLimitRules() != null) {
+        if (qosPolicy.getBandwidthLimitRules() != null) {
             final List<BandwidthLimitRules> listBandwith = new ArrayList<>();
-            for (final NeutronQosBandwidthRule bandWidthRule : qosPolicy.getBwLimitRules()) {
+            for (final NeutronQosBandwidthLimitRule bandwidthLimitRule : qosPolicy.getBandwidthLimitRules()) {
                 final BandwidthLimitRulesBuilder bandwidthLimitRulesBuilder = new BandwidthLimitRulesBuilder();
-                bandwidthLimitRulesBuilder.setUuid(toUuid(bandWidthRule.getID()));
-                bandwidthLimitRulesBuilder.setTenantId(toUuid(bandWidthRule.getTenantID()));
-                bandwidthLimitRulesBuilder.setMaxKbps(bandWidthRule.getMaxKbps());
-                bandwidthLimitRulesBuilder.setMaxBurstKbps(bandWidthRule.getMaxBurstKbps());
+                bandwidthLimitRulesBuilder.setUuid(toUuid(bandwidthLimitRule.getID()));
+                bandwidthLimitRulesBuilder.setTenantId(toUuid(bandwidthLimitRule.getTenantID()));
+                bandwidthLimitRulesBuilder.setMaxKbps(bandwidthLimitRule.getMaxKbps());
+                bandwidthLimitRulesBuilder.setMaxBurstKbps(bandwidthLimitRule.getMaxBurstKbps());
                 listBandwith.add(bandwidthLimitRulesBuilder.build());
             }
             qosPolicyBuilder.setBandwidthLimitRules(listBandwith);
         }
-        if (qosPolicy.getDscpRules() != null) {
-            final List<DscpmarkingRules> listDscp = new ArrayList<>();
-            for (final NeutronQosDscpMarkingRule dscpRule : qosPolicy.getDscpRules()) {
+        if (qosPolicy.getDscpMarkingRules() != null) {
+            final List<DscpmarkingRules> listDscpMarking = new ArrayList<>();
+            for (final NeutronQosDscpMarkingRule dscpMarkingRule : qosPolicy.getDscpMarkingRules()) {
                 final DscpmarkingRulesBuilder dscpmarkingRulesBuilder = new DscpmarkingRulesBuilder();
-                dscpmarkingRulesBuilder.setUuid(toUuid(dscpRule.getID()));
-                dscpmarkingRulesBuilder.setTenantId(toUuid(dscpRule.getTenantID()));
-                dscpmarkingRulesBuilder.setDscpMark(dscpRule.getDscpMark());
-                listDscp.add(dscpmarkingRulesBuilder.build());
+                dscpmarkingRulesBuilder.setUuid(toUuid(dscpMarkingRule.getID()));
+                dscpmarkingRulesBuilder.setTenantId(toUuid(dscpMarkingRule.getTenantID()));
+                dscpmarkingRulesBuilder.setDscpMark(dscpMarkingRule.getDscpMark());
+                listDscpMarking.add(dscpmarkingRulesBuilder.build());
             }
-            qosPolicyBuilder.setDscpmarkingRules(listDscp);
+            qosPolicyBuilder.setDscpmarkingRules(listDscpMarking);
         }
         return qosPolicyBuilder.build();
     }
@@ -77,27 +77,27 @@ public final class NeutronQosPolicyInterface
             result.setPolicyIsShared(qosPolicy.isShared());
         }
         if (qosPolicy.getBandwidthLimitRules() != null) {
-            final List<NeutronQosBandwidthRule> bandWidthRules = new ArrayList<>();
+            final List<NeutronQosBandwidthLimitRule> bandwidthLimitRules = new ArrayList<>();
             for (final BandwidthLimitRules rule : qosPolicy.getBandwidthLimitRules()) {
-                NeutronQosBandwidthRule opt = new NeutronQosBandwidthRule();
+                NeutronQosBandwidthLimitRule opt = new NeutronQosBandwidthLimitRule();
                 opt.setID(rule.getUuid().getValue());
                 opt.setTenantID(rule.getTenantId().getValue());
                 opt.setMaxKbps(rule.getMaxKbps());
                 opt.setMaxBurstKbps(rule.getMaxBurstKbps());
-                bandWidthRules.add(opt);
+                bandwidthLimitRules.add(opt);
             }
-            result.setQosBwLimitRules(bandWidthRules);
+            result.setQosBandwidthLimitRules(bandwidthLimitRules);
         }
         if (qosPolicy.getDscpmarkingRules() != null) {
-            final List<NeutronQosDscpMarkingRule> dscpRules = new ArrayList<>();
+            final List<NeutronQosDscpMarkingRule> dscpMarkingRules = new ArrayList<>();
             for (final DscpmarkingRules rule : qosPolicy.getDscpmarkingRules()) {
                 NeutronQosDscpMarkingRule opt = new NeutronQosDscpMarkingRule();
                 opt.setID(rule.getUuid().getValue());
                 opt.setTenantID(rule.getTenantId().getValue());
                 opt.setDscpMark(rule.getDscpMark());
-                dscpRules.add(opt);
+                dscpMarkingRules.add(opt);
             }
-            result.setDscpRules(dscpRules);
+            result.setDscpMarkingRules(dscpMarkingRules);
         }
         return result;
     }