Ignore flaky ITM test

[genius.git] / itm / itm-impl / src / main / java / org / opendaylight / genius / itm / cli / VtepSchemaShow.java

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cli/VtepSchemaShow.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cli/VtepSchemaShow.java
index 5759554ee9895e1ab6a73956564a88de33b642ff..89ce784de878911dcc8f77deec4bebb2a7bdd082 100644 (file)
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cli/VtepSchemaShow.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cli/VtepSchemaShow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
+ * Copyright (c) 2016, 2017 Ericsson India Global Services Pvt Ltd. and others.  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,
@@ -37,7 +37,8 @@ public class VtepSchemaShow extends OsgiCommandSupport {
     private String schemaName;
 
     private static String VTEP_CONFIG_SCHEMA_CLI_FORMAT = "%-14s %-12s %-8s %-16s %-13s %-14s %-11s %-20s %-32s";
-    public static final String HEADER_UNDERLINE = "---------------------------------------------------------------------------------------------------------------------------------------";
+    public static final String HEADER_UNDERLINE = "------------------------------------------------------------------"
+            + "---------------------------------------------------------------------";
 
     /** The Constant logger. */
     private static final Logger LOG = LoggerFactory.getLogger(VtepSchemaShow.class);
@@ -57,9 +58,10 @@ public class VtepSchemaShow extends OsgiCommandSupport {
 
     /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.karaf.shell.console.AbstractAction#doExecute()
      */
+    @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
     protected Object doExecute() {
         LOG.debug("Executing command: schema-show {} ", this.schemaName);
@@ -113,32 +115,33 @@ public class VtepSchemaShow extends OsgiCommandSupport {
         String portName = StringUtils.defaultString(schema.getPortName());
         String vlanId = String.valueOf(schema.getVlanId());
         String subnetCIDR = (schema.getSubnet() == null) ? StringUtils.EMPTY
-                : String.valueOf(schema.getSubnet().getValue());
+                : schema.getSubnet().stringValue();
         String gatewayIp = (schema.getGatewayIp() == null) ? StringUtils.EMPTY
-                : String.valueOf(schema.getGatewayIp().getValue());
+                : schema.getGatewayIp().stringValue();
         String transportZone = StringUtils.defaultString(schema.getTransportZoneName());
         String strTunnelType ;
 
         Class<? extends TunnelTypeBase> tunType = schema.getTunnelType();
 
-        if( tunType.equals(TunnelTypeGre.class) )
-            strTunnelType = ITMConstants.TUNNEL_TYPE_GRE ;
-        else
-            strTunnelType = ITMConstants.TUNNEL_TYPE_VXLAN ;
+        if (TunnelTypeGre.class.equals(tunType)) {
+            strTunnelType = ITMConstants.TUNNEL_TYPE_GRE;
+        } else {
+            strTunnelType = ITMConstants.TUNNEL_TYPE_VXLAN;
+        }
         String dpnId = (dpnIterator.hasNext() ? String.valueOf(dpnIterator.next()) : StringUtils.EMPTY);
         String excludeIpFilter = (ipFilterIterator.hasNext() ? String.valueOf(ipFilterIterator.next())
                 : StringUtils.EMPTY);
 
         // Print first row
-        session.getConsole().println(String.format(VTEP_CONFIG_SCHEMA_CLI_FORMAT, schema.getSchemaName(), portName, vlanId,
-                subnetCIDR, gatewayIp, transportZone, strTunnelType, dpnId, excludeIpFilter));
+        session.getConsole().println(String.format(VTEP_CONFIG_SCHEMA_CLI_FORMAT, schema.getSchemaName(),
+                portName, vlanId, subnetCIDR, gatewayIp, transportZone, strTunnelType, dpnId, excludeIpFilter));
         while (dpnIterator.hasNext() || ipFilterIterator.hasNext()) {
             dpnId = (dpnIterator.hasNext() ? String.valueOf(dpnIterator.next()) : StringUtils.EMPTY);
             excludeIpFilter = (ipFilterIterator.hasNext() ? String.valueOf(ipFilterIterator.next())
                     : StringUtils.EMPTY);
-            session.getConsole().println(String.format(VTEP_CONFIG_SCHEMA_CLI_FORMAT, StringUtils.EMPTY, StringUtils.EMPTY,
+            session.getConsole().println(String.format(VTEP_CONFIG_SCHEMA_CLI_FORMAT, StringUtils.EMPTY,
                     StringUtils.EMPTY, StringUtils.EMPTY, StringUtils.EMPTY, StringUtils.EMPTY, StringUtils.EMPTY,
-                    dpnId, excludeIpFilter));
+                    StringUtils.EMPTY, dpnId, excludeIpFilter));
         }
         session.getConsole().println(System.lineSeparator());
     }
@@ -165,10 +168,8 @@ public class VtepSchemaShow extends OsgiCommandSupport {
      */
     private String getHeaderOutput() {
         String headerBuilder =
-                String.format(VTEP_CONFIG_SCHEMA_CLI_FORMAT, "SchemaName", "PortName", "VlanID", "Subnet",
-                        "GatewayIP", "TransportZone", "TunnelType", "DPN-IDS", "ExcludeIpFilter") +
-                        '\n' +
-                        HEADER_UNDERLINE;
+                String.format(VTEP_CONFIG_SCHEMA_CLI_FORMAT, "SchemaName", "PortName", "VlanID", "Subnet", "GatewayIP",
+                        "TransportZone", "TunnelType", "DPN-IDS", "ExcludeIpFilter") + '\n' + HEADER_UNDERLINE;
         return headerBuilder;
     }
 }