Implement sr-should-program command

Change-Id: Ie7da6c83b1f432c5f84a13712d0a1be106733c6a
This commit is contained in:
Charles Chan 2018-04-17 18:56:53 -07:00 committed by Thomas Vachuska
parent be5789db55
commit 8bc75ee52b
5 changed files with 76 additions and 0 deletions

View File

@ -689,6 +689,18 @@ public class SegmentRoutingManager implements SegmentRoutingService {
return mcastHandler.getMcastLeaders(mcastIp);
}
@Override
public Map<Set<DeviceId>, NodeId> getShouldProgram() {
return defaultRoutingHandler == null ? ImmutableMap.of() :
ImmutableMap.copyOf(defaultRoutingHandler.shouldProgram);
}
@Override
public Map<DeviceId, Boolean> getShouldProgramCache() {
return defaultRoutingHandler == null ? ImmutableMap.of() :
ImmutableMap.copyOf(defaultRoutingHandler.shouldProgramCache);
}
/**
* Extracts the application ID from the manager.
*

View File

@ -273,4 +273,18 @@ public interface SegmentRoutingService {
* @return the mapping group-node
*/
Map<IpAddress, NodeId> getMcastLeaders(IpAddress mcastIp);
/**
* Returns shouldProgram map.
*
* @return shouldProgram map
*/
Map<Set<DeviceId>, NodeId> getShouldProgram();
/**
* Returns shouldProgram local cache.
*
* @return shouldProgram local cache
*/
Map<DeviceId, Boolean> getShouldProgramCache();
}

View File

@ -0,0 +1,46 @@
/*
* Copyright 2018-present Open Networking Foundation
*
* 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.onosproject.cli.AbstractShellCommand;
import org.onosproject.cluster.NodeId;
import org.onosproject.net.DeviceId;
import org.onosproject.segmentrouting.SegmentRoutingService;
import java.util.Map;
import java.util.Set;
/**
* Display current shouldProgram map.
*/
@Command(scope = "onos", name = "sr-should-program",
description = "Display current shouldProgram map")
public class ShouldProgramCommand extends AbstractShellCommand {
@Override
protected void execute() {
SegmentRoutingService srService = AbstractShellCommand.get(SegmentRoutingService.class);
Map<Set<DeviceId>, NodeId> shouldProgram = srService.getShouldProgram();
Map<DeviceId, Boolean> shouldProgramCache = srService.getShouldProgramCache();
print("shouldProgram");
shouldProgram.forEach((k, v) -> print("%s -> %s", k, v));
print("shouldProgramCache");
shouldProgramCache.forEach((k, v) -> print("%s -> %s", k, v));
}
}

View File

@ -48,6 +48,9 @@
<command>
<action class="org.onosproject.segmentrouting.cli.NextHopCommand"/>
</command>
<command>
<action class="org.onosproject.segmentrouting.cli.ShouldProgramCommand"/>
</command>
<command>
<action class="org.onosproject.segmentrouting.cli.VerifyGroupsCommand"/>
<completers>

View File

@ -94,6 +94,7 @@ CLI_COMMANDS=(
"sr-device-subnets"
"sr-ecmp-spg"
"sr-should-program"
"sr-link-state"
"sr-mcast-next"
"sr-mcast-tree"