Migrate ShellTable to non-deprecated class

org.apache.karaf.shell.support.table.ShellTable is the new location,
use that.

Change-Id: I85b6adc2ae01a47236217676f78cce9e0f81237e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/GlobalStateCliUtils.java b/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/GlobalStateCliUtils.java
index 0738fa9d0346254ef45d17080063c6a8aa92dce0..c69050f36d02c8890c1e057030814456b00edf84 100644 (file)
--- a/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/GlobalStateCliUtils.java
+++ b/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/GlobalStateCliUtils.java
@@ -10,7 +10,7 @@ package org.opendaylight.protocol.bgp.cli.utils;
 import static org.opendaylight.protocol.bgp.cli.utils.NeighborStateCliUtils.addHeader;
 
 import java.io.PrintStream;
-import org.apache.karaf.shell.table.ShellTable;
+import org.apache.karaf.shell.support.table.ShellTable;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.rev151009.bgp.common.afi.safi.list.AfiSafi;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.global.base.State;

diff --git a/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/NeighborStateCliUtils.java b/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/NeighborStateCliUtils.java
index 7b67232e1d1e1eaae6445bcd8877e4fe2b0cacf2..1f5ef9242fe3f7b51ac45edd279269f3516e3c5f 100644 (file)
--- a/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/NeighborStateCliUtils.java
+++ b/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/NeighborStateCliUtils.java
@@ -9,7 +9,7 @@ package org.opendaylight.protocol.bgp.cli.utils;
 
 import java.io.PrintStream;
 import java.util.List;
-import org.apache.karaf.shell.table.ShellTable;
+import org.apache.karaf.shell.support.table.ShellTable;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.multiprotocol.rev151009.bgp.common.afi.safi.list.AfiSafi;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.operational.rev151009.bgp.neighbor.prefix.counters_state.Prefixes;

diff --git a/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/PeerGroupStateCliUtils.java b/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/PeerGroupStateCliUtils.java
index 3b8d6ddfc3b0f2329946de76ed2192cb6c5e9471..2c0047699a08c5353e991dbcc4c3161b83b46c8d 100644 (file)
--- a/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/PeerGroupStateCliUtils.java
+++ b/bgp/cli/src/main/java/org/opendaylight/protocol/bgp/cli/utils/PeerGroupStateCliUtils.java
@@ -11,7 +11,7 @@ import static org.opendaylight.protocol.bgp.cli.utils.NeighborStateCliUtils.addH
 
 import java.io.PrintStream;
 import java.util.List;
-import org.apache.karaf.shell.table.ShellTable;
+import org.apache.karaf.shell.support.table.ShellTable;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.neighbor.group.State;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.peer.group.PeerGroup;

diff --git a/bgp/cli/src/test/resources/empty-global.txt b/bgp/cli/src/test/resources/empty-global.txt
index ffe526bb00b3d5490cfdbb5a3d4e019d89844d39..0731cafbcda7c92b6797a2439d304dce4d3a2a65 100644 (file)
--- a/bgp/cli/src/test/resources/empty-global.txt
+++ b/bgp/cli/src/test/resources/empty-global.txt
@@ -1,13 +1,13 @@
-Attribute              | Value               
----------------------------------------------
-                       |                     
-RIB state              |                     
-====================== |                     
-Router Id              | test-rib            
-As                     | AsNumber{_value=100}
-Total Paths            | 1                   
-Total Prefixes         | 2                   
-                       |                     
-AFI/SAFI state         |                     
-====================== |                     
-Family                 | IPV4UNICAST         
+Attribute              │ Value
+───────────────────────┼─────────────────────
+                       │
+RIB state              │
+====================== │
+Router Id              │ test-rib
+As                     │ AsNumber{_value=100}
+Total Paths            │ 1
+Total Prefixes         │ 2
+                       │
+AFI/SAFI state         │
+====================== │
+Family                 │ IPV4UNICAST

diff --git a/bgp/cli/src/test/resources/empty-neighbor.txt b/bgp/cli/src/test/resources/empty-neighbor.txt
index a84a3854db03f3f174aaa949c8bfdfc62db9904e..8f6619ea11e3a36afbd363fbdd5fa764b500c17f 100644 (file)
--- a/bgp/cli/src/test/resources/empty-neighbor.txt
+++ b/bgp/cli/src/test/resources/empty-neighbor.txt
@@ -1,8 +1,8 @@
-Attribute              | Value      
-------------------------------------
-Neighbor Address       | 127.0.0.2  
-                       |            
-AFI state              |            
-====================== |            
-Family                 | IPV4UNICAST
-Active                 | false      
+Attribute              │ Value
+───────────────────────┼────────────
+Neighbor Address       │ 127.0.0.2
+                       │
+AFI state              │
+====================== │
+Family                 │ IPV4UNICAST
+Active                 │ false

