Pavlin Radoslavov

Added SDN-IP CLI command to show the BGP neighbors:

  onos:bgp-neighbors
OR
  onos:bgp-neighbors -n <NeighborID>
  onos:bgp-neighbors --neighbor <NeighborID>

Change-Id: I4e4185d9484384d9e3aa5304c897410b23a24238
......@@ -30,6 +30,7 @@ import org.onlab.onos.core.CoreService;
import org.onlab.onos.net.host.HostService;
import org.onlab.onos.net.intent.IntentService;
import org.onlab.onos.sdnip.bgp.BgpRouteEntry;
import org.onlab.onos.sdnip.bgp.BgpSession;
import org.onlab.onos.sdnip.bgp.BgpSessionManager;
import org.onlab.onos.sdnip.config.SdnIpConfigReader;
import org.slf4j.Logger;
......@@ -97,6 +98,11 @@ public class SdnIp implements SdnIpService {
}
@Override
public Collection<BgpSession> getBgpSessions() {
return bgpSessionManager.getBgpSessions();
}
@Override
public Collection<BgpRouteEntry> getBgpRoutes() {
return bgpSessionManager.getBgpRoutes();
}
......
......@@ -18,12 +18,20 @@ package org.onlab.onos.sdnip;
import java.util.Collection;
import org.onlab.onos.sdnip.bgp.BgpRouteEntry;
import org.onlab.onos.sdnip.bgp.BgpSession;
/**
* Service interface exported by SDN-IP.
*/
public interface SdnIpService {
/**
* Gets the BGP sessions.
*
* @return the BGP sessions
*/
public Collection<BgpSession> getBgpSessions();
/**
* Gets the BGP routes.
*
* @return the BGP routes
......
/*
* Copyright 2014 Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onlab.onos.sdnip.cli;
import java.util.Collection;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.onlab.onos.cli.AbstractShellCommand;
import org.onlab.onos.sdnip.SdnIpService;
import org.onlab.onos.sdnip.bgp.BgpSession;
/**
* Command to show the BGP neighbors.
*/
@Command(scope = "onos", name = "bgp-neighbors",
description = "Lists the BGP neighbors")
public class BgpNeighborsListCommand extends AbstractShellCommand {
@Option(name = "-n", aliases = "--neighbor",
description = "BGP neighbor to display information about",
required = false, multiValued = false)
private String bgpNeighbor;
private static final String FORMAT_NEIGHBOR_LINE1 =
"BGP neighbor is %s, remote AS %d, local AS %d";
private static final String FORMAT_NEIGHBOR_LINE2 =
" Remote router ID %s, IP %s, BGP version %d, Hold time %d";
private static final String FORMAT_NEIGHBOR_LINE3 =
" Local router ID %s, IP %s, BGP version %d, Hold time %d";
@Override
protected void execute() {
SdnIpService service = get(SdnIpService.class);
Collection<BgpSession> bgpSessions = service.getBgpSessions();
if (bgpNeighbor != null) {
// Print a single neighbor (if found)
BgpSession foundBgpSession = null;
for (BgpSession bgpSession : bgpSessions) {
if (bgpSession.getRemoteBgpId().toString().equals(bgpNeighbor)) {
foundBgpSession = bgpSession;
break;
}
}
if (foundBgpSession != null) {
printNeighbor(foundBgpSession);
} else {
print("BGP neighbor %s not found", bgpNeighbor);
}
return;
}
// Print all neighbors
printNeighbors(bgpSessions);
}
/**
* Prints all BGP neighbors.
*
* @param bgpSessions the BGP sessions for the neighbors to print
*/
private void printNeighbors(Collection<BgpSession> bgpSessions) {
if (outputJson()) {
print("%s", json(bgpSessions));
} else {
for (BgpSession bgpSession : bgpSessions) {
printNeighbor(bgpSession);
}
}
}
/**
* Prints a BGP neighbor.
*
* @param bgpSession the BGP session for the neighbor to print
*/
private void printNeighbor(BgpSession bgpSession) {
print(FORMAT_NEIGHBOR_LINE1,
bgpSession.getRemoteBgpId().toString(),
bgpSession.getRemoteAs(),
bgpSession.getLocalAs());
print(FORMAT_NEIGHBOR_LINE2,
bgpSession.getRemoteBgpId().toString(),
bgpSession.getRemoteAddress().toString(),
bgpSession.getRemoteBgpVersion(),
bgpSession.getRemoteHoldtime());
print(FORMAT_NEIGHBOR_LINE3,
bgpSession.getLocalBgpId().toString(),
bgpSession.getLocalAddress().toString(),
bgpSession.getLocalBgpVersion(),
bgpSession.getLocalHoldtime());
}
/**
* Produces a JSON array of BGP neighbors.
*
* @param bgpSessions the BGP sessions with the data
* @return JSON array with the neighbors
*/
private JsonNode json(Collection<BgpSession> bgpSessions) {
ObjectMapper mapper = new ObjectMapper();
ArrayNode result = mapper.createArrayNode();
for (BgpSession bgpSession : bgpSessions) {
result.add(json(mapper, bgpSession));
}
return result;
}
/**
* Produces JSON object for a BGP neighbor.
*
* @param mapper the JSON object mapper to use
* @param bgpSession the BGP session with the data
* @return JSON object for the route
*/
private ObjectNode json(ObjectMapper mapper, BgpSession bgpSession) {
ObjectNode result = mapper.createObjectNode();
result.put("remoteAddress", bgpSession.getRemoteAddress().toString());
result.put("remoteBgpVersion", bgpSession.getRemoteBgpVersion());
result.put("remoteAs", bgpSession.getRemoteAs());
result.put("remoteHoldtime", bgpSession.getRemoteHoldtime());
result.put("remoteBgpId", bgpSession.getRemoteBgpId().toString());
//
result.put("localAddress", bgpSession.getLocalAddress().toString());
result.put("localBgpVersion", bgpSession.getLocalBgpVersion());
result.put("localAs", bgpSession.getLocalAs());
result.put("localHoldtime", bgpSession.getLocalHoldtime());
result.put("localBgpId", bgpSession.getLocalBgpId().toString());
return result;
}
}
......@@ -17,6 +17,9 @@
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
<action class="org.onlab.onos.sdnip.cli.BgpNeighborsListCommand"/>
</command>
<command>
<action class="org.onlab.onos.sdnip.cli.BgpRoutesListCommand"/>
</command>
<command>
......