blob: ef7955d8692ee1fea19f71b398aa896827122301 [file] [log] [blame]
Pingpingf5d90932014-10-27 10:50:04 -07001package org.onlab.onos.sdnip;
2
3import static org.easymock.EasyMock.anyObject;
4import static org.easymock.EasyMock.createMock;
5import static org.easymock.EasyMock.expect;
6import static org.easymock.EasyMock.expectLastCall;
7import static org.easymock.EasyMock.replay;
8import static org.easymock.EasyMock.reset;
9import static org.easymock.EasyMock.verify;
Pavlin Radoslavova7243cc2014-11-22 21:38:02 -080010import static org.hamcrest.Matchers.is;
Pingpingf5d90932014-10-27 10:50:04 -070011import static org.junit.Assert.assertEquals;
Jonathan Hartec2df012014-10-23 16:40:24 -070012import static org.junit.Assert.assertFalse;
Pavlin Radoslavova7243cc2014-11-22 21:38:02 -080013import static org.junit.Assert.assertThat;
Pingpingf5d90932014-10-27 10:50:04 -070014import static org.junit.Assert.assertTrue;
15
16import java.util.HashSet;
17import java.util.Set;
18import java.util.concurrent.ConcurrentHashMap;
19
20import org.junit.Before;
21import org.junit.Test;
22import org.onlab.junit.TestUtils;
23import org.onlab.junit.TestUtils.TestUtilsException;
24import org.onlab.onos.core.ApplicationId;
25import org.onlab.onos.net.ConnectPoint;
26import org.onlab.onos.net.DefaultHost;
27import org.onlab.onos.net.DeviceId;
28import org.onlab.onos.net.Host;
29import org.onlab.onos.net.HostId;
30import org.onlab.onos.net.HostLocation;
31import org.onlab.onos.net.PortNumber;
32import org.onlab.onos.net.flow.DefaultTrafficSelector;
33import org.onlab.onos.net.flow.DefaultTrafficTreatment;
34import org.onlab.onos.net.flow.TrafficSelector;
35import org.onlab.onos.net.flow.TrafficTreatment;
36import org.onlab.onos.net.host.HostListener;
37import org.onlab.onos.net.host.HostService;
38import org.onlab.onos.net.host.InterfaceIpAddress;
39import org.onlab.onos.net.intent.Intent;
Pavlin Radoslavova7243cc2014-11-22 21:38:02 -080040import org.onlab.onos.net.intent.IntentOperations;
Pingpingf5d90932014-10-27 10:50:04 -070041import org.onlab.onos.net.intent.IntentService;
Jonathan Hartec2df012014-10-23 16:40:24 -070042import org.onlab.onos.net.intent.IntentState;
Pingpingf5d90932014-10-27 10:50:04 -070043import org.onlab.onos.net.intent.MultiPointToSinglePointIntent;
Brian O'Connor520c0522014-11-23 23:50:47 -080044import org.onlab.onos.net.intent.AbstractIntentTest;
Pingpingf5d90932014-10-27 10:50:04 -070045import org.onlab.onos.net.provider.ProviderId;
46import org.onlab.onos.sdnip.config.Interface;
47import org.onlab.packet.Ethernet;
48import org.onlab.packet.IpAddress;
Pavlin Radoslavov6b570732014-11-06 13:16:45 -080049import org.onlab.packet.Ip4Address;
Pingpingf5d90932014-10-27 10:50:04 -070050import org.onlab.packet.IpPrefix;
Pavlin Radoslavov6b570732014-11-06 13:16:45 -080051import org.onlab.packet.Ip4Prefix;
Pingpingf5d90932014-10-27 10:50:04 -070052import org.onlab.packet.MacAddress;
53import org.onlab.packet.VlanId;
54
55import com.google.common.collect.Sets;
56import com.googlecode.concurrenttrees.radix.node.concrete.DefaultByteArrayNodeFactory;
57import com.googlecode.concurrenttrees.radixinverted.ConcurrentInvertedRadixTree;
58import com.googlecode.concurrenttrees.radixinverted.InvertedRadixTree;
59
60/**
Pavlin Radoslavova071b1e2014-11-17 13:37:57 -080061 * This class tests the intent synchronization function in the
62 * IntentSynchronizer class.
Pingpingf5d90932014-10-27 10:50:04 -070063 */
Brian O'Connor520c0522014-11-23 23:50:47 -080064public class IntentSyncTest extends AbstractIntentTest {
Pingpingf5d90932014-10-27 10:50:04 -070065
66 private InterfaceService interfaceService;
67 private IntentService intentService;
68 private HostService hostService;
69
70 private static final ConnectPoint SW1_ETH1 = new ConnectPoint(
71 DeviceId.deviceId("of:0000000000000001"),
72 PortNumber.portNumber(1));
73
74 private static final ConnectPoint SW2_ETH1 = new ConnectPoint(
75 DeviceId.deviceId("of:0000000000000002"),
76 PortNumber.portNumber(1));
77
78 private static final ConnectPoint SW3_ETH1 = new ConnectPoint(
79 DeviceId.deviceId("of:0000000000000003"),
80 PortNumber.portNumber(1));
81
Pavlin Radoslavova071b1e2014-11-17 13:37:57 -080082 private IntentSynchronizer intentSynchronizer;
Pingpingf5d90932014-10-27 10:50:04 -070083 private Router router;
84
85 private static final ApplicationId APPID = new ApplicationId() {
86 @Override
87 public short id() {
88 return 1;
89 }
90
91 @Override
92 public String name() {
93 return "SDNIP";
94 }
95 };
96
97 @Before
98 public void setUp() throws Exception {
Brian O'Connor520c0522014-11-23 23:50:47 -080099 super.setUp();
Pingpingf5d90932014-10-27 10:50:04 -0700100 setUpInterfaceService();
101 setUpHostService();
102 intentService = createMock(IntentService.class);
103
Pavlin Radoslavova071b1e2014-11-17 13:37:57 -0800104 intentSynchronizer = new IntentSynchronizer(APPID, intentService);
Pavlin Radoslavova7243cc2014-11-22 21:38:02 -0800105 router = new Router(APPID, intentSynchronizer, null, interfaceService,
106 hostService);
Pingpingf5d90932014-10-27 10:50:04 -0700107 }
108
109 /**
110 * Sets up InterfaceService.
111 */
112 private void setUpInterfaceService() {
113
114 interfaceService = createMock(InterfaceService.class);
115
116 Set<Interface> interfaces = Sets.newHashSet();
117
118 Set<InterfaceIpAddress> interfaceIpAddresses1 = Sets.newHashSet();
119 interfaceIpAddresses1.add(new InterfaceIpAddress(
120 IpAddress.valueOf("192.168.10.101"),
121 IpPrefix.valueOf("192.168.10.0/24")));
122 Interface sw1Eth1 = new Interface(SW1_ETH1,
123 interfaceIpAddresses1, MacAddress.valueOf("00:00:00:00:00:01"));
124 interfaces.add(sw1Eth1);
125
126 Set<InterfaceIpAddress> interfaceIpAddresses2 = Sets.newHashSet();
127 interfaceIpAddresses2.add(new InterfaceIpAddress(
128 IpAddress.valueOf("192.168.20.101"),
129 IpPrefix.valueOf("192.168.20.0/24")));
130 Interface sw2Eth1 = new Interface(SW2_ETH1,
131 interfaceIpAddresses2, MacAddress.valueOf("00:00:00:00:00:02"));
132 interfaces.add(sw2Eth1);
133
134 Set<InterfaceIpAddress> interfaceIpAddresses3 = Sets.newHashSet();
135 interfaceIpAddresses3.add(new InterfaceIpAddress(
136 IpAddress.valueOf("192.168.30.101"),
137 IpPrefix.valueOf("192.168.30.0/24")));
138 Interface sw3Eth1 = new Interface(SW3_ETH1,
139 interfaceIpAddresses3, MacAddress.valueOf("00:00:00:00:00:03"));
140 interfaces.add(sw3Eth1);
141
142 expect(interfaceService.getInterface(SW1_ETH1)).andReturn(
143 sw1Eth1).anyTimes();
144 expect(interfaceService.getInterface(SW2_ETH1)).andReturn(
145 sw2Eth1).anyTimes();
146 expect(interfaceService.getInterface(SW3_ETH1)).andReturn(
147 sw3Eth1).anyTimes();
148 expect(interfaceService.getInterfaces()).andReturn(
149 interfaces).anyTimes();
150 replay(interfaceService);
151 }
152
153 /**
154 * Sets up the host service with details of hosts.
155 */
156 private void setUpHostService() {
157 hostService = createMock(HostService.class);
158
159 hostService.addListener(anyObject(HostListener.class));
160 expectLastCall().anyTimes();
161
162 IpAddress host1Address = IpAddress.valueOf("192.168.10.1");
163 Host host1 = new DefaultHost(ProviderId.NONE, HostId.NONE,
164 MacAddress.valueOf("00:00:00:00:00:01"), VlanId.NONE,
165 new HostLocation(SW1_ETH1, 1),
166 Sets.newHashSet(host1Address));
167
168 expect(hostService.getHostsByIp(host1Address))
169 .andReturn(Sets.newHashSet(host1)).anyTimes();
170 hostService.startMonitoringIp(host1Address);
171 expectLastCall().anyTimes();
172
173
174 IpAddress host2Address = IpAddress.valueOf("192.168.20.1");
175 Host host2 = new DefaultHost(ProviderId.NONE, HostId.NONE,
176 MacAddress.valueOf("00:00:00:00:00:02"), VlanId.NONE,
177 new HostLocation(SW2_ETH1, 1),
178 Sets.newHashSet(host2Address));
179
180 expect(hostService.getHostsByIp(host2Address))
181 .andReturn(Sets.newHashSet(host2)).anyTimes();
182 hostService.startMonitoringIp(host2Address);
183 expectLastCall().anyTimes();
184
185
186 IpAddress host3Address = IpAddress.valueOf("192.168.30.1");
187 Host host3 = new DefaultHost(ProviderId.NONE, HostId.NONE,
188 MacAddress.valueOf("00:00:00:00:00:03"), VlanId.NONE,
189 new HostLocation(SW3_ETH1, 1),
190 Sets.newHashSet(host3Address));
191
192 expect(hostService.getHostsByIp(host3Address))
193 .andReturn(Sets.newHashSet(host3)).anyTimes();
194 hostService.startMonitoringIp(host3Address);
195 expectLastCall().anyTimes();
196
197
198 replay(hostService);
199 }
200
201 /**
202 * This method tests the behavior of intent Synchronizer.
203 *
204 * @throws TestUtilsException
205 */
206 @Test
207 public void testIntentSync() throws TestUtilsException {
208
209 //
210 // Construct routes and intents.
211 // This test simulates the following cases during the master change
212 // time interval:
213 // 1. RouteEntry1 did not change and the intent also did not change.
214 // 2. RouteEntry2 was deleted, but the intent was not deleted.
215 // 3. RouteEntry3 was newly added, and the intent was also submitted.
216 // 4. RouteEntry4 was updated to RouteEntry4Update, and the intent was
217 // also updated to a new one.
218 // 5. RouteEntry5 did not change, but its intent id changed.
219 // 6. RouteEntry6 was newly added, but the intent was not submitted.
220 //
221 RouteEntry routeEntry1 = new RouteEntry(
Pavlin Radoslavov6b570732014-11-06 13:16:45 -0800222 Ip4Prefix.valueOf("1.1.1.0/24"),
223 Ip4Address.valueOf("192.168.10.1"));
Pingpingf5d90932014-10-27 10:50:04 -0700224
225 RouteEntry routeEntry2 = new RouteEntry(
Pavlin Radoslavov6b570732014-11-06 13:16:45 -0800226 Ip4Prefix.valueOf("2.2.2.0/24"),
227 Ip4Address.valueOf("192.168.20.1"));
Pingpingf5d90932014-10-27 10:50:04 -0700228
229 RouteEntry routeEntry3 = new RouteEntry(
Pavlin Radoslavov6b570732014-11-06 13:16:45 -0800230 Ip4Prefix.valueOf("3.3.3.0/24"),
231 Ip4Address.valueOf("192.168.30.1"));
Pingpingf5d90932014-10-27 10:50:04 -0700232
233 RouteEntry routeEntry4 = new RouteEntry(
Pavlin Radoslavov6b570732014-11-06 13:16:45 -0800234 Ip4Prefix.valueOf("4.4.4.0/24"),
235 Ip4Address.valueOf("192.168.30.1"));
Pingpingf5d90932014-10-27 10:50:04 -0700236
237 RouteEntry routeEntry4Update = new RouteEntry(
Pavlin Radoslavov6b570732014-11-06 13:16:45 -0800238 Ip4Prefix.valueOf("4.4.4.0/24"),
239 Ip4Address.valueOf("192.168.20.1"));
Pingpingf5d90932014-10-27 10:50:04 -0700240
241 RouteEntry routeEntry5 = new RouteEntry(
Pavlin Radoslavov6b570732014-11-06 13:16:45 -0800242 Ip4Prefix.valueOf("5.5.5.0/24"),
243 Ip4Address.valueOf("192.168.10.1"));
Pingpingf5d90932014-10-27 10:50:04 -0700244
245 RouteEntry routeEntry6 = new RouteEntry(
Pavlin Radoslavov6b570732014-11-06 13:16:45 -0800246 Ip4Prefix.valueOf("6.6.6.0/24"),
247 Ip4Address.valueOf("192.168.10.1"));
Pingpingf5d90932014-10-27 10:50:04 -0700248
Jonathan Hartec2df012014-10-23 16:40:24 -0700249 RouteEntry routeEntry7 = new RouteEntry(
Pavlin Radoslavov6b570732014-11-06 13:16:45 -0800250 Ip4Prefix.valueOf("7.7.7.0/24"),
251 Ip4Address.valueOf("192.168.10.1"));
Jonathan Hartec2df012014-10-23 16:40:24 -0700252
Pingpingf5d90932014-10-27 10:50:04 -0700253 MultiPointToSinglePointIntent intent1 = intentBuilder(
254 routeEntry1.prefix(), "00:00:00:00:00:01", SW1_ETH1);
255 MultiPointToSinglePointIntent intent2 = intentBuilder(
256 routeEntry2.prefix(), "00:00:00:00:00:02", SW2_ETH1);
257 MultiPointToSinglePointIntent intent3 = intentBuilder(
258 routeEntry3.prefix(), "00:00:00:00:00:03", SW3_ETH1);
259 MultiPointToSinglePointIntent intent4 = intentBuilder(
260 routeEntry4.prefix(), "00:00:00:00:00:03", SW3_ETH1);
261 MultiPointToSinglePointIntent intent4Update = intentBuilder(
262 routeEntry4Update.prefix(), "00:00:00:00:00:02", SW2_ETH1);
263 MultiPointToSinglePointIntent intent5 = intentBuilder(
264 routeEntry5.prefix(), "00:00:00:00:00:01", SW1_ETH1);
Jonathan Hartec2df012014-10-23 16:40:24 -0700265 MultiPointToSinglePointIntent intent7 = intentBuilder(
266 routeEntry7.prefix(), "00:00:00:00:00:01", SW1_ETH1);
Pingpingf5d90932014-10-27 10:50:04 -0700267
268 // Compose a intent, which is equal to intent5 but the id is different.
269 MultiPointToSinglePointIntent intent5New =
270 staticIntentBuilder(intent5, routeEntry5, "00:00:00:00:00:01");
Pavlin Radoslavova7243cc2014-11-22 21:38:02 -0800271 assertThat(IntentSynchronizer.IntentKey.equalIntents(
272 intent5, intent5New),
273 is(true));
Jonathan Hartec2df012014-10-23 16:40:24 -0700274 assertFalse(intent5.equals(intent5New));
Pingpingf5d90932014-10-27 10:50:04 -0700275
276 MultiPointToSinglePointIntent intent6 = intentBuilder(
277 routeEntry6.prefix(), "00:00:00:00:00:01", SW1_ETH1);
278
Pavlin Radoslavova7243cc2014-11-22 21:38:02 -0800279 // Set up the bgpRoutes field in Router class and routeIntents fields
280 // in IntentSynchronizer class
Pingpingf5d90932014-10-27 10:50:04 -0700281 InvertedRadixTree<RouteEntry> bgpRoutes =
282 new ConcurrentInvertedRadixTree<>(
283 new DefaultByteArrayNodeFactory());
284 bgpRoutes.put(RouteEntry.createBinaryString(routeEntry1.prefix()),
285 routeEntry1);
286 bgpRoutes.put(RouteEntry.createBinaryString(routeEntry3.prefix()),
287 routeEntry3);
288 bgpRoutes.put(RouteEntry.createBinaryString(routeEntry4Update.prefix()),
289 routeEntry4Update);
290 bgpRoutes.put(RouteEntry.createBinaryString(routeEntry5.prefix()),
291 routeEntry5);
292 bgpRoutes.put(RouteEntry.createBinaryString(routeEntry6.prefix()),
293 routeEntry6);
Jonathan Hartec2df012014-10-23 16:40:24 -0700294 bgpRoutes.put(RouteEntry.createBinaryString(routeEntry7.prefix()),
295 routeEntry7);
Pingpingf5d90932014-10-27 10:50:04 -0700296 TestUtils.setField(router, "bgpRoutes", bgpRoutes);
297
Pavlin Radoslavov6b570732014-11-06 13:16:45 -0800298 ConcurrentHashMap<Ip4Prefix, MultiPointToSinglePointIntent>
Pavlin Radoslavova7243cc2014-11-22 21:38:02 -0800299 routeIntents = new ConcurrentHashMap<>();
300 routeIntents.put(routeEntry1.prefix(), intent1);
301 routeIntents.put(routeEntry3.prefix(), intent3);
302 routeIntents.put(routeEntry4Update.prefix(), intent4Update);
303 routeIntents.put(routeEntry5.prefix(), intent5New);
304 routeIntents.put(routeEntry6.prefix(), intent6);
305 routeIntents.put(routeEntry7.prefix(), intent7);
306 TestUtils.setField(intentSynchronizer, "routeIntents", routeIntents);
Pingpingf5d90932014-10-27 10:50:04 -0700307
308 // Set up expectation
309 reset(intentService);
310 Set<Intent> intents = new HashSet<Intent>();
311 intents.add(intent1);
Jonathan Hartec2df012014-10-23 16:40:24 -0700312 expect(intentService.getIntentState(intent1.id()))
313 .andReturn(IntentState.INSTALLED).anyTimes();
Pingpingf5d90932014-10-27 10:50:04 -0700314 intents.add(intent2);
Jonathan Hartec2df012014-10-23 16:40:24 -0700315 expect(intentService.getIntentState(intent2.id()))
316 .andReturn(IntentState.INSTALLED).anyTimes();
Pingpingf5d90932014-10-27 10:50:04 -0700317 intents.add(intent4);
Jonathan Hartec2df012014-10-23 16:40:24 -0700318 expect(intentService.getIntentState(intent4.id()))
319 .andReturn(IntentState.INSTALLED).anyTimes();
Pingpingf5d90932014-10-27 10:50:04 -0700320 intents.add(intent5);
Jonathan Hartec2df012014-10-23 16:40:24 -0700321 expect(intentService.getIntentState(intent5.id()))
322 .andReturn(IntentState.INSTALLED).anyTimes();
323 intents.add(intent7);
324 expect(intentService.getIntentState(intent7.id()))
325 .andReturn(IntentState.WITHDRAWING).anyTimes();
Pingpingf5d90932014-10-27 10:50:04 -0700326 expect(intentService.getIntents()).andReturn(intents).anyTimes();
327
Pavlin Radoslavova7243cc2014-11-22 21:38:02 -0800328 IntentOperations.Builder builder = IntentOperations.builder();
329 builder.addWithdrawOperation(intent2.id());
330 builder.addWithdrawOperation(intent4.id());
Pavlin Radoslavovdde22ae2014-11-24 11:47:17 -0800331 intentService.execute(TestIntentServiceHelper.eqExceptId(
332 builder.build()));
Pavlin Radoslavova7243cc2014-11-22 21:38:02 -0800333
334 builder = IntentOperations.builder();
335 builder.addSubmitOperation(intent3);
336 builder.addSubmitOperation(intent4Update);
337 builder.addSubmitOperation(intent6);
338 builder.addSubmitOperation(intent7);
Pavlin Radoslavovdde22ae2014-11-24 11:47:17 -0800339 intentService.execute(TestIntentServiceHelper.eqExceptId(
340 builder.build()));
Pingpingf5d90932014-10-27 10:50:04 -0700341 replay(intentService);
342
343 // Start the test
Pavlin Radoslavova071b1e2014-11-17 13:37:57 -0800344 intentSynchronizer.leaderChanged(true);
Pavlin Radoslavova7243cc2014-11-22 21:38:02 -0800345 /*
346 TestUtils.callMethod(intentSynchronizer, "synchronizeIntents",
Pavlin Radoslavova071b1e2014-11-17 13:37:57 -0800347 new Class<?>[] {});
Pavlin Radoslavova7243cc2014-11-22 21:38:02 -0800348 */
349 intentSynchronizer.synchronizeIntents();
Pingpingf5d90932014-10-27 10:50:04 -0700350
351 // Verify
Jonathan Hartec2df012014-10-23 16:40:24 -0700352 assertEquals(router.getRoutes().size(), 6);
Pingpingf5d90932014-10-27 10:50:04 -0700353 assertTrue(router.getRoutes().contains(routeEntry1));
354 assertTrue(router.getRoutes().contains(routeEntry3));
355 assertTrue(router.getRoutes().contains(routeEntry4Update));
356 assertTrue(router.getRoutes().contains(routeEntry5));
357 assertTrue(router.getRoutes().contains(routeEntry6));
358
Pavlin Radoslavova7243cc2014-11-22 21:38:02 -0800359 assertEquals(intentSynchronizer.getRouteIntents().size(), 6);
360 assertTrue(intentSynchronizer.getRouteIntents().contains(intent1));
361 assertTrue(intentSynchronizer.getRouteIntents().contains(intent3));
362 assertTrue(intentSynchronizer.getRouteIntents().contains(intent4Update));
363 assertTrue(intentSynchronizer.getRouteIntents().contains(intent5));
364 assertTrue(intentSynchronizer.getRouteIntents().contains(intent6));
Pingpingf5d90932014-10-27 10:50:04 -0700365
366 verify(intentService);
367 }
368
369 /**
370 * MultiPointToSinglePointIntent builder.
371 *
372 * @param ipPrefix the ipPrefix to match
373 * @param nextHopMacAddress to which the destination MAC address in packet
374 * should be rewritten
375 * @param egressPoint to which packets should be sent
376 * @return the constructed MultiPointToSinglePointIntent
377 */
Pavlin Radoslavov6b570732014-11-06 13:16:45 -0800378 private MultiPointToSinglePointIntent intentBuilder(Ip4Prefix ipPrefix,
Pingpingf5d90932014-10-27 10:50:04 -0700379 String nextHopMacAddress, ConnectPoint egressPoint) {
380
381 TrafficSelector.Builder selectorBuilder =
382 DefaultTrafficSelector.builder();
383 selectorBuilder.matchEthType(Ethernet.TYPE_IPV4).matchIPDst(ipPrefix);
384
385 TrafficTreatment.Builder treatmentBuilder =
386 DefaultTrafficTreatment.builder();
387 treatmentBuilder.setEthDst(MacAddress.valueOf(nextHopMacAddress));
388
389 Set<ConnectPoint> ingressPoints = new HashSet<ConnectPoint>();
390 for (Interface intf : interfaceService.getInterfaces()) {
391 if (!intf.equals(interfaceService.getInterface(egressPoint))) {
392 ConnectPoint srcPort = intf.connectPoint();
393 ingressPoints.add(srcPort);
394 }
395 }
396 MultiPointToSinglePointIntent intent =
397 new MultiPointToSinglePointIntent(APPID,
398 selectorBuilder.build(), treatmentBuilder.build(),
399 ingressPoints, egressPoint);
400 return intent;
401 }
402
403 /**
404 * A static MultiPointToSinglePointIntent builder, the returned intent is
405 * equal to the input intent except that the id is different.
406 *
407 *
408 * @param intent the intent to be used for building a new intent
409 * @param routeEntry the relative routeEntry of the intent
410 * @return the newly constructed MultiPointToSinglePointIntent
411 * @throws TestUtilsException
412 */
413 private MultiPointToSinglePointIntent staticIntentBuilder(
414 MultiPointToSinglePointIntent intent, RouteEntry routeEntry,
415 String nextHopMacAddress) throws TestUtilsException {
416
417 // Use a different egress ConnectPoint with that in intent
418 // to generate a different id
419 MultiPointToSinglePointIntent intentNew = intentBuilder(
420 routeEntry.prefix(), nextHopMacAddress, SW2_ETH1);
421 TestUtils.setField(intentNew, "egressPoint", intent.egressPoint());
422 TestUtils.setField(intentNew,
423 "ingressPoints", intent.ingressPoints());
424 return intentNew;
425 }
Pingpingf5d90932014-10-27 10:50:04 -0700426}