diff --git a/bgp/cli/src/test/resources/empty-peer-group.txt b/bgp/cli/src/test/resources/empty-peer-group.txt
index baf419a0a10c771b9acfbf1ec2b35d98d8d9f466..c5a687b353f454280e8ccbc778ea52f824986bb7 100644 (file)
--- a/bgp/cli/src/test/resources/empty-peer-group.txt
+++ b/bgp/cli/src/test/resources/empty-peer-group.txt
@@ -1,6 +1,6 @@
-Attribute              | Value     
------------------------------------
-                       |           
-Peer Group state       |           
-====================== |           
-Peer Group Name        | test-group
+Attribute              │ Value
+───────────────────────┼───────────
+                       │
+Peer Group state       │
+====================== │
+Peer Group Name        │ test-group

diff --git a/bgp/cli/src/test/resources/global.txt b/bgp/cli/src/test/resources/global.txt
index 9e7f148ba98ce5216755316eedbb00410acecfee..71e24d88ee687a075a5582969c81acef51399fc4 100644 (file)
--- a/bgp/cli/src/test/resources/global.txt
+++ b/bgp/cli/src/test/resources/global.txt
@@ -1,15 +1,15 @@
-Attribute              | Value               
----------------------------------------------
-                       |                     
-RIB state              |                     
-====================== |                     
-Router Id              | test-rib            
-As                     | AsNumber{_value=100}
-Total Paths            | 1                   
-Total Prefixes         | 2                   
-                       |                     
-AFI/SAFI state         |                     
-====================== |                     
-Family                 | IPV4UNICAST         
-Total Paths            | 3                   
-Total Prefixes         | 4                   
+Attribute              │ Value
+───────────────────────┼─────────────────────
+                       │
+RIB state              │
+====================== │
+Router Id              │ test-rib
+As                     │ AsNumber{_value=100}
+Total Paths            │ 1
+Total Prefixes         │ 2
+                       │
+AFI/SAFI state         │
+====================== │
+Family                 │ IPV4UNICAST
+Total Paths            │ 3
+Total Prefixes         │ 4

diff --git a/bgp/cli/src/test/resources/neighbor.txt b/bgp/cli/src/test/resources/neighbor.txt
index 449e0781a25791892e30e0c8833e5383546c9a09..0a4d8eabb1ad4251359e822c4a2204f847fee0df 100644 (file)
--- a/bgp/cli/src/test/resources/neighbor.txt
+++ b/bgp/cli/src/test/resources/neighbor.txt
@@ -1,37 +1,37 @@
-Attribute              | Value      
-------------------------------------
-Neighbor Address       | 127.0.0.2  
-Session State          | ACTIVE     
-                       |            
-Supported Capabilities |            
-====================== |            
-                       | ADDPATHS   
-                       |            
-Timer state            |            
-====================== |            
-Negotiated Hold Time   | 10         
-Uptime                 | 600        
-                       |            
-Transport state        |            
-====================== |            
-Remote Address         | 127.0.0.2  
-Remote Port            | 4321       
-Local Port             | 1234       
-                       |            
-Messages state         |            
-====================== |            
-Messages Received      |            
-NOTIFICATION           | 1          
-UPDATE                 | 10         
-Messages Sent          |            
-NOTIFICATION           | 10         
-UPDATE                 | 1          
-                       |            
-AFI state              |            
-====================== |            
-Family                 | IPV4UNICAST
-Active                 | true       
-Prefixes               |            
-Installed              | 1          
-Sent                   | 2          
-Received               | 1          
+Attribute              │ Value
+───────────────────────┼────────────
+Neighbor Address       │ 127.0.0.2
+Session State          │ ACTIVE
+                       │
+Supported Capabilities │
+====================== │
+                       │ ADDPATHS
+                       │
+Timer state            │
+====================== │
+Negotiated Hold Time   │ 10
+Uptime                 │ 600
+                       │
+Transport state        │
+====================== │
+Remote Address         │ 127.0.0.2
+Remote Port            │ 4321
+Local Port             │ 1234
+                       │
+Messages state         │
+====================== │
+Messages Received      │
+NOTIFICATION           │ 1
+UPDATE                 │ 10
+Messages Sent          │
+NOTIFICATION           │ 10
+UPDATE                 │ 1
+                       │
+AFI state              │
+====================== │
+Family                 │ IPV4UNICAST
+Active                 │ true
+Prefixes               │
+Installed              │ 1
+Sent                   │ 2
+Received               │ 1

diff --git a/bgp/cli/src/test/resources/peer-group.txt b/bgp/cli/src/test/resources/peer-group.txt
index 26725a3757b778ca7219118675acd05093b1e6d5..9cc8c0425665faeff1d750e743e6e037fd28b612 100644 (file)
--- a/bgp/cli/src/test/resources/peer-group.txt
+++ b/bgp/cli/src/test/resources/peer-group.txt
@@ -1,7 +1,7 @@
-Attribute              | Value     
------------------------------------
-                       |           
-Peer Group state       |           
-====================== |           
-Peer Group Name        | test-group
-Total Prefixes         | 1         
+Attribute              │ Value
+───────────────────────┼───────────
+                       │
+Peer Group state       │
+====================== │
+Peer Group Name        │ test-group
+Total Prefixes         │ 1

