From: Alon Kochba <alonko@hpe.com>
Date: Mon, 20 Feb 2017 13:21:20 +0000 (+0200)
Subject: Cleanup errors for networks of unsupported type
X-Git-Tag: release/carbon~358
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=9656ecac9c16ed30eafa0f16572c1253adf581cb;p=netvirt.git

Cleanup errors for networks of unsupported type

Reword and lower debug level of network configurations
for networks without a provider extension or with an
unsupported type.

Change-Id: I3b58a79b2fb72fe2c56328f79e0962e366a299ff
Signed-off-by: Alon Kochba <alonko@hpe.com>
Signed-off-by: Sam Hague <shague@redhat.com>
---

diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java
index 934286b820..e10e0736ea 100644
--- a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java
+++ b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java
@@ -106,9 +106,9 @@ public class NeutronPortChangeListener extends AsyncDataTreeChangeListenerBase<P
         LOG.trace("Adding Port : key: {}, value={}", identifier, input);
         Network network = NeutronvpnUtils.getNeutronNetwork(dataBroker, input.getNetworkId());
         if (network == null || !NeutronvpnUtils.isNetworkTypeSupported(network)) {
-            //FIXME: This should be removed when support for VLAN and GRE network types is added
-            LOG.error("neutron vpn doesn't support vlan/gre network provider type for the port {} which is part of "
-                + "network {}.", portName, network);
+            LOG.warn("neutron vpn received a port add() for a network without a provider extension augmentation "
+                            + "or with an unsupported network type for the port {} which is part of network {}",
+                    portName, network);
             return;
         }
         NeutronvpnUtils.addToPortCache(input);
@@ -143,9 +143,10 @@ public class NeutronPortChangeListener extends AsyncDataTreeChangeListenerBase<P
         LOG.trace("Removing Port : key: {}, value={}", identifier, input);
         Network network = NeutronvpnUtils.getNeutronNetwork(dataBroker, input.getNetworkId());
         if (network == null || !NeutronvpnUtils.isNetworkTypeSupported(network)) {
-            //FIXME: This should be removed when support for VLAN and GRE network types is added
-            LOG.error("neutron vpn doesn't support vlan/gre network provider type for the port {} which is part of "
-                + "network {}.", input.getUuid().getValue(), network);
+            String portName = input.getUuid().getValue();
+            LOG.warn("neutron vpn received a port remove() for a network without a provider extension augmentation "
+                            + "or with an unsupported network type for the port {} which is part of network {}",
+                    portName, network);
             return;
         }
         NeutronvpnUtils.removeFromPortCache(input);
@@ -174,8 +175,9 @@ public class NeutronPortChangeListener extends AsyncDataTreeChangeListenerBase<P
         LOG.trace("Updating Port : key: {}, original value={}, update value={}", identifier, original, update);
         Network network = NeutronvpnUtils.getNeutronNetwork(dataBroker, update.getNetworkId());
         if (network == null || !NeutronvpnUtils.isNetworkTypeSupported(network)) {
-            LOG.error("neutron vpn doesn't support vlan/gre network provider type for the port {} which is part of "
-                + "network {}. Skipping the processing of Port update DCN", portName, network);
+            LOG.warn("neutron vpn received a port update() for a network without a provider extension augmentation "
+                    + "or with an unsupported network type for the port {} which is part of network {}",
+                    portName, network);
             return;
         }
         NeutronvpnUtils.addToPortCache(update);
diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetChangeListener.java b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetChangeListener.java
index e7fd68e5af..7e5742fe3f 100644
--- a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetChangeListener.java
+++ b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronSubnetChangeListener.java
@@ -71,10 +71,9 @@ public class NeutronSubnetChangeListener extends AsyncDataTreeChangeListenerBase
         Uuid subnetId = input.getUuid();
         Network network = NeutronvpnUtils.getNeutronNetwork(dataBroker, networkId);
         if (network == null || !NeutronvpnUtils.isNetworkTypeSupported(network)) {
-            //FIXME: This should be removed when support for VLAN and GRE network types is added
-            LOG.error("neutron vpn doesn't support vlan/gre network provider type for the port {} "
-                + "which is part of network {}."
-                + " Skipping the processing of Subnet add DCN", input.getName(), network);
+            LOG.warn("neutron vpn received a subnet add() for a network without a provider extension augmentation "
+                            + "or with an unsupported network type for the subnet {} which is part of network {}",
+                    input.getUuid().getValue(), network);
             return;
         }
 
@@ -99,10 +98,9 @@ public class NeutronSubnetChangeListener extends AsyncDataTreeChangeListenerBase
         Uuid subnetId = input.getUuid();
         Network network = NeutronvpnUtils.getNeutronNetwork(dataBroker, networkId);
         if (network == null || !NeutronvpnUtils.isNetworkTypeSupported(network)) {
-            //FIXME: This should be removed when support for GRE network types is added
-            LOG.error("neutron vpn doesn't support gre network provider type for the port {} "
-                + "which is part of network {}."
-                + " Skipping the processing of Subnet remove DCN", input.getName(), network);
+            LOG.warn("neutron vpn received a subnet remove() for a network without a provider extension augmentation "
+                            + "or with an unsupported network type for the subnet {} which is part of network {}",
+                    input.getUuid().getValue(), network);
             return;
         }
 
@@ -126,9 +124,9 @@ public class NeutronSubnetChangeListener extends AsyncDataTreeChangeListenerBase
         Uuid subnetId = update.getUuid();
         Network network = NeutronvpnUtils.getNeutronNetwork(dataBroker, networkId);
         if (network == null || !NeutronvpnUtils.isNetworkTypeSupported(network)) {
-            LOG.error("neutron vpn doesn't support vlan/gre network provider type for the port {} "
-                + "which is part of network {}."
-                + " Skipping the processing of Subnet update DCN", update.getName(), network);
+            LOG.warn("neutron vpn received a subnet update() for a network without a provider extension augmentation "
+                            + "or with an unsupported network type for the subnet {} which is part of network {}",
+                    update.getUuid().getValue(), network);
             return;
         }
 
diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java
index c806adb13a..455432927d 100644
--- a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java
+++ b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java
@@ -1017,11 +1017,6 @@ public class NeutronvpnUtils {
         return result;
     }
 
-    static boolean isNetworkTypeSupported(Network network) {
-        NetworkProviderExtension npe = network.getAugmentation(NetworkProviderExtension.class);
-        return npe != null && npe.getNetworkType() != null && SUPPORTED_NETWORK_TYPES.contains(npe.getNetworkType());
-    }
-
     static ProviderTypes getProviderNetworkType(Network network) {
         if (network == null) {
             LOG.error("Error in getting provider network type since network is null");
@@ -1045,6 +1040,11 @@ public class NeutronvpnUtils {
         return null;
     }
 
+    static boolean isNetworkTypeSupported(Network network) {
+        NetworkProviderExtension npe = network.getAugmentation(NetworkProviderExtension.class);
+        return npe != null && npe.getNetworkType() != null && SUPPORTED_NETWORK_TYPES.contains(npe.getNetworkType());
+    }
+
     static boolean isNetworkOfType(Network network, Class<? extends NetworkTypeBase> type) {
         NetworkProviderExtension npe = network.getAugmentation(NetworkProviderExtension.class);
         return npe != null && npe.getNetworkType() != null && type.isAssignableFrom(npe.getNetworkType());