vpnservice: misc fixes mainly about BGPVPN configuration

[netvirt.git] / vpnservice / neutronvpn / neutronvpn-shell / src / main / java / org / opendaylight / netvirt / neutronvpn / shell / ShowSubnet.java

diff --git a/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java b/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java
index b79ca380c9c6d81c358cd4eb6f13149d67a4bfb1..33eeb7c960eac193aec3ce7771d02222e9055f98 100644 (file)
--- a/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java
+++ b/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java
@@ -93,12 +93,14 @@ public class ShowSubnet extends OsgiCommandSupport {
             Subnetmap data = sn.get();
             System.out.println("Fetching subnetopdataentry for given subnetId\n");
             System.out.println("------------------------------------------------------------------------------");
+            String getRouterInterfacePortId = (data.getRouterInterfacePortId() != null
+                       ? data.getRouterInterfacePortId().getValue() : "null");
             System.out.println("Key: " + data.getKey() + "\n" + "VpnId: " + data.getVpnId() + "\n"
                     + "DirectPortList: " + data.getDirectPortList() + "\n" + "NetworkId: " + data.getNetworkId()
                     + "\n" + "Network-type: " + data.getNetworkType() + "\n" + "Network-segmentation-Id: "
                     + data.getSegmentationId() + "\n" + "PortList: " + data.getPortList() + "\n"
                     + "RouterInterfaceFixedIp: " + data.getRouterInterfaceFixedIp() + "\n"
-                    + "RouterInterfacePortId: " + data.getRouterInterfacePortId().getValue() + "\n"
+                    + "RouterInterfacePortId: " + getRouterInterfacePortId + "\n"
                     + "RouterIntfMacAddress: " + data.getRouterIntfMacAddress() + "\n" + "SubnetIp: "
                     + data.getSubnetIp() + "\n" + "TenantId: " + data.getTenantId() + "\n");
             System.out.println("------------------------------------------------------------------------------");