diff --git a/pcep/topology/cli/src/main/java/org/opendaylight/protocol/pcep/cli/utils/PcepStateUtils.java b/pcep/topology/cli/src/main/java/org/opendaylight/protocol/pcep/cli/utils/PcepStateUtils.java
index ebb590cac0e977a3ac020a27269150d694aed95b..5a12ae60f71a891a73c4dc4980f894ca6dcaa5bd 100644 (file)
--- a/pcep/topology/cli/src/main/java/org/opendaylight/protocol/pcep/cli/utils/PcepStateUtils.java
+++ b/pcep/topology/cli/src/main/java/org/opendaylight/protocol/pcep/cli/utils/PcepStateUtils.java
@@ -10,7 +10,7 @@ package org.opendaylight.protocol.pcep.cli.utils;
 import java.io.PrintStream;
 import java.util.Arrays;
 import java.util.concurrent.ExecutionException;
-import org.apache.karaf.shell.table.ShellTable;
+import org.apache.karaf.shell.support.table.ShellTable;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;

diff --git a/pcep/topology/cli/src/test/resources/node.txt b/pcep/topology/cli/src/test/resources/node.txt
index d11185c10e2ae94dd81ec3250f591f90ff2a9bb8..826a6f8796cda08c879b16a5f5138696cdf48614 100644 (file)
--- a/pcep/topology/cli/src/test/resources/node.txt
+++ b/pcep/topology/cli/src/test/resources/node.txt
@@ -1,56 +1,56 @@
-Attribute                      | Value          
-------------------------------------------------
-                               |                
-Node state                     |                
-======================         |                
-Topology Id                    | pcep-topology  
-Node Id                        | pcc://127.0.0.1
-Session duration               | 0:00:01:26     
-Synchronized                   | true           
-Delegated Lsp Count            | 1              
-                               |                
-Local preferences              |                
-======================         |                
-Session id                     | 0              
-Ip Address                     | 127.0.0.1      
-Dead Timer                     | 120            
-Keep Alive                     | 30             
-Speaker Entity Identifier      | [1, 2, 3, 4]   
-                               |                
-Peer preferences               |                
-======================         |                
-Session id                     | 0              
-Ip Address                     | 127.0.0.1      
-Dead Timer                     | 120            
-Keep Alive                     | 30             
-                               |                
-Stateful Capabilities          |                
-======================         |                
-Stateful                       | true           
-Active                         | true           
-Instantiation                  | true           
-                               |                
-Messages                       |                
-======================         |                
-Last Sent Msg Timestamp        | 1512043828     
-Received Msg Count             | 4              
-Sent Msg Count                 | 5              
-Unknown Msg Received           | 1              
-                               |                
- Stateful Messages             |                
-======================         |                
-Last Received RptMsg Timestamp | 1512043769     
-Received RptMsg                | 2              
-Sent Init Msg                  | 3              
-Sent Upd Msg                   | 1              
-                               |                
-Error Messages                 |                
-======================         |                
-Sent Error Msg Count           | 2              
-Received Error Msg Count       | 1              
-                               |                
-Reply Messages                 |                
-======================         |                
-Average Time                   | 1              
-Max Timet                      | 3              
-Min Time                       | 2              
+Attribute                      │ Value
+───────────────────────────────┼────────────────
+                               │
+Node state                     │
+======================         │
+Topology Id                    │ pcep-topology
+Node Id                        │ pcc://127.0.0.1
+Session duration               │ 0:00:01:26
+Synchronized                   │ true
+Delegated Lsp Count            │ 1
+                               │
+Local preferences              │
+======================         │
+Session id                     │ 0
+Ip Address                     │ 127.0.0.1
+Dead Timer                     │ 120
+Keep Alive                     │ 30
+Speaker Entity Identifier      │ [1, 2, 3, 4]
+                               │
+Peer preferences               │
+======================         │
+Session id                     │ 0
+Ip Address                     │ 127.0.0.1
+Dead Timer                     │ 120
+Keep Alive                     │ 30
+                               │
+Stateful Capabilities          │
+======================         │
+Stateful                       │ true
+Active                         │ true
+Instantiation                  │ true
+                               │
+Messages                       │
+======================         │
+Last Sent Msg Timestamp        │ 1512043828
+Received Msg Count             │ 4
+Sent Msg Count                 │ 5
+Unknown Msg Received           │ 1
+                               │
+ Stateful Messages             │
+======================         │
+Last Received RptMsg Timestamp │ 1512043769
+Received RptMsg                │ 2
+Sent Init Msg                  │ 3
+Sent Upd Msg                   │ 1
+                               │
+Error Messages                 │
+======================         │
+Sent Error Msg Count           │ 2
+Received Error Msg Count       │ 1
+                               │
+Reply Messages                 │
+======================         │
+Average Time                   │ 1
+Max Timet                      │ 3
+Min Time                       │ 2