CLI command that shows all subnets configured in Segment Routing

Change-Id: Ib03ec2039b763f3796548923883fc89913a1ceac
This commit is contained in:
Charles Chan 2016-10-20 17:02:44 -07:00 committed by Charles Chan
parent aa57d93048
commit c81c45bbde
5 changed files with 90 additions and 0 deletions

View File

@ -15,6 +15,7 @@
*/
package org.onosproject.segmentrouting;
import com.google.common.collect.Maps;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
@ -454,6 +455,15 @@ public class SegmentRoutingManager implements SegmentRoutingService {
defaultRoutingHandler.startPopulationProcess();
}
@Override
public Map<DeviceId, Set<Ip4Prefix>> getDeviceSubnetMap() {
Map<DeviceId, Set<Ip4Prefix>> deviceSubnetMap = Maps.newHashMap();
deviceService.getAvailableDevices().forEach(device -> {
deviceSubnetMap.put(device.id(), deviceConfiguration.getSubnets(device.id()));
});
return deviceSubnetMap;
}
/**
* Returns the tunnel object with the tunnel ID.
*

View File

@ -15,7 +15,12 @@
*/
package org.onosproject.segmentrouting;
import org.onlab.packet.Ip4Prefix;
import org.onosproject.net.DeviceId;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* Segment Routing Service for REST API.
@ -109,4 +114,11 @@ public interface SegmentRoutingService {
*
*/
void rerouteNetwork();
/**
* Returns device-subnet mapping.
*
* @return device-subnet mapping
*/
Map<DeviceId, Set<Ip4Prefix>> getDeviceSubnetMap();
}

View File

@ -0,0 +1,49 @@
/*
* Copyright 2016-present 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.onosproject.segmentrouting.cli;
import org.apache.karaf.shell.commands.Command;
import org.onlab.packet.Ip4Prefix;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.net.DeviceId;
import org.onosproject.segmentrouting.SegmentRoutingService;
import java.util.Map;
import java.util.Set;
/**
* Command to list device-subnet mapping in Segment Routing.
*/
@Command(scope = "onos", name = "sr-device-subnets",
description = "List device-subnet mapping in Segment Routing")
public class DeviceSubnetListCommand extends AbstractShellCommand {
@Override
protected void execute() {
SegmentRoutingService srService =
AbstractShellCommand.get(SegmentRoutingService.class);
printDeviceSubnetMap(srService.getDeviceSubnetMap());
}
private void printDeviceSubnetMap(Map<DeviceId, Set<Ip4Prefix>> deviceSubnetMap) {
deviceSubnetMap.forEach(((deviceId, ip4Prefices) -> {
print("%s", deviceId);
ip4Prefices.forEach(ip4Prefix -> {
print(" %s", ip4Prefix);
});
}));
}
}

View File

@ -1,3 +1,19 @@
/*
* Copyright 2016-present 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.onosproject.segmentrouting.cli;

View File

@ -37,6 +37,9 @@
<command>
<action class="org.onosproject.segmentrouting.cli.RerouteNetworkCommand"/>
</command>
<command>
<action class="org.onosproject.segmentrouting.cli.DeviceSubnetListCommand"/>
</command>
</command-bundle>
</blueprint>