Creating default FIB router flows for external subnets.

[netvirt.git] / vpnservice / neutronvpn / neutronvpn-impl / src / main / java / org / opendaylight / netvirt / neutronvpn / NeutronQosPolicyChangeListener.java

diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronQosPolicyChangeListener.java b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronQosPolicyChangeListener.java
index ad2ea87c184668258e6b63787aac2b65e82d2d23..94bb122d944b9728bb9cce2eed613a3c1881a3a2 100644 (file)
--- a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronQosPolicyChangeListener.java
+++ b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronQosPolicyChangeListener.java
@@ -18,7 +18,6 @@ import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.ovsdb.utils.mdsal.utils.MdsalUtils;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.OdlInterfaceRpcService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.Network;
@@ -39,14 +38,12 @@ public class NeutronQosPolicyChangeListener implements ClusteredDataTreeChangeLi
     private ListenerRegistration<DataTreeChangeListener<QosPolicy>> listenerRegistration;
     private final DataBroker dataBroker;
     private final OdlInterfaceRpcService odlInterfaceRpcService;
-    private final MdsalUtils mdsalUtils;
 
 
     public NeutronQosPolicyChangeListener(final DataBroker dataBroker,
             final OdlInterfaceRpcService odlInterfaceRpcService) {
         this.dataBroker = dataBroker;
         this.odlInterfaceRpcService = odlInterfaceRpcService;
-        this.mdsalUtils = new MdsalUtils(dataBroker);
     }
 
     public void start() {
@@ -60,6 +57,8 @@ public class NeutronQosPolicyChangeListener implements ClusteredDataTreeChangeLi
     }
 
     @Override
+    // TODO Clean up the exception handling
+    @SuppressWarnings("checkstyle:IllegalCatch")
     public void close() throws Exception {
         if (listenerRegistration != null) {
             try {
@@ -116,16 +115,12 @@ public class NeutronQosPolicyChangeListener implements ClusteredDataTreeChangeLi
     }
 
     private void add(InstanceIdentifier<QosPolicy> identifier, QosPolicy input) {
-        if (LOG.isTraceEnabled()) {
-            LOG.trace("Adding  QosPolicy : key: " + identifier + ", value=" + input);
-        }
+        LOG.trace("Adding  QosPolicy : key: {}, value={}", identifier, input);
         NeutronvpnUtils.addToQosPolicyCache(input);
     }
 
     private void add(InstanceIdentifier<BandwidthLimitRules> identifier, BandwidthLimitRules input) {
-        if (LOG.isTraceEnabled()) {
-            LOG.trace("Adding BandwidthlimitRules : key: " + identifier + ", value=" + input);
-        }
+        LOG.trace("Adding BandwidthlimitRules : key: {}, value={}", identifier, input);
 
         Uuid qosUuid = identifier.firstKeyOf(QosPolicy.class).getUuid();
         if (NeutronvpnUtils.qosNetworksMap.get(qosUuid) != null
@@ -144,16 +139,12 @@ public class NeutronQosPolicyChangeListener implements ClusteredDataTreeChangeLi
     }
 
     private void remove(InstanceIdentifier<QosPolicy> identifier, QosPolicy input) {
-        if (LOG.isTraceEnabled()) {
-            LOG.trace("Removing QosPolicy : key: " + identifier + ", value=" + input);
-        }
+        LOG.trace("Removing QosPolicy : key: {}, value={}", identifier, input);
         NeutronvpnUtils.removeFromQosPolicyCache(input);
     }
 
     private void remove(InstanceIdentifier<BandwidthLimitRules> identifier, BandwidthLimitRules input) {
-        if (LOG.isTraceEnabled()) {
-            LOG.trace("Removing BandwidthLimitRules : key: " + identifier + ", value=" + input);
-        }
+        LOG.trace("Removing BandwidthLimitRules : key: {}, value={}", identifier, input);
 
         Uuid qosUuid = identifier.firstKeyOf(QosPolicy.class).getUuid();
         BandwidthLimitRulesBuilder bwLimitBuilder = new BandwidthLimitRulesBuilder();
@@ -176,19 +167,14 @@ public class NeutronQosPolicyChangeListener implements ClusteredDataTreeChangeLi
     }
 
     private void update(InstanceIdentifier<QosPolicy> identifier, QosPolicy original, QosPolicy update) {
-        if (LOG.isTraceEnabled()) {
-            LOG.trace("Updating QosPolicy : key: " + identifier + ", original value=" + original + ", update value="
-                    + update);
-        }
+        LOG.trace("Updating QosPolicy : key: {}, original value={}, update value={}", identifier, original, update);
         NeutronvpnUtils.addToQosPolicyCache(update);
     }
 
     private void update(InstanceIdentifier<BandwidthLimitRules> identifier, BandwidthLimitRules original,
             BandwidthLimitRules update) {
-        if (LOG.isTraceEnabled()) {
-            LOG.trace("Updating BandwidthLimitRules : key: " + identifier + ", original value=" + original
-                    + ", update value=" + update);
-        }
+        LOG.trace("Updating BandwidthLimitRules : key: {}, original value={}, update value={}", identifier, original,
+                update);
         Uuid qosUuid = identifier.firstKeyOf(QosPolicy.class).getUuid();
         if (NeutronvpnUtils.qosNetworksMap.get(qosUuid) != null
                 && !NeutronvpnUtils.qosNetworksMap.get(qosUuid).isEmpty()) {