홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sho SHIMIZU
Committed by Gerrit Code Review
2581e189 1 parent 1c0ea1a1

Remove constructor deprecated in Cardinal 

Change-Id: I116c96373cbbf2d12770d7146d984d307d2859a4
Inline Side-by-side
Showing 4 changed files with 4 additions and 21 deletions
...@@ -50,23 +50,6 @@ public class DefaultGraphDescription extends AbstractDescription ...@@ -50,23 +50,6 @@ public class DefaultGraphDescription extends AbstractDescription
50 * and process the topology graph. 50 * and process the topology graph.
51 * 51 *
52 * @param nanos time in nanos of when the topology description was created 52 * @param nanos time in nanos of when the topology description was created
53 - * @param devices collection of infrastructure devices
54 - * @param links collection of infrastructure links
55 - * @param annotations optional key/value annotations map
56 - * @deprecated in Cardinal Release
57 - */
58 - @Deprecated
59 - public DefaultGraphDescription(long nanos, Iterable<Device> devices,
60 - Iterable<Link> links,
61 - SparseAnnotations... annotations) {
62 - this(nanos, System.currentTimeMillis(), devices, links, annotations);
63 - }
64 -
65 - /**
66 - * Creates a minimal topology graph description to allow core to construct
67 - * and process the topology graph.
68 - *
69 - * @param nanos time in nanos of when the topology description was created
70 * @param millis time in millis of when the topology description was created 53 * @param millis time in millis of when the topology description was created
71 * @param devices collection of infrastructure devices 54 * @param devices collection of infrastructure devices
72 * @param links collection of infrastructure links 55 * @param links collection of infrastructure links
......
...@@ -41,7 +41,7 @@ public class DefaultGraphDescriptionTest { ...@@ -41,7 +41,7 @@ public class DefaultGraphDescriptionTest {
41 @Test 41 @Test
42 public void basics() { 42 public void basics() {
43 DefaultGraphDescription desc = 43 DefaultGraphDescription desc =
44 - new DefaultGraphDescription(4321L, ImmutableSet.of(DEV1, DEV2, DEV3), 44 + new DefaultGraphDescription(4321L, System.currentTimeMillis(), ImmutableSet.of(DEV1, DEV2, DEV3),
45 ImmutableSet.of(L1, L2)); 45 ImmutableSet.of(L1, L2));
46 assertEquals("incorrect time", 4321L, desc.timestamp()); 46 assertEquals("incorrect time", 4321L, desc.timestamp());
47 assertEquals("incorrect vertex count", 3, desc.vertexes().size()); 47 assertEquals("incorrect vertex count", 3, desc.vertexes().size());
...@@ -50,7 +50,7 @@ public class DefaultGraphDescriptionTest { ...@@ -50,7 +50,7 @@ public class DefaultGraphDescriptionTest {
50 50
51 @Test 51 @Test
52 public void missingVertex() { 52 public void missingVertex() {
53 - GraphDescription desc = new DefaultGraphDescription(4321L, 53 + GraphDescription desc = new DefaultGraphDescription(4321L, System.currentTimeMillis(),
54 ImmutableSet.of(DEV1, DEV3), 54 ImmutableSet.of(DEV1, DEV3),
55 ImmutableSet.of(L1, L2)); 55 ImmutableSet.of(L1, L2));
56 assertEquals("incorrect time", 4321L, desc.timestamp()); 56 assertEquals("incorrect time", 4321L, desc.timestamp());
......
...@@ -73,7 +73,7 @@ public class DefaultTopologyTest { ...@@ -73,7 +73,7 @@ public class DefaultTopologyTest {
73 link("1", 3, "4", 3), link("4", 3, "1", 3), 73 link("1", 3, "4", 3), link("4", 3, "1", 3),
74 link("3", 4, "4", 4), link("4", 4, "3", 4)); 74 link("3", 4, "4", 4), link("4", 4, "3", 4));
75 GraphDescription graphDescription = 75 GraphDescription graphDescription =
76 - new DefaultGraphDescription(now, devices, links); 76 + new DefaultGraphDescription(now, System.currentTimeMillis(), devices, links);
77 77
78 dt = new DefaultTopology(PID, graphDescription); 78 dt = new DefaultTopology(PID, graphDescription);
79 assertEquals("incorrect supplier", PID, dt.providerId()); 79 assertEquals("incorrect supplier", PID, dt.providerId());
......
...@@ -114,7 +114,7 @@ public class TopologyManagerTest { ...@@ -114,7 +114,7 @@ public class TopologyManagerTest {
114 link("c", 2, "d", 1), link("d", 1, "c", 2), 114 link("c", 2, "d", 1), link("d", 1, "c", 2),
115 link("d", 2, "a", 2), link("a", 2, "d", 2), 115 link("d", 2, "a", 2), link("a", 2, "d", 2),
116 link("e", 1, "f", 1), link("f", 1, "e", 1)); 116 link("e", 1, "f", 1), link("f", 1, "e", 1));
117 - GraphDescription data = new DefaultGraphDescription(4321L, devices, links); 117 + GraphDescription data = new DefaultGraphDescription(4321L, System.currentTimeMillis(), devices, links);
118 providerService.topologyChanged(data, null); 118 providerService.topologyChanged(data, null);
119 } 119 }
120 120
......