Sho SHIMIZU

Remove unused fields

Change-Id: Ibc305eb392145cf3327ae134a8f338731244265e
...@@ -27,17 +27,12 @@ import org.onosproject.net.DefaultLink; ...@@ -27,17 +27,12 @@ import org.onosproject.net.DefaultLink;
27 import org.onosproject.net.DefaultPath; 27 import org.onosproject.net.DefaultPath;
28 import org.onosproject.net.Link; 28 import org.onosproject.net.Link;
29 import org.onosproject.net.OchSignalType; 29 import org.onosproject.net.OchSignalType;
30 -import org.onosproject.net.flow.DefaultTrafficSelector;
31 -import org.onosproject.net.flow.DefaultTrafficTreatment;
32 import org.onosproject.net.flow.FlowRule; 30 import org.onosproject.net.flow.FlowRule;
33 -import org.onosproject.net.flow.TrafficSelector;
34 -import org.onosproject.net.flow.TrafficTreatment;
35 import org.onosproject.net.intent.FlowRuleIntent; 31 import org.onosproject.net.intent.FlowRuleIntent;
36 import org.onosproject.net.intent.Intent; 32 import org.onosproject.net.intent.Intent;
37 import org.onosproject.net.intent.IntentExtensionService; 33 import org.onosproject.net.intent.IntentExtensionService;
38 import org.onosproject.net.intent.MockIdGenerator; 34 import org.onosproject.net.intent.MockIdGenerator;
39 import org.onosproject.net.intent.OpticalPathIntent; 35 import org.onosproject.net.intent.OpticalPathIntent;
40 -import org.onosproject.net.provider.ProviderId;
41 36
42 import java.util.Arrays; 37 import java.util.Arrays;
43 import java.util.Collection; 38 import java.util.Collection;
...@@ -62,16 +57,11 @@ public class OpticalPathIntentCompilerTest { ...@@ -62,16 +57,11 @@ public class OpticalPathIntentCompilerTest {
62 private final IdGenerator idGenerator = new MockIdGenerator(); 57 private final IdGenerator idGenerator = new MockIdGenerator();
63 private OpticalPathIntentCompiler sut; 58 private OpticalPathIntentCompiler sut;
64 59
65 - private final TrafficSelector selector = DefaultTrafficSelector.builder().build();
66 - private final TrafficTreatment treatment = DefaultTrafficTreatment.builder().build();
67 private final ApplicationId appId = new TestApplicationId("test"); 60 private final ApplicationId appId = new TestApplicationId("test");
68 - private final ProviderId pid = new ProviderId("of", "test");
69 private final ConnectPoint d1p1 = connectPoint("s1", 0); 61 private final ConnectPoint d1p1 = connectPoint("s1", 0);
70 private final ConnectPoint d2p0 = connectPoint("s2", 0); 62 private final ConnectPoint d2p0 = connectPoint("s2", 0);
71 private final ConnectPoint d2p1 = connectPoint("s2", 1); 63 private final ConnectPoint d2p1 = connectPoint("s2", 1);
72 private final ConnectPoint d3p1 = connectPoint("s3", 1); 64 private final ConnectPoint d3p1 = connectPoint("s3", 1);
73 - private final ConnectPoint d3p0 = connectPoint("s3", 10);
74 - private final ConnectPoint d1p0 = connectPoint("s1", 10);
75 65
76 private final List<Link> links = Arrays.asList( 66 private final List<Link> links = Arrays.asList(
77 new DefaultLink(PID, d1p1, d2p0, DIRECT), 67 new DefaultLink(PID, d1p1, d2p0, DIRECT),
......