[ONOS-4164] todo removal
Change-Id: Iaed7a5d2960529ecd548897b546a8804bbc9da27
diff --git a/apps/pce/app/src/test/java/org/onosproject/pce/pceservice/DefaultPcePathTest.java b/apps/pce/app/src/test/java/org/onosproject/pce/pceservice/DefaultPcePathTest.java
index 2f5347d..b8134ef 100644
--- a/apps/pce/app/src/test/java/org/onosproject/pce/pceservice/DefaultPcePathTest.java
+++ b/apps/pce/app/src/test/java/org/onosproject/pce/pceservice/DefaultPcePathTest.java
@@ -21,7 +21,11 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
+import com.google.common.testing.EqualsTester;
+
import org.onosproject.incubator.net.tunnel.TunnelId;
+import org.onosproject.pce.pceservice.constraint.CostConstraint;
+import org.onosproject.net.intent.constraint.BandwidthConstraint;
/**
* Unit tests for DefaultPcePath class.
@@ -78,8 +82,8 @@
.bandwidthConstraint(bandwidth2)
.build();
path2.id(TunnelId.valueOf("2"));
- //TODO: will be uncommented below line once CostConstraint and LocalBandwidthConstraint classes are ready
- //new EqualsTester().addEqualityGroup(path1, samePath1).addEqualityGroup(path2).testEquals();
+
+ new EqualsTester().addEqualityGroup(path1, samePath1).addEqualityGroup(path2).testEquals();
}
/**
@@ -91,7 +95,7 @@
final String bandwidth = "600";
final String src = "indiatimes";
final String dst = "deccan";
- final String type = "3";
+ final String type = "2";
final String name = "pcc4";
PcePath path = DefaultPcePath.builder()
@@ -103,12 +107,14 @@
.bandwidthConstraint(bandwidth)
.build();
- assertThat(src, is(path.source()));
- assertThat(dst, is(path.destination()));
- assertThat(LspType.WITHOUT_SIGNALLING_AND_WITHOUT_SR, is(path.lspType()));
- assertThat(name, is(path.name()));
- //TODO: will be uncommented below lines once CostConstraint and LocalBandwidthConstraint classes are ready
- //assertThat(cost, is(path.costConstraint().toString()));
- //assertThat(bandwidth, is(path.bandwidthConstraint().toString()));
+ assertThat(path.source(), is(src));
+ assertThat(path.destination(), is(dst));
+ assertThat(path.lspType(), is(LspType.WITHOUT_SIGNALLING_AND_WITHOUT_SR));
+ assertThat(path.name(), is(name));
+ CostConstraint costConstExpected = CostConstraint.of(CostConstraint.Type.values()[Integer.valueOf(cost) - 1]);
+ CostConstraint costConstActual = (CostConstraint) path.costConstraint();
+ assertThat(costConstActual.type(), is(costConstExpected.type()));
+ BandwidthConstraint bandwidthActual = (BandwidthConstraint) path.bandwidthConstraint();
+ assertThat(bandwidthActual.bandwidth().bps(), is(Double.valueOf(bandwidth)));
}
}
diff --git a/apps/pce/app/src/test/java/org/onosproject/pce/rest/MockPceCodecContext.java b/apps/pce/app/src/test/java/org/onosproject/pce/rest/MockPceCodecContext.java
index 7bced15..f4704de 100644
--- a/apps/pce/app/src/test/java/org/onosproject/pce/rest/MockPceCodecContext.java
+++ b/apps/pce/app/src/test/java/org/onosproject/pce/rest/MockPceCodecContext.java
@@ -48,7 +48,6 @@
@SuppressWarnings("unchecked")
@Override
public <T> T getService(Class<T> serviceClass) {
- // TODO
return null;
}
diff --git a/apps/pce/app/src/test/java/org/onosproject/pce/rest/PcePathCodecTest.java b/apps/pce/app/src/test/java/org/onosproject/pce/rest/PcePathCodecTest.java
index 022058d..9f970d3 100644
--- a/apps/pce/app/src/test/java/org/onosproject/pce/rest/PcePathCodecTest.java
+++ b/apps/pce/app/src/test/java/org/onosproject/pce/rest/PcePathCodecTest.java
@@ -24,8 +24,13 @@
import org.junit.Before;
import org.junit.Test;
+
+import org.onlab.util.DataRateUnit;
import org.onosproject.codec.JsonCodec;
import org.onosproject.pce.pceservice.PcePath;
+import org.onosproject.net.intent.constraint.BandwidthConstraint;
+import org.onosproject.net.intent.Constraint;
+import org.onosproject.pce.pceservice.constraint.CostConstraint;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -80,9 +85,15 @@
assertThat(pcePath.source().toString(), is("11.0.0.1"));
assertThat(pcePath.destination(), is("11.0.0.2"));
- assertThat(pcePath.lspType().toString(), is("SR_WITHOUT_SIGNALLING"));
- //TODO: uncomment below lines once CostConstraint and LocalBandwidthConstraint are ready
- //assertThat(pcePath.costConstraint().toString(), is(2));
- //assertThat(pcePath.bandwidthConstraint().toString(), is(200.0));
+ assertThat(pcePath.lspType().toString(), is("WITHOUT_SIGNALLING_AND_WITHOUT_SR"));
+ // testing cost type
+ String cost = "2";
+ Constraint costConstraint = CostConstraint.of(CostConstraint.Type.values()[Integer.valueOf(cost) - 1]);
+ assertThat(pcePath.costConstraint(), is(costConstraint));
+ // testing bandwidth
+ String bandwidth = "200";
+ Constraint bandwidthConstraint = BandwidthConstraint.of(Double.valueOf(bandwidth), DataRateUnit
+ .valueOf("BPS"));
+ assertThat(pcePath.bandwidthConstraint(), is(bandwidthConstraint));
}
}
diff --git a/apps/pce/app/src/test/java/org/onosproject/pce/rest/PcePathResourceTest.java b/apps/pce/app/src/test/java/org/onosproject/pce/rest/PcePathResourceTest.java
index d4c79f0..e287c32 100644
--- a/apps/pce/app/src/test/java/org/onosproject/pce/rest/PcePathResourceTest.java
+++ b/apps/pce/app/src/test/java/org/onosproject/pce/rest/PcePathResourceTest.java
@@ -21,15 +21,14 @@
import static org.easymock.EasyMock.replay;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
-//TODO: below imports needs to be uncommented once TODO in DefaultPcePath class are removed
-//import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import static org.onosproject.net.Link.Type.DIRECT;
-//import com.eclipsesource.json.Json;
-//import com.eclipsesource.json.JsonObject;
+import com.eclipsesource.json.Json;
+import com.eclipsesource.json.JsonObject;
import java.io.InputStream;
import java.net.HttpURLConnection;
@@ -64,6 +63,7 @@
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.net.Path;
import org.onosproject.net.PortNumber;
import org.onosproject.net.provider.ProviderId;
@@ -158,10 +158,16 @@
// Path
path = new DefaultPath(providerId, linkList, 10);
+ // Annotations
+ DefaultAnnotations.Builder builderAnn = DefaultAnnotations.builder();
+ builderAnn.set(PcepAnnotationKeys.LSP_SIG_TYPE, "2");
+ builderAnn.set(PcepAnnotationKeys.COST_TYPE, "2");
+ builderAnn.set(PcepAnnotationKeys.BANDWIDTH, "200");
+
// Tunnel
tunnel = new DefaultTunnel(producerName, src, dst, Tunnel.Type.VXLAN,
Tunnel.State.ACTIVE, groupId, tunnelId,
- tunnelName, path);
+ tunnelName, path, builderAnn.build());
}
/**
@@ -190,16 +196,15 @@
*/
@Test
public void testGetTunnelId() {
- //TODO: uncomment below lines once TODO in DefaultPcePath class are removed
- //expect(pceService.queryPath(anyObject()))
- // .andReturn(tunnel)
- // .anyTimes();
- //replay(pceService);
+ expect(pceService.queryPath(anyObject()))
+ .andReturn(tunnel)
+ .anyTimes();
+ replay(pceService);
- //WebTarget wt = target();
- //String response = wt.path("path/1").request().get(String.class);
- //JsonObject result = Json.parse(response).asObject();
- //assertThat(result, notNullValue());
+ WebTarget wt = target();
+ String response = wt.path("path/1").request().get(String.class);
+ JsonObject result = Json.parse(response).asObject();
+ assertThat(result, notNullValue());
}
/**
diff --git a/apps/pce/app/src/test/java/org/onosproject/pce/util/TunnelServiceAdapter.java b/apps/pce/app/src/test/java/org/onosproject/pce/util/TunnelServiceAdapter.java
index 2a75eaf..9de3194 100644
--- a/apps/pce/app/src/test/java/org/onosproject/pce/util/TunnelServiceAdapter.java
+++ b/apps/pce/app/src/test/java/org/onosproject/pce/util/TunnelServiceAdapter.java
@@ -38,121 +38,99 @@
@Override
public void addListener(TunnelListener listener) {
- // TODO Auto-generated method stub
-
}
@Override
public void removeListener(TunnelListener listener) {
- // TODO Auto-generated method stub
-
}
@Override
public Tunnel borrowTunnel(ApplicationId consumerId, TunnelId tunnelId, Annotations... annotations) {
- // TODO Auto-generated method stub
return null;
}
@Override
public Collection<Tunnel> borrowTunnel(ApplicationId consumerId, TunnelName tunnelName,
Annotations... annotations) {
- // TODO Auto-generated method stub
return null;
}
@Override
public Collection<Tunnel> borrowTunnel(ApplicationId consumerId, TunnelEndPoint src, TunnelEndPoint dst,
Annotations... annotations) {
- // TODO Auto-generated method stub
return null;
}
@Override
public Collection<Tunnel> borrowTunnel(ApplicationId consumerId, TunnelEndPoint src, TunnelEndPoint dst, Type type,
Annotations... annotations) {
- // TODO Auto-generated method stub
return null;
}
@Override
public TunnelId setupTunnel(ApplicationId producerId, ElementId srcElementId, Tunnel tunnel, Path path) {
- // TODO Auto-generated method stub
return null;
}
@Override
public boolean downTunnel(ApplicationId producerId, TunnelId tunnelId) {
- // TODO Auto-generated method stub
return false;
}
@Override
public boolean returnTunnel(ApplicationId consumerId, TunnelId tunnelId, Annotations... annotations) {
- // TODO Auto-generated method stub
return false;
}
@Override
public boolean returnTunnel(ApplicationId consumerId, TunnelName tunnelName, Annotations... annotations) {
- // TODO Auto-generated method stub
return false;
}
@Override
public boolean returnTunnel(ApplicationId consumerId, TunnelEndPoint src, TunnelEndPoint dst, Type type,
Annotations... annotations) {
- // TODO Auto-generated method stub
return false;
}
@Override
public boolean returnTunnel(ApplicationId consumerId, TunnelEndPoint src, TunnelEndPoint dst,
Annotations... annotations) {
- // TODO Auto-generated method stub
return false;
}
@Override
public Tunnel queryTunnel(TunnelId tunnelId) {
- // TODO Auto-generated method stub
return null;
}
@Override
public Collection<TunnelSubscription> queryTunnelSubscription(ApplicationId consumerId) {
- // TODO Auto-generated method stub
return null;
}
@Override
public Collection<Tunnel> queryTunnel(Type type) {
- // TODO Auto-generated method stub
return null;
}
@Override
public Collection<Tunnel> queryTunnel(TunnelEndPoint src, TunnelEndPoint dst) {
- // TODO Auto-generated method stub
return null;
}
@Override
public Collection<Tunnel> queryAllTunnels() {
- // TODO Auto-generated method stub
return null;
}
@Override
public int tunnelCount() {
- // TODO Auto-generated method stub
return 0;
}
@Override
public Iterable<Tunnel> getTunnels(DeviceId deviceId) {
- // TODO Auto-generated method stub
return null;
}
-
}