홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Priyankab-Huawei
3946d73a 1 parent 72a354fc

Revert "[ONOS-5187] Compute path with Explicit path objects" 

This reverts commit a32f6da9.

Change-Id: Ic023d701d18f0ae7af2579bc43777714a0e701dc
Expand all
Inline Side-by-side
Showing 22 changed files with 48 additions and 576 deletions
......@@ -105,10 +105,5 @@
<groupId>org.onosproject</groupId>
<artifactId>onos-app-pcep-api</artifactId>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</dependencies>
</project>
......
......@@ -24,13 +24,10 @@ import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.tunnel.Tunnel;
import org.onosproject.incubator.net.tunnel.TunnelId;
import org.onosproject.net.AnnotationKeys;
import org.onosproject.pce.pceservice.ExplicitPathInfo;
import org.onosproject.pce.pceservice.api.PceService;
import org.slf4j.Logger;
import java.util.List;
/**
* Supports quering PCE path.
*/
......@@ -75,28 +72,17 @@ public class PceQueryPathCommand extends AbstractShellCommand {
* @param tunnel pce tunnel
*/
void display(Tunnel tunnel) {
List<ExplicitPathInfo> explicitPathInfoList = AbstractShellCommand.get(PceService.class)
.explicitPathInfoList(tunnel.tunnelName().value());
print("\npath-id : %s \n" +
"source : %s \n" +
"destination : %s \n" +
"path-type : %s \n" +
"symbolic-path-name : %s \n" +
print("\npath-id : %s \n" +
"source : %s \n" +
"destination : %s \n" +
"path-type : %s \n" +
"symbolic-path-name : %s \n" +
"constraints: \n" +
" cost : %s \n" +
" bandwidth : %s",
" cost : %s \n" +
" bandwidth : %s",
tunnel.tunnelId().id(), tunnel.path().src().deviceId().toString(),
tunnel.path().dst().deviceId().toString(),
tunnel.type().name(), tunnel.tunnelName(), tunnel.annotations().value(COST_TYPE),
tunnel.annotations().value(AnnotationKeys.BANDWIDTH));
if (explicitPathInfoList != null) {
for (ExplicitPathInfo e : explicitPathInfoList) {
print("explicitPathObjects : \n" +
" type : %s \n" +
" value : %s ",
String.valueOf(e.type().type()), e.value().toString());
}
}
}
}
......
......@@ -15,35 +15,27 @@
*/
package org.onosproject.pce.cli;
import static org.onosproject.net.Link.State.ACTIVE;
import static org.onosproject.net.Link.Type.DIRECT;
import static org.slf4j.LoggerFactory.getLogger;
import java.util.Collection;
import java.util.List;
import java.util.LinkedList;
import com.google.common.collect.Lists;
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.onlab.util.DataRateUnit;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.incubator.net.tunnel.Tunnel;
import org.onosproject.incubator.net.tunnel.TunnelService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DefaultLink;
import org.onosproject.net.DeviceId;
import org.onosproject.net.NetworkResource;
import org.onosproject.net.PortNumber;
import org.onosproject.net.intent.constraint.BandwidthConstraint;
import org.onosproject.net.intent.Constraint;
import org.onosproject.net.provider.ProviderId;
import org.onosproject.pce.pceservice.ExplicitPathInfo;
import org.onosproject.pce.pceservice.constraint.CostConstraint;
import org.onosproject.pce.pceservice.LspType;
import org.onosproject.pce.pceservice.api.PceService;
import org.slf4j.Logger;
/**
......@@ -52,16 +44,6 @@ import org.slf4j.Logger;
@Command(scope = "onos", name = "pce-setup-path", description = "Supports creating pce path.")
public class PceSetupPathCommand extends AbstractShellCommand {
private final Logger log = getLogger(getClass());
public static final byte SUBTYPE_DEVICEID = 0;
public static final byte SUBTYPE_LINK = 1;
public static final byte SUBTYPE_INDEX = 1;
public static final byte TYPE_INDEX = 0;
public static final byte DEVICEID_INDEX = 2;
public static final byte SOURCE_DEVICEID_INDEX = 2;
public static final byte SOURCE_PORTNO_INDEX = 3;
public static final byte DESTINATION_DEVICEID_INDEX = 4;
public static final byte DESTINATION_PORTNO_INDEX = 5;
@Argument(index = 0, name = "src", description = "source device.", required = true, multiValued = false)
String src = null;
......@@ -87,15 +69,6 @@ public class PceSetupPathCommand extends AbstractShellCommand {
+ "Data rate unit is in BPS.", required = false, multiValued = false)
double bandwidth = 0.0;
@Option(name = "-e", aliases = "--explicitPathObjects", description = "List of strict and loose hopes",
required = false, multiValued = true)
String[] explicitPathInfoStrings;
//explicitPathInfo format : Type/SubType/Value(DeviceId or Link info)
//If Value is Device : Type/SubType/deviceId
//If Value is Link : Type/SubType/SourceDeviceId/SourcePortNo/DestinationDeviceId/DestinationPortNo
List<ExplicitPathInfo> explicitPathInfo = Lists.newLinkedList();
@Override
protected void execute() {
log.info("executing pce-setup-path");
......@@ -141,50 +114,7 @@ public class PceSetupPathCommand extends AbstractShellCommand {
CostConstraint.Type costType = CostConstraint.Type.values()[cost - 1];
listConstrnt.add(CostConstraint.of(costType));
if (explicitPathInfoStrings != null) {
for (String str : explicitPathInfoStrings) {
String[] splitted = str.split("/");
DeviceId deviceId;
NetworkResource res = null;
PortNumber portNo;
int explicitPathType = Integer.parseInt(splitted[TYPE_INDEX]);
if ((explicitPathType < 0) || (explicitPathType > 1)) {
error("Explicit path validation failed");
return;
}
//subtype 0 = deviceId, 1 = link
//subtype is required to store either as deviceId or Link
if (splitted[DEVICEID_INDEX] != null && Integer.parseInt(splitted[SUBTYPE_INDEX]) == SUBTYPE_DEVICEID) {
res = DeviceId.deviceId(splitted[DEVICEID_INDEX]);
} else if (Integer.parseInt(splitted[SUBTYPE_INDEX]) == SUBTYPE_LINK
&& splitted[SOURCE_DEVICEID_INDEX] != null
&& splitted[SOURCE_PORTNO_INDEX] != null
&& splitted[DESTINATION_DEVICEID_INDEX] != null
&& splitted[DESTINATION_PORTNO_INDEX] != null) {
deviceId = DeviceId.deviceId(splitted[SOURCE_DEVICEID_INDEX]);
portNo = PortNumber.portNumber(splitted[SOURCE_PORTNO_INDEX]);
ConnectPoint cpSrc = new ConnectPoint(deviceId, portNo);
deviceId = DeviceId.deviceId(splitted[DESTINATION_DEVICEID_INDEX]);
portNo = PortNumber.portNumber(splitted[DESTINATION_PORTNO_INDEX]);
ConnectPoint cpDst = new ConnectPoint(deviceId, portNo);
res = DefaultLink.builder()
.providerId(ProviderId.NONE)
.src(cpSrc)
.dst(cpDst)
.type(DIRECT)
.state(ACTIVE)
.build();
} else {
error("Explicit path validation failed");
return;
}
ExplicitPathInfo obj = new ExplicitPathInfo(ExplicitPathInfo.Type.values()[explicitPathType], res);
explicitPathInfo.add(obj);
}
}
if (!service.setupPath(srcDevice, dstDevice, name, listConstrnt, lspType, explicitPathInfo)) {
if (!service.setupPath(srcDevice, dstDevice, name, listConstrnt, lspType)) {
error("Path creation failed.");
}
}
......
......@@ -18,18 +18,14 @@ package org.onosproject.pce.pceservice;
import static com.google.common.base.MoreObjects.toStringHelper;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import org.onlab.rest.BaseResource;
import org.onlab.util.DataRateUnit;
import org.onosproject.incubator.net.tunnel.Tunnel;
import org.onosproject.incubator.net.tunnel.TunnelId;
import org.onosproject.net.intent.constraint.BandwidthConstraint;
import org.onosproject.net.intent.Constraint;
import org.onosproject.pce.pceservice.constraint.CostConstraint;
import org.onosproject.pce.pcestore.api.PceStore;
/**
* Implementation of an entity which provides functionalities of pce path.
......@@ -43,7 +39,6 @@ public final class DefaultPcePath implements PcePath {
private String name; // symbolic-path-name
private Constraint costConstraint; // cost constraint
private Constraint bandwidthConstraint; // bandwidth constraint
private Collection<ExplicitPathInfo> explicitPathInfo; //list of explicit path info
/**
* Initializes PCE path attributes.
......@@ -55,11 +50,10 @@ public final class DefaultPcePath implements PcePath {
* @param name symbolic-path-name
* @param costConstrnt cost constraint
* @param bandwidthConstrnt bandwidth constraint
* @param explicitPathInfo list of explicit path info
*/
private DefaultPcePath(TunnelId id, String src, String dst, LspType lspType,
String name, Constraint costConstrnt, Constraint bandwidthConstrnt,
Collection<ExplicitPathInfo> explicitPathInfo) {
String name, Constraint costConstrnt, Constraint bandwidthConstrnt) {
this.id = id;
this.source = src;
this.destination = dst;
......@@ -67,7 +61,6 @@ public final class DefaultPcePath implements PcePath {
this.name = name;
this.costConstraint = costConstrnt;
this.bandwidthConstraint = bandwidthConstrnt;
this.explicitPathInfo = explicitPathInfo;
}
@Override
......@@ -121,11 +114,6 @@ public final class DefaultPcePath implements PcePath {
}
@Override
public Collection<ExplicitPathInfo> explicitPathInfo() {
return explicitPathInfo;
}
@Override
public PcePath copy(PcePath path) {
if (null != path.source()) {
this.source = path.source();
......@@ -150,8 +138,7 @@ public final class DefaultPcePath implements PcePath {
@Override
public int hashCode() {
return Objects.hash(id, source, destination, lspType, name, costConstraint, bandwidthConstraint,
explicitPathInfo);
return Objects.hash(id, source, destination, lspType, name, costConstraint, bandwidthConstraint);
}
@Override
......@@ -167,8 +154,7 @@ public final class DefaultPcePath implements PcePath {
&& Objects.equals(lspType, that.lspType)
&& Objects.equals(name, that.name)
&& Objects.equals(costConstraint, that.costConstraint)
&& Objects.equals(bandwidthConstraint, that.bandwidthConstraint)
&& Objects.equals(explicitPathInfo, that.explicitPathInfo);
&& Objects.equals(bandwidthConstraint, that.bandwidthConstraint);
}
return false;
}
......@@ -184,7 +170,6 @@ public final class DefaultPcePath implements PcePath {
.add("name", name)
.add("costConstraint", costConstraint)
.add("bandwidthConstraint", bandwidthConstraint)
.add("explicitPathInfo", explicitPathInfo)
.toString();
}
......@@ -200,7 +185,7 @@ public final class DefaultPcePath implements PcePath {
/**
* Builder class for pce path.
*/
public static final class Builder extends BaseResource implements PcePath.Builder {
public static final class Builder implements PcePath.Builder {
private TunnelId id;
private String source;
private String destination;
......@@ -208,7 +193,6 @@ public final class DefaultPcePath implements PcePath {
private String name;
private Constraint costConstraint;
private Constraint bandwidthConstraint;
private Collection<ExplicitPathInfo> explicitPathInfo;
@Override
public Builder id(String id) {
......@@ -256,12 +240,6 @@ public final class DefaultPcePath implements PcePath {
}
@Override
public Builder explicitPathInfo(Collection<ExplicitPathInfo> explicitPathInfo) {
this.explicitPathInfo = explicitPathInfo;
return this;
}
@Override
public Builder of(Tunnel tunnel) {
this.id = TunnelId.valueOf(tunnel.tunnelId().id());
this.source = tunnel.path().src().deviceId().toString();
......@@ -286,20 +264,13 @@ public final class DefaultPcePath implements PcePath {
DataRateUnit.valueOf("BPS"));
}
PceStore pceStore = get(PceStore.class);
List<ExplicitPathInfo> explicitPathInfoList = pceStore
.getTunnelNameExplicitPathInfoMap(tunnel.tunnelName().value());
if (explicitPathInfoList != null) {
this.explicitPathInfo = explicitPathInfoList;
}
return this;
}
@Override
public PcePath build() {
return new DefaultPcePath(id, source, destination, lspType, name,
costConstraint, bandwidthConstraint, explicitPathInfo);
costConstraint, bandwidthConstraint);
}
}
}
......
/*
* 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.pce.pceservice;
import org.onosproject.net.NetworkResource;
import com.google.common.annotations.Beta;
import java.util.Objects;
/**
* Representation of explicit path info consists of contraints (strict / loose) to compute path.
*/
@Beta
public final class ExplicitPathInfo {
private final Type type;
//Can be Link or DeviceId
private final NetworkResource value;
public enum Type {
/**
* Signifies that path includes strict node or link.
*/
STRICT(0),
/**
* Signifies that path includes loose node or link.
*/
LOOSE(1);
int value;
/**
* Assign val with the value as the type.
*
* @param val type
*/
Type(int val) {
value = val;
}
/**
* Returns value of type.
*
* @return type
*/
public byte type() {
return (byte) value;
}
}
/**
* Creates instance of explicit path object.
*
* @param type specifies whether strict or loose node/link
* @param value specifies deviceId or link
*/
public ExplicitPathInfo(Type type, NetworkResource value) {
this.type = type;
this.value = value;
}
/**
* Returns explicit path type.
*
* @return explicit path type as strict/loose
*/
public Type type() {
return type;
}
/**
* Returns deviceId or link.
*
* @return deviceId or link
*/
public NetworkResource value() {
return value;
}
@Override
public int hashCode() {
return Objects.hash(type, value);
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj instanceof ExplicitPathInfo) {
final ExplicitPathInfo other = (ExplicitPathInfo) obj;
return Objects.equals(this.type, other.type)
&& Objects.equals(this.value, other.value);
}
return false;
}
}
......@@ -19,8 +19,7 @@ package org.onosproject.pce.pceservice;
import org.onosproject.incubator.net.tunnel.Tunnel;
import org.onosproject.incubator.net.tunnel.TunnelId;
import org.onosproject.net.intent.Constraint;
import java.util.Collection;
import org.onosproject.pce.pceservice.DefaultPcePath.Builder;
/**
* Abstraction of an entity which provides functionalities of pce path.
......@@ -98,13 +97,6 @@ public interface PcePath {
Constraint bandwidthConstraint();
/**
* Returns the list of explicit path objects.
*
* @return list of explicit path objects
*/
Collection<ExplicitPathInfo> explicitPathInfo();
/**
* Copies only non-null or non-zero member variables.
*
* @param id path-id
......@@ -182,14 +174,6 @@ public interface PcePath {
Builder of(Tunnel tunnel);
/**
* Returns the builder object of ExplicitPathInfo.
*
* @param explicitPathInfo list of explicit path obj
* @return builder object of ExplicitPathInfo
*/
Builder explicitPathInfo(Collection<ExplicitPathInfo> explicitPathInfo);
/**
* Builds object of pce path.
*
* @return object of pce path.
......
......@@ -19,7 +19,6 @@ import java.util.List;
import org.onosproject.net.DeviceId;
import org.onosproject.net.intent.Constraint;
import org.onosproject.pce.pceservice.ExplicitPathInfo;
import org.onosproject.pce.pceservice.LspType;
import org.onosproject.incubator.net.tunnel.Tunnel;
import org.onosproject.incubator.net.tunnel.TunnelId;
......@@ -43,20 +42,6 @@ public interface PceService {
boolean setupPath(DeviceId src, DeviceId dst, String tunnelName, List<Constraint> constraints, LspType lspType);
/**
* Creates new path based on constraints and LSP type.
*
* @param src source device
* @param dst destination device
* @param tunnelName name of the tunnel
* @param constraints list of constraints to be applied on path
* @param lspType type of path to be setup
* @param explicitPathInfo list of explicit path info
* @return false on failure and true on successful path creation
*/
boolean setupPath(DeviceId src, DeviceId dst, String tunnelName, List<Constraint> constraints, LspType lspType,
List<ExplicitPathInfo> explicitPathInfo);
/**
* Updates an existing path.
*
* @param tunnelId tunnel identifier
......@@ -87,12 +72,4 @@ public interface PceService {
* @return tunnel if path exists, otherwise null
*/
Tunnel queryPath(TunnelId tunnelId);
/**
* Returns list of explicit path info.
*
* @param tunnelName tunnel name
* @return list of explicit path info
*/
List<ExplicitPathInfo> explicitPathInfoList(String tunnelName);
}
\ No newline at end of file
......
......@@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.collect.ImmutableSet;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
......@@ -34,7 +33,6 @@ import org.onlab.util.KryoNamespace;
import org.onosproject.incubator.net.tunnel.TunnelId;
import org.onosproject.net.intent.constraint.BandwidthConstraint;
import org.onosproject.net.resource.ResourceConsumer;
import org.onosproject.pce.pceservice.ExplicitPathInfo;
import org.onosproject.pce.pceservice.constraint.CapabilityConstraint;
import org.onosproject.pce.pceservice.constraint.CostConstraint;
import org.onosproject.pce.pceservice.TunnelConsumerId;
......@@ -71,9 +69,6 @@ public class DistributedPceStore implements PceStore {
// List of Failed path info
private DistributedSet<PcePathInfo> failedPathSet;
// Maintains tunnel name mapped to explicit path info
private ConsistentMap<String, List<ExplicitPathInfo>> tunnelNameExplicitPathInfoMap;
private static final Serializer SERIALIZER = Serializer
.using(new KryoNamespace.Builder().register(KryoNamespaces.API)
.register(PcePathInfo.class)
......@@ -104,16 +99,6 @@ public class DistributedPceStore implements PceStore {
.build()
.asDistributedSet();
tunnelNameExplicitPathInfoMap = storageService.<String, List<ExplicitPathInfo>>consistentMapBuilder()
.withName("onos-pce-explicitpathinfo")
.withSerializer(Serializer.using(
new KryoNamespace.Builder()
.register(KryoNamespaces.API)
.register(ExplicitPathInfo.class)
.register(ExplicitPathInfo.Type.class)
.build()))
.build();
log.info("Started");
}
......@@ -196,18 +181,4 @@ public class DistributedPceStore implements PceStore {
}
return true;
}
@Override
public boolean tunnelNameExplicitPathInfoMap(String tunnelName, List<ExplicitPathInfo> explicitPathInfo) {
checkNotNull(tunnelName);
checkNotNull(explicitPathInfo);
return tunnelNameExplicitPathInfoMap.put(tunnelName, explicitPathInfo) != null ? true : false;
}
@Override
public List<ExplicitPathInfo> getTunnelNameExplicitPathInfoMap(String tunnelName) {
checkNotNull(tunnelName);
return tunnelNameExplicitPathInfoMap.get(tunnelName).value();
}
}
......
......@@ -22,7 +22,6 @@ import java.util.Objects;
import org.onosproject.net.DeviceId;
import org.onosproject.net.intent.Constraint;
import org.onosproject.pce.pceservice.ExplicitPathInfo;
import org.onosproject.pce.pceservice.LspType;
/**
......@@ -41,8 +40,6 @@ public final class PcePathInfo {
private LspType lspType; // lsp type
private List<ExplicitPathInfo> explicitPathInfo; //Explicit path info to compute explicit path
/**
* Initialization of member variables.
*
......@@ -51,20 +48,17 @@ public final class PcePathInfo {
* @param name tunnel name
* @param constraints list of constraints
* @param lspType lsp type
* @param explicitPathInfo explicit path info
*/
public PcePathInfo(DeviceId src,
DeviceId dst,
String name,
List<Constraint> constraints,
LspType lspType,
List<ExplicitPathInfo> explicitPathInfo) {
LspType lspType) {
this.src = src;
this.dst = dst;
this.name = name;
this.constraints = constraints;
this.lspType = lspType;
this.explicitPathInfo = explicitPathInfo;
}
/**
......@@ -76,7 +70,6 @@ public final class PcePathInfo {
this.name = null;
this.constraints = null;
this.lspType = null;
this.explicitPathInfo = null;
}
/**
......@@ -169,27 +162,9 @@ public final class PcePathInfo {
this.lspType = lspType;
}
/**
* Returns list of explicit path info.
*
* @return list of explicit path info
*/
public List<ExplicitPathInfo> explicitPathInfo() {
return explicitPathInfo;
}
/**
* Sets list of explicit path info.
*
* @param explicitPathInfo list of explicit path info
*/
public void explicitPathInfo(List<ExplicitPathInfo> explicitPathInfo) {
this.explicitPathInfo = explicitPathInfo;
}
@Override
public int hashCode() {
return Objects.hash(src, dst, name, constraints, lspType, explicitPathInfo);
return Objects.hash(src, dst, name, constraints, lspType);
}
@Override
......@@ -203,8 +178,7 @@ public final class PcePathInfo {
Objects.equals(this.dst, other.dst) &&
Objects.equals(this.name, other.name) &&
Objects.equals(this.constraints, other.constraints) &&
Objects.equals(this.lspType, other.lspType) &&
Objects.equals(this.explicitPathInfo, other.explicitPathInfo);
Objects.equals(this.lspType, other.lspType);
}
return false;
}
......@@ -213,12 +187,11 @@ public final class PcePathInfo {
public String toString() {
return MoreObjects.toStringHelper(getClass())
.omitNullValues()
.add("Source", src)
.add("Destination", dst)
.add("Name", name)
.add("Constraints", constraints)
.add("explicitPathInfo", explicitPathInfo)
.add("LspType", lspType)
.add("Source", src.toString())
.add("Destination", dst.toString())
.add("Name", name.toString())
.add("Constraints", constraints.toString())
.add("LspType", lspType.toString())
.toString();
}
}
......
......@@ -15,11 +15,8 @@
*/
package org.onosproject.pce.pcestore.api;
import java.util.List;
import org.onosproject.incubator.net.tunnel.TunnelId;
import org.onosproject.net.resource.ResourceConsumer;
import org.onosproject.pce.pceservice.ExplicitPathInfo;
import org.onosproject.pce.pcestore.PcePathInfo;
import java.util.Map;
......@@ -110,21 +107,4 @@ public interface PceStore {
* @return success or failure
*/
boolean removeFailedPathInfo(PcePathInfo failedPathInfo);
/**
* Adds explicit path info to the map with corresponding tunnel name.
*
* @param tunnelName tunnel name as key
* @param explicitPathInfo list of explicit path objects
* @return whether it is added to map
*/
boolean tunnelNameExplicitPathInfoMap(String tunnelName, List<ExplicitPathInfo> explicitPathInfo);
/**
* Gets explicit path info based on tunnel name.
*
* @param tunnelName tunnel name as key
* @return list of explicit path info
*/
List<ExplicitPathInfo> getTunnelNameExplicitPathInfoMap(String tunnelName);
}
......
......@@ -16,47 +16,21 @@
package org.onosproject.pce.pceservice;
import com.google.common.collect.Lists;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.onosproject.pce.pceservice.PathComputationTest.D2;
import static org.easymock.EasyMock.createMock;
import com.google.common.testing.EqualsTester;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.incubator.net.tunnel.TunnelId;
import org.onosproject.pce.pceservice.constraint.CostConstraint;
import org.onosproject.pce.pcestore.api.PceStore;
import org.onosproject.net.intent.constraint.BandwidthConstraint;
import java.util.List;
/**
* Unit tests for DefaultPcePath class.
*/
public class DefaultPcePathTest {
private PceStore pceStore = createMock(PceStore.class);
@Before
public void setup() {
ServiceDirectory testDirectory = new TestServiceDirectory()
.add(PceStore.class, pceStore);
BaseResource.setServiceDirectory(testDirectory);
}
@After
public void tearDownTest() {
}
/**
* Checks the operation of equals() methods.
*/
......@@ -69,9 +43,7 @@ public class DefaultPcePathTest {
final String dst1 = "bee";
final String type1 = "1";
final String name1 = "pcc";
final List<ExplicitPathInfo> explicitPathInfoList = Lists.newLinkedList();
ExplicitPathInfo obj = new ExplicitPathInfo(ExplicitPathInfo.Type.LOOSE, D2.deviceId());
explicitPathInfoList.add(obj);
PcePath path1 = DefaultPcePath.builder()
.source(src1)
.destination(dst1)
......@@ -79,7 +51,6 @@ public class DefaultPcePathTest {
.name(name1)
.costConstraint(cost1)
.bandwidthConstraint(bandwidth1)
.explicitPathInfo(explicitPathInfoList)
.build();
path1.id(TunnelId.valueOf("1"));
......@@ -91,7 +62,6 @@ public class DefaultPcePathTest {
.name(name1)
.costConstraint(cost1)
.bandwidthConstraint(bandwidth1)
.explicitPathInfo(explicitPathInfoList)
.build();
samePath1.id(TunnelId.valueOf("1"));
......@@ -110,7 +80,6 @@ public class DefaultPcePathTest {
.name(name2)
.costConstraint(cost2)
.bandwidthConstraint(bandwidth2)
.explicitPathInfo(explicitPathInfoList)
.build();
path2.id(TunnelId.valueOf("2"));
......@@ -128,9 +97,7 @@ public class DefaultPcePathTest {
final String dst = "deccan";
final String type = "2";
final String name = "pcc4";
final List<ExplicitPathInfo> explicitPathInfoList = Lists.newLinkedList();
ExplicitPathInfo obj = new ExplicitPathInfo(ExplicitPathInfo.Type.LOOSE, D2.deviceId());
explicitPathInfoList.add(obj);
PcePath path = DefaultPcePath.builder()
.source(src)
.destination(dst)
......@@ -138,7 +105,6 @@ public class DefaultPcePathTest {
.name(name)
.costConstraint(cost)
.bandwidthConstraint(bandwidth)
.explicitPathInfo(explicitPathInfoList)
.build();
assertThat(path.source(), is(src));
......
......@@ -120,7 +120,7 @@ public class DistributedPceStoreTest {
Constraint bandwidth1 = BandwidthConstraint.of(200, DataRateUnit.BPS);
constraints1.add(bandwidth1);
failedPathInfo1 = new PcePathInfo(src1, dst1, name1, constraints1, lspType1, null);
failedPathInfo1 = new PcePathInfo(src1, dst1, name1, constraints1, lspType1);
// Creates failedPathInfo2
DeviceId src2 = DeviceId.deviceId("foo2");
......@@ -131,7 +131,7 @@ public class DistributedPceStoreTest {
Constraint bandwidth2 = BandwidthConstraint.of(400, DataRateUnit.BPS);
constraints2.add(bandwidth2);
failedPathInfo2 = new PcePathInfo(src2, dst2, name2, constraints2, lspType2, null);
failedPathInfo2 = new PcePathInfo(src2, dst2, name2, constraints2, lspType2);
// Creates failedPathInfo3
DeviceId src3 = DeviceId.deviceId("foo3");
......@@ -142,7 +142,7 @@ public class DistributedPceStoreTest {
Constraint bandwidth3 = BandwidthConstraint.of(500, DataRateUnit.BPS);
constraints3.add(bandwidth3);
failedPathInfo3 = new PcePathInfo(src3, dst3, name3, constraints3, lspType3, null);
failedPathInfo3 = new PcePathInfo(src3, dst3, name3, constraints3, lspType3);
// Creates failedPathInfo4
DeviceId src4 = DeviceId.deviceId("foo4");
......@@ -153,7 +153,7 @@ public class DistributedPceStoreTest {
Constraint bandwidth4 = BandwidthConstraint.of(600, DataRateUnit.BPS);
constraints4.add(bandwidth4);
failedPathInfo4 = new PcePathInfo(src4, dst4, name4, constraints4, lspType4, null);
failedPathInfo4 = new PcePathInfo(src4, dst4, name4, constraints4, lspType4);
}
@After
......
......@@ -53,10 +53,10 @@ public class PcePathInfoTest {
Constraint bandwidth13 = BandwidthConstraint.of(300, DataRateUnit.BPS);
constraints1.add(bandwidth13);
PcePathInfo pathInfo1 = new PcePathInfo(src1, dst1, name1, constraints1, lspType1, null);
PcePathInfo pathInfo1 = new PcePathInfo(src1, dst1, name1, constraints1, lspType1);
// create same object as above object
PcePathInfo samePathInfo1 = new PcePathInfo(src1, dst1, name1, constraints1, lspType1, null);
PcePathInfo samePathInfo1 = new PcePathInfo(src1, dst1, name1, constraints1, lspType1);
// Create different object.
DeviceId src2 = DeviceId.deviceId("foo2");
......@@ -69,7 +69,7 @@ public class PcePathInfoTest {
Constraint bandwidth22 = BandwidthConstraint.of(800, DataRateUnit.BPS);
constraints2.add(bandwidth22);
PcePathInfo pathInfo2 = new PcePathInfo(src2, dst2, name2, constraints2, lspType2, null);
PcePathInfo pathInfo2 = new PcePathInfo(src2, dst2, name2, constraints2, lspType2);
new EqualsTester().addEqualityGroup(pathInfo1, samePathInfo1)
.addEqualityGroup(pathInfo2)
......@@ -93,7 +93,7 @@ public class PcePathInfoTest {
Constraint bandwidth3 = BandwidthConstraint.of(300, DataRateUnit.BPS);
constraints.add(bandwidth3);
PcePathInfo pathInfo = new PcePathInfo(src, dst, name, constraints, lspType, null);
PcePathInfo pathInfo = new PcePathInfo(src, dst, name, constraints, lspType);
assertThat(src, is(pathInfo.src()));
assertThat(dst, is(pathInfo.dst()));
......
......@@ -22,14 +22,13 @@ import java.util.concurrent.ConcurrentMap;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import org.onosproject.incubator.net.tunnel.TunnelId;
import org.onosproject.net.DeviceId;
import org.onosproject.net.resource.ResourceConsumer;
import org.onosproject.pce.pceservice.ExplicitPathInfo;
import org.onosproject.pce.pcestore.PcePathInfo;
import org.onosproject.pce.pcestore.api.PceStore;
......@@ -44,8 +43,8 @@ public class PceStoreAdapter implements PceStore {
// Set of Path info
private Set<PcePathInfo> failedPathInfoSet = new HashSet<>();
// Locally maintain with tunnel name as key and corresponding list of explicit path object
private Map<String, List<ExplicitPathInfo>> tunnelNameExplicitPathInfoMap = new HashMap<>();
// Locally maintain LSRID to device id mapping for better performance.
private Map<String, DeviceId> lsrIdDeviceIdMap = new HashMap<>();
@Override
public boolean existsTunnelInfo(TunnelId tunnelId) {
......@@ -109,15 +108,4 @@ public class PceStoreAdapter implements PceStore {
}
return true;
}
@Override
public boolean tunnelNameExplicitPathInfoMap(String tunnelName, List<ExplicitPathInfo> explicitPathInfo) {
tunnelNameExplicitPathInfoMap.put(tunnelName, explicitPathInfo);
return false;
}
@Override
public List<ExplicitPathInfo> getTunnelNameExplicitPathInfoMap(String tunnelName) {
return tunnelNameExplicitPathInfoMap.get(tunnelName);
}
}
......
......@@ -16,22 +16,9 @@
package org.onosproject.pcerest;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.onosproject.net.Link.State.ACTIVE;
import static org.onosproject.net.Link.Type.DIRECT;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import org.onosproject.codec.CodecContext;
import org.onosproject.codec.JsonCodec;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DefaultLink;
import org.onosproject.net.DeviceId;
import org.onosproject.net.NetworkResource;
import org.onosproject.net.PortNumber;
import org.onosproject.net.provider.ProviderId;
import org.onosproject.pce.pceservice.ExplicitPathInfo;
import org.onosproject.pce.pceservice.PcePath;
import org.onosproject.pce.pceservice.DefaultPcePath;
import org.onosproject.net.intent.constraint.BandwidthConstraint;
......@@ -42,11 +29,6 @@ import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.databind.JsonNode;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
/**
* PCE path json codec.
*/
......@@ -60,13 +42,7 @@ public final class PcePathCodec extends JsonCodec<PcePath> {
private static final String COST = "cost";
private static final String BANDWIDTH = "bandwidth";
private static final String PATH_ID = "pathId";
private static final String EXPLICIT_PATH_INFO = "explicitPathInfo";
private static final String MISSING_MEMBER_MESSAGE = " member is required in pce-path";
public static final String JSON_NOT_NULL = "JsonNode can not be null";
public static final byte SOURCE_DEVICEID_INDEX = 0;
public static final byte SOURCE_PORTNO_INDEX = 1;
public static final byte DESTINATION_DEVICEID_INDEX = 2;
public static final byte DESTINATION_PORTNO_INDEX = 3;
@Override
public PcePath decode(ObjectNode json, CodecContext context) {
......@@ -138,87 +114,9 @@ public final class PcePathCodec extends JsonCodec<PcePath> {
}
}
// Retrieve explicit path info
JsonNode explicitPathInfo = json.get(EXPLICIT_PATH_INFO);
if (explicitPathInfo != null) {
List<ExplicitPathInfo> explicitPathInfoList =
ImmutableList.copyOf(jsonNodeToExplicitPathInfo(explicitPathInfo));
if (explicitPathInfoList != null) {
resultBuilder.explicitPathInfo(explicitPathInfoList);
}
}
return resultBuilder.build();
}
private ExplicitPathInfo createListOfExplicitPathObj(JsonNode node) {
int explicitPathType = Integer.parseInt(node.get("type").asText());
DeviceId deviceId;
PortNumber portNo;
NetworkResource res;
LinkedList<ExplicitPathInfo> list = Lists.newLinkedList();
if ((explicitPathType < 0) || (explicitPathType > 1)) {
return null;
}
ExplicitPathInfo.Type type = ExplicitPathInfo.Type.values()[explicitPathType];
String subType = node.get("subtype").asText();
if (Integer.parseInt(subType) == 0) {
res = DeviceId.deviceId(node.get("value").asText());
} else if (Integer.parseInt(subType) == 1) {
String[] splitted = node.get("value").asText().split("/");
if (splitted[SOURCE_DEVICEID_INDEX] != null
&& splitted[SOURCE_PORTNO_INDEX] != null
&& splitted[DESTINATION_DEVICEID_INDEX] != null
&& splitted[DESTINATION_PORTNO_INDEX] != null) {
return null;
}
deviceId = DeviceId.deviceId(splitted[SOURCE_DEVICEID_INDEX]);
portNo = PortNumber.portNumber(splitted[SOURCE_PORTNO_INDEX]);
ConnectPoint cpSrc = new ConnectPoint(deviceId, portNo);
deviceId = DeviceId.deviceId(splitted[DESTINATION_DEVICEID_INDEX]);
portNo = PortNumber.portNumber(splitted[DESTINATION_PORTNO_INDEX]);
ConnectPoint cpDst = new ConnectPoint(deviceId, portNo);
res = DefaultLink.builder()
.providerId(ProviderId.NONE)
.src(cpSrc)
.dst(cpDst)
.type(DIRECT)
.state(ACTIVE)
.build();
} else {
return null;
}
return new ExplicitPathInfo(type, res);
}
private Collection<ExplicitPathInfo> jsonNodeToExplicitPathInfo(JsonNode explicitPathInfo) {
checkNotNull(explicitPathInfo, JSON_NOT_NULL);
Integer i = 0;
NetworkResource res;
LinkedList<ExplicitPathInfo> list = Lists.newLinkedList();
if (explicitPathInfo.isArray()) {
for (JsonNode node : explicitPathInfo) {
ExplicitPathInfo obj = createListOfExplicitPathObj(node);
if (obj == null) {
return null;
}
list.add(obj);
}
} else {
ExplicitPathInfo obj = createListOfExplicitPathObj(explicitPathInfo);
if (obj == null) {
return null;
}
list.add(obj);
}
return Collections.unmodifiableCollection(list);
}
@Override
public ObjectNode encode(PcePath path, CodecContext context) {
checkNotNull(path, "path output cannot be null");
......@@ -235,18 +133,6 @@ public final class PcePathCodec extends JsonCodec<PcePath> {
.put(COST, ((CostConstraint) path.costConstraint()).type().type())
.put(BANDWIDTH, ((BandwidthConstraint) path.bandwidthConstraint()).bandwidth().bps());
if (path.explicitPathInfo() != null && !path.explicitPathInfo().isEmpty()) {
ArrayNode arrayNode = context.mapper().createArrayNode();
for (ExplicitPathInfo e : path.explicitPathInfo()) {
ObjectNode node = context.mapper()
.createObjectNode()
.put("type", e.type().toString())
.put("value", e.value().toString());
arrayNode.add(node);
}
result.set(EXPLICIT_PATH_INFO, arrayNode);
}
result.set(CONSTRAINT, constraintNode);
return result;
}
......
......@@ -35,13 +35,11 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import com.google.common.collect.ImmutableList;
import org.onosproject.incubator.net.tunnel.Tunnel;
import org.onosproject.incubator.net.tunnel.TunnelId;
import org.onosproject.incubator.net.tunnel.TunnelService;
import org.onosproject.net.DeviceId;
import org.onosproject.net.intent.Constraint;
import org.onosproject.pce.pceservice.ExplicitPathInfo;
import org.onosproject.pce.pceservice.api.PceService;
import org.onosproject.pce.pceservice.PcePath;
import org.onosproject.pce.pceservice.DefaultPcePath;
......@@ -152,14 +150,8 @@ public class PcePathWebResource extends AbstractWebResource {
// Add cost
listConstrnt.add(path.costConstraint());
List<ExplicitPathInfo> explicitPathInfoList = null;
if (explicitPathInfoList != null) {
explicitPathInfoList = ImmutableList.copyOf(path.explicitPathInfo());
}
Boolean issuccess = nullIsNotFound(get(PceService.class)
.setupPath(srcDevice, dstDevice, path.name(), listConstrnt,
lspType, explicitPathInfoList),
.setupPath(srcDevice, dstDevice, path.name(), listConstrnt, lspType),
PCE_SETUP_PATH_FAILED);
return Response.status(OK).entity(issuccess.toString()).build();
} catch (IOException e) {
......
......@@ -64,7 +64,6 @@ import org.onosproject.net.DeviceId;
import org.onosproject.net.Link;
import org.onosproject.pce.pceservice.api.PceService;
import org.onosproject.pce.pceservice.PcepAnnotationKeys;
import org.onosproject.pce.pcestore.api.PceStore;
import org.onosproject.net.Path;
import org.onosproject.net.PortNumber;
import org.onosproject.net.provider.ProviderId;
......@@ -74,7 +73,6 @@ import org.onosproject.net.provider.ProviderId;
*/
public class PcePathResourceTest extends PceResourceTest {
private final PceService pceService = createMock(PceService.class);
private final PceStore pceStore = createMock(PceStore.class);
private final TunnelService tunnelService = createMock(TunnelService.class);
private final TunnelEndPoint src = IpTunnelEndPoint.ipTunnelPoint(IpAddress.valueOf(23423));
private final TunnelEndPoint dst = IpTunnelEndPoint.ipTunnelPoint(IpAddress.valueOf(32421));
......@@ -104,7 +102,6 @@ public class PcePathResourceTest extends PceResourceTest {
MockPceCodecContext context = new MockPceCodecContext();
ServiceDirectory testDirectory = new TestServiceDirectory().add(PceService.class, pceService)
.add(TunnelService.class, tunnelService)
.add(PceStore.class, pceStore)
.add(CodecService.class, context.codecManager());
BaseResource.setServiceDirectory(testDirectory);
......@@ -236,7 +233,7 @@ public class PcePathResourceTest extends PceResourceTest {
*/
@Test
public void testPost() {
expect(pceService.setupPath(anyObject(), anyObject(), anyObject(), anyObject(), anyObject(), anyObject()))
expect(pceService.setupPath(anyObject(), anyObject(), anyObject(), anyObject(), anyObject()))
.andReturn(true)
.anyTimes();
replay(pceService);
......
......@@ -7,10 +7,5 @@
"constraint":
{ "cost":2,
"bandwidth":200.0
},
"explicitPathInfo" :
{"type":1,
"subtype":0,
"value":"11.0.0.2"
}
}
}
......
{"path": {"source":"11.0.0.1",
"destination":"11.0.0.2",
"pathType":"0",
"name":"rsvp11",
"pathType":"2",
"name":"pcc2",
"description":"path-create",
"constraint":
{"cost":1,
"bandwidth":300
},
"explicitPathInfo" :
{"type":1,
"subtype":0,
"value":"11.0.0.2"
{"cost":2,
"bandwidth":200.0
}
}
}
......
......@@ -507,9 +507,7 @@ public class PceWebTopovMessageHandler extends UiMessageHandler {
break;
}
//TODO: need to get explicit paths [temporarily using null as the value]
path = pceService.setupPath((DeviceId) src, (DeviceId) dst, tunnelName, listConstrnt, lspTypeVal,
null);
path = pceService.setupPath((DeviceId) src, (DeviceId) dst, tunnelName, listConstrnt, lspTypeVal);
if (!path) {
log.error("setup path is failed");
return;
......