Thomas Vachuska | 4f1a60c | 2014-10-28 13:39:07 -0700 | [diff] [blame] | 1 | /* |
Ray Milkey | 34c9590 | 2015-04-15 09:47:53 -0700 | [diff] [blame] | 2 | * Copyright 2014-2015 Open Networking Laboratory |
Thomas Vachuska | 4f1a60c | 2014-10-28 13:39:07 -0700 | [diff] [blame] | 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
Brian O'Connor | abafb50 | 2014-12-02 22:26:20 -0800 | [diff] [blame] | 16 | package org.onosproject.net.device.impl; |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 17 | |
Thomas Vachuska | 42e8cce | 2015-07-29 19:25:18 -0700 | [diff] [blame] | 18 | import com.google.common.collect.Sets; |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 19 | import org.junit.After; |
| 20 | import org.junit.Before; |
| 21 | import org.junit.Test; |
Ray Milkey | cc53abd | 2015-02-19 12:31:33 -0800 | [diff] [blame] | 22 | import org.onlab.packet.ChassisId; |
| 23 | import org.onlab.packet.IpAddress; |
| 24 | import org.onosproject.cluster.ClusterServiceAdapter; |
Brian O'Connor | abafb50 | 2014-12-02 22:26:20 -0800 | [diff] [blame] | 25 | import org.onosproject.cluster.ControllerNode; |
| 26 | import org.onosproject.cluster.DefaultControllerNode; |
| 27 | import org.onosproject.cluster.NodeId; |
Thomas Vachuska | 36002e6 | 2015-05-19 16:12:29 -0700 | [diff] [blame] | 28 | import org.onosproject.common.event.impl.TestEventDispatcher; |
Thomas Vachuska | 42e8cce | 2015-07-29 19:25:18 -0700 | [diff] [blame] | 29 | import org.onosproject.event.Event; |
Sahil Lele | 3a0cdd5 | 2015-07-21 14:16:31 -0700 | [diff] [blame] | 30 | import org.onosproject.incubator.net.config.NetworkConfigServiceAdapter; |
Brian O'Connor | abafb50 | 2014-12-02 22:26:20 -0800 | [diff] [blame] | 31 | import org.onosproject.mastership.MastershipServiceAdapter; |
| 32 | import org.onosproject.mastership.MastershipTerm; |
| 33 | import org.onosproject.mastership.MastershipTermService; |
| 34 | import org.onosproject.net.Device; |
| 35 | import org.onosproject.net.DeviceId; |
| 36 | import org.onosproject.net.MastershipRole; |
| 37 | import org.onosproject.net.Port; |
| 38 | import org.onosproject.net.PortNumber; |
| 39 | import org.onosproject.net.device.DefaultDeviceDescription; |
| 40 | import org.onosproject.net.device.DefaultPortDescription; |
| 41 | import org.onosproject.net.device.DeviceAdminService; |
Brian O'Connor | abafb50 | 2014-12-02 22:26:20 -0800 | [diff] [blame] | 42 | import org.onosproject.net.device.DeviceDescription; |
| 43 | import org.onosproject.net.device.DeviceEvent; |
| 44 | import org.onosproject.net.device.DeviceListener; |
| 45 | import org.onosproject.net.device.DeviceProvider; |
| 46 | import org.onosproject.net.device.DeviceProviderRegistry; |
| 47 | import org.onosproject.net.device.DeviceProviderService; |
| 48 | import org.onosproject.net.device.DeviceService; |
| 49 | import org.onosproject.net.device.PortDescription; |
| 50 | import org.onosproject.net.provider.AbstractProvider; |
| 51 | import org.onosproject.net.provider.ProviderId; |
Thomas Vachuska | c97aa61 | 2015-06-23 16:00:18 -0700 | [diff] [blame] | 52 | import org.onosproject.store.trivial.SimpleDeviceStore; |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 53 | |
Thomas Vachuska | 42e8cce | 2015-07-29 19:25:18 -0700 | [diff] [blame] | 54 | import java.util.ArrayList; |
| 55 | import java.util.Iterator; |
| 56 | import java.util.List; |
| 57 | import java.util.Set; |
| 58 | import java.util.concurrent.CompletableFuture; |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 59 | |
Thomas Vachuska | 42e8cce | 2015-07-29 19:25:18 -0700 | [diff] [blame] | 60 | import static org.junit.Assert.*; |
Brian O'Connor | abafb50 | 2014-12-02 22:26:20 -0800 | [diff] [blame] | 61 | import static org.onosproject.net.Device.Type.SWITCH; |
| 62 | import static org.onosproject.net.DeviceId.deviceId; |
Thomas Vachuska | 42e8cce | 2015-07-29 19:25:18 -0700 | [diff] [blame] | 63 | import static org.onosproject.net.NetTestTools.injectEventDispatcher; |
| 64 | import static org.onosproject.net.device.DeviceEvent.Type.*; |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 65 | |
| 66 | /** |
| 67 | * Test codifying the device service & device provider service contracts. |
| 68 | */ |
tom | 41a2c5f | 2014-09-19 09:20:35 -0700 | [diff] [blame] | 69 | public class DeviceManagerTest { |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 70 | |
tom | 7e02cda | 2014-09-18 12:05:46 -0700 | [diff] [blame] | 71 | private static final ProviderId PID = new ProviderId("of", "foo"); |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 72 | private static final DeviceId DID1 = deviceId("of:foo"); |
| 73 | private static final DeviceId DID2 = deviceId("of:bar"); |
| 74 | private static final String MFR = "whitebox"; |
| 75 | private static final String HW = "1.1.x"; |
| 76 | private static final String SW1 = "3.8.1"; |
| 77 | private static final String SW2 = "3.9.5"; |
| 78 | private static final String SN = "43311-12345"; |
alshabib | 7911a05 | 2014-10-16 17:49:37 -0700 | [diff] [blame] | 79 | private static final ChassisId CID = new ChassisId(); |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 80 | |
tom | 24c55cd | 2014-09-06 10:47:25 -0700 | [diff] [blame] | 81 | private static final PortNumber P1 = PortNumber.portNumber(1); |
| 82 | private static final PortNumber P2 = PortNumber.portNumber(2); |
| 83 | private static final PortNumber P3 = PortNumber.portNumber(3); |
Yuta HIGUCHI | 33faeaf | 2014-10-07 18:19:44 -0700 | [diff] [blame] | 84 | private static final NodeId NID_LOCAL = new NodeId("local"); |
Pavlin Radoslavov | 444b519 | 2014-10-28 10:45:19 -0700 | [diff] [blame] | 85 | private static final IpAddress LOCALHOST = IpAddress.valueOf("127.0.0.1"); |
tom | 24c55cd | 2014-09-06 10:47:25 -0700 | [diff] [blame] | 86 | |
tom | 41a2c5f | 2014-09-19 09:20:35 -0700 | [diff] [blame] | 87 | private DeviceManager mgr; |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 88 | |
| 89 | protected DeviceService service; |
| 90 | protected DeviceAdminService admin; |
| 91 | protected DeviceProviderRegistry registry; |
| 92 | protected DeviceProviderService providerService; |
| 93 | protected TestProvider provider; |
| 94 | protected TestListener listener = new TestListener(); |
| 95 | |
| 96 | @Before |
| 97 | public void setUp() { |
tom | 41a2c5f | 2014-09-19 09:20:35 -0700 | [diff] [blame] | 98 | mgr = new DeviceManager(); |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 99 | service = mgr; |
| 100 | admin = mgr; |
| 101 | registry = mgr; |
tom | 41a2c5f | 2014-09-19 09:20:35 -0700 | [diff] [blame] | 102 | mgr.store = new SimpleDeviceStore(); |
Thomas Vachuska | 42e8cce | 2015-07-29 19:25:18 -0700 | [diff] [blame] | 103 | injectEventDispatcher(mgr, new TestEventDispatcher()); |
Yuta HIGUCHI | bcac499 | 2014-11-22 19:27:57 -0800 | [diff] [blame] | 104 | TestMastershipManager mastershipManager = new TestMastershipManager(); |
| 105 | mgr.mastershipService = mastershipManager; |
| 106 | mgr.termService = mastershipManager; |
Yuta HIGUCHI | 33faeaf | 2014-10-07 18:19:44 -0700 | [diff] [blame] | 107 | mgr.clusterService = new TestClusterService(); |
Sahil Lele | 3a0cdd5 | 2015-07-21 14:16:31 -0700 | [diff] [blame] | 108 | mgr.networkConfigService = new TestNetworkConfigService(); |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 109 | mgr.activate(); |
| 110 | |
Sahil Lele | 3a0cdd5 | 2015-07-21 14:16:31 -0700 | [diff] [blame] | 111 | |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 112 | service.addListener(listener); |
| 113 | |
| 114 | provider = new TestProvider(); |
| 115 | providerService = registry.register(provider); |
| 116 | assertTrue("provider should be registered", |
| 117 | registry.getProviders().contains(provider.id())); |
| 118 | } |
| 119 | |
| 120 | @After |
| 121 | public void tearDown() { |
| 122 | registry.unregister(provider); |
| 123 | assertFalse("provider should not be registered", |
| 124 | registry.getProviders().contains(provider.id())); |
| 125 | service.removeListener(listener); |
| 126 | mgr.deactivate(); |
| 127 | } |
| 128 | |
| 129 | private void connectDevice(DeviceId deviceId, String swVersion) { |
| 130 | DeviceDescription description = |
| 131 | new DefaultDeviceDescription(deviceId.uri(), SWITCH, MFR, |
alshabib | 7911a05 | 2014-10-16 17:49:37 -0700 | [diff] [blame] | 132 | HW, swVersion, SN, CID); |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 133 | providerService.deviceConnected(deviceId, description); |
| 134 | assertNotNull("device should be found", service.getDevice(DID1)); |
| 135 | } |
| 136 | |
| 137 | @Test |
| 138 | public void deviceConnected() { |
| 139 | assertNull("device should not be found", service.getDevice(DID1)); |
| 140 | connectDevice(DID1, SW1); |
| 141 | validateEvents(DEVICE_ADDED); |
| 142 | |
| 143 | Iterator<Device> it = service.getDevices().iterator(); |
| 144 | assertNotNull("one device expected", it.next()); |
| 145 | assertFalse("only one device expected", it.hasNext()); |
tom | ad2d209 | 2014-09-06 23:24:20 -0700 | [diff] [blame] | 146 | assertEquals("incorrect device count", 1, service.getDeviceCount()); |
tom | ff7eb7c | 2014-09-08 12:49:03 -0700 | [diff] [blame] | 147 | assertTrue("device should be available", service.isAvailable(DID1)); |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 148 | } |
| 149 | |
| 150 | @Test |
| 151 | public void deviceDisconnected() { |
| 152 | connectDevice(DID1, SW1); |
| 153 | connectDevice(DID2, SW1); |
| 154 | validateEvents(DEVICE_ADDED, DEVICE_ADDED); |
tom | ff7eb7c | 2014-09-08 12:49:03 -0700 | [diff] [blame] | 155 | assertTrue("device should be available", service.isAvailable(DID1)); |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 156 | |
| 157 | // Disconnect |
| 158 | providerService.deviceDisconnected(DID1); |
| 159 | assertNotNull("device should not be found", service.getDevice(DID1)); |
tom | ff7eb7c | 2014-09-08 12:49:03 -0700 | [diff] [blame] | 160 | assertFalse("device should not be available", service.isAvailable(DID1)); |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 161 | validateEvents(DEVICE_AVAILABILITY_CHANGED); |
| 162 | |
| 163 | // Reconnect |
| 164 | connectDevice(DID1, SW1); |
| 165 | validateEvents(DEVICE_AVAILABILITY_CHANGED); |
tom | ad2d209 | 2014-09-06 23:24:20 -0700 | [diff] [blame] | 166 | |
| 167 | assertEquals("incorrect device count", 2, service.getDeviceCount()); |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 168 | } |
| 169 | |
| 170 | @Test |
| 171 | public void deviceUpdated() { |
| 172 | connectDevice(DID1, SW1); |
| 173 | validateEvents(DEVICE_ADDED); |
| 174 | |
| 175 | connectDevice(DID1, SW2); |
| 176 | validateEvents(DEVICE_UPDATED); |
| 177 | } |
| 178 | |
| 179 | @Test |
| 180 | public void getRole() { |
| 181 | connectDevice(DID1, SW1); |
tom | 80c0e5e | 2014-09-08 18:08:58 -0700 | [diff] [blame] | 182 | assertEquals("incorrect role", MastershipRole.MASTER, service.getRole(DID1)); |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 183 | } |
| 184 | |
tom | 24c55cd | 2014-09-06 10:47:25 -0700 | [diff] [blame] | 185 | @Test |
| 186 | public void updatePorts() { |
| 187 | connectDevice(DID1, SW1); |
| 188 | List<PortDescription> pds = new ArrayList<>(); |
| 189 | pds.add(new DefaultPortDescription(P1, true)); |
| 190 | pds.add(new DefaultPortDescription(P2, true)); |
| 191 | pds.add(new DefaultPortDescription(P3, true)); |
| 192 | providerService.updatePorts(DID1, pds); |
| 193 | validateEvents(DEVICE_ADDED, PORT_ADDED, PORT_ADDED, PORT_ADDED); |
| 194 | pds.clear(); |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 195 | |
tom | 24c55cd | 2014-09-06 10:47:25 -0700 | [diff] [blame] | 196 | pds.add(new DefaultPortDescription(P1, false)); |
| 197 | pds.add(new DefaultPortDescription(P3, true)); |
| 198 | providerService.updatePorts(DID1, pds); |
| 199 | validateEvents(PORT_UPDATED, PORT_REMOVED); |
| 200 | } |
| 201 | |
| 202 | @Test |
| 203 | public void updatePortStatus() { |
| 204 | connectDevice(DID1, SW1); |
| 205 | List<PortDescription> pds = new ArrayList<>(); |
| 206 | pds.add(new DefaultPortDescription(P1, true)); |
| 207 | pds.add(new DefaultPortDescription(P2, true)); |
| 208 | providerService.updatePorts(DID1, pds); |
| 209 | validateEvents(DEVICE_ADDED, PORT_ADDED, PORT_ADDED); |
| 210 | |
| 211 | providerService.portStatusChanged(DID1, new DefaultPortDescription(P1, false)); |
| 212 | validateEvents(PORT_UPDATED); |
| 213 | providerService.portStatusChanged(DID1, new DefaultPortDescription(P1, false)); |
| 214 | assertTrue("no events expected", listener.events.isEmpty()); |
| 215 | } |
| 216 | |
| 217 | @Test |
| 218 | public void getPorts() { |
| 219 | connectDevice(DID1, SW1); |
| 220 | List<PortDescription> pds = new ArrayList<>(); |
| 221 | pds.add(new DefaultPortDescription(P1, true)); |
| 222 | pds.add(new DefaultPortDescription(P2, true)); |
| 223 | providerService.updatePorts(DID1, pds); |
| 224 | validateEvents(DEVICE_ADDED, PORT_ADDED, PORT_ADDED); |
| 225 | assertEquals("wrong port count", 2, service.getPorts(DID1).size()); |
| 226 | |
| 227 | Port port = service.getPort(DID1, P1); |
| 228 | assertEquals("incorrect port", P1, service.getPort(DID1, P1).number()); |
| 229 | assertEquals("incorrect state", true, service.getPort(DID1, P1).isEnabled()); |
| 230 | } |
| 231 | |
| 232 | @Test |
| 233 | public void removeDevice() { |
| 234 | connectDevice(DID1, SW1); |
| 235 | connectDevice(DID2, SW2); |
tom | ad2d209 | 2014-09-06 23:24:20 -0700 | [diff] [blame] | 236 | assertEquals("incorrect device count", 2, service.getDeviceCount()); |
tom | 24c55cd | 2014-09-06 10:47:25 -0700 | [diff] [blame] | 237 | admin.removeDevice(DID1); |
| 238 | assertNull("device should not be found", service.getDevice(DID1)); |
| 239 | assertNotNull("device should be found", service.getDevice(DID2)); |
tom | ad2d209 | 2014-09-06 23:24:20 -0700 | [diff] [blame] | 240 | assertEquals("incorrect device count", 1, service.getDeviceCount()); |
| 241 | |
tom | 24c55cd | 2014-09-06 10:47:25 -0700 | [diff] [blame] | 242 | } |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 243 | |
| 244 | protected void validateEvents(Enum... types) { |
| 245 | int i = 0; |
| 246 | assertEquals("wrong events received", types.length, listener.events.size()); |
| 247 | for (Event event : listener.events) { |
| 248 | assertEquals("incorrect event type", types[i], event.type()); |
| 249 | i++; |
| 250 | } |
| 251 | listener.events.clear(); |
| 252 | } |
| 253 | |
| 254 | |
| 255 | private class TestProvider extends AbstractProvider implements DeviceProvider { |
Yuta HIGUCHI | 5481532 | 2014-10-31 23:17:08 -0700 | [diff] [blame] | 256 | private DeviceId deviceReceived; |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 257 | private MastershipRole roleReceived; |
| 258 | |
| 259 | public TestProvider() { |
| 260 | super(PID); |
| 261 | } |
| 262 | |
| 263 | @Override |
Ayaka Koshibe | 78bcbc1 | 2014-11-19 14:28:58 -0800 | [diff] [blame] | 264 | public void triggerProbe(DeviceId deviceId) { |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 265 | } |
| 266 | |
| 267 | @Override |
Yuta HIGUCHI | 5481532 | 2014-10-31 23:17:08 -0700 | [diff] [blame] | 268 | public void roleChanged(DeviceId device, MastershipRole newRole) { |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 269 | deviceReceived = device; |
| 270 | roleReceived = newRole; |
| 271 | } |
Ayaka Koshibe | e60d452 | 2014-10-28 15:07:00 -0700 | [diff] [blame] | 272 | |
| 273 | @Override |
Yuta HIGUCHI | 5481532 | 2014-10-31 23:17:08 -0700 | [diff] [blame] | 274 | public boolean isReachable(DeviceId device) { |
Ayaka Koshibe | e60d452 | 2014-10-28 15:07:00 -0700 | [diff] [blame] | 275 | return false; |
| 276 | } |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 277 | } |
| 278 | |
| 279 | private static class TestListener implements DeviceListener { |
| 280 | final List<DeviceEvent> events = new ArrayList<>(); |
| 281 | |
| 282 | @Override |
| 283 | public void event(DeviceEvent event) { |
| 284 | events.add(event); |
| 285 | } |
| 286 | } |
| 287 | |
Yuta HIGUCHI | bcac499 | 2014-11-22 19:27:57 -0800 | [diff] [blame] | 288 | private static class TestMastershipManager |
| 289 | extends MastershipServiceAdapter implements MastershipTermService { |
Ayaka Koshibe | a7f044e | 2014-09-23 16:56:20 -0700 | [diff] [blame] | 290 | @Override |
tom | b41d1ac | 2014-09-24 01:51:24 -0700 | [diff] [blame] | 291 | public MastershipRole getLocalRole(DeviceId deviceId) { |
| 292 | return MastershipRole.MASTER; |
Ayaka Koshibe | a7f044e | 2014-09-23 16:56:20 -0700 | [diff] [blame] | 293 | } |
| 294 | |
| 295 | @Override |
| 296 | public Set<DeviceId> getDevicesOf(NodeId nodeId) { |
| 297 | return Sets.newHashSet(DID1, DID2); |
| 298 | } |
| 299 | |
| 300 | @Override |
Madan Jampani | de003d9 | 2015-05-11 17:14:20 -0700 | [diff] [blame] | 301 | public CompletableFuture<MastershipRole> requestRoleFor(DeviceId deviceId) { |
| 302 | return CompletableFuture.completedFuture(MastershipRole.MASTER); |
Ayaka Koshibe | a7f044e | 2014-09-23 16:56:20 -0700 | [diff] [blame] | 303 | } |
Yuta HIGUCHI | 33faeaf | 2014-10-07 18:19:44 -0700 | [diff] [blame] | 304 | |
| 305 | @Override |
Madan Jampani | c6e574f | 2015-05-29 13:41:52 -0700 | [diff] [blame] | 306 | public CompletableFuture<Void> relinquishMastership(DeviceId deviceId) { |
| 307 | return CompletableFuture.completedFuture(null); |
| 308 | } |
| 309 | |
| 310 | @Override |
Yuta HIGUCHI | bcac499 | 2014-11-22 19:27:57 -0800 | [diff] [blame] | 311 | public MastershipTerm getMastershipTerm(DeviceId deviceId) { |
| 312 | // FIXME: just returning something not null |
| 313 | return MastershipTerm.of(NID_LOCAL, 1); |
Yuta HIGUCHI | 33faeaf | 2014-10-07 18:19:44 -0700 | [diff] [blame] | 314 | } |
Ayaka Koshibe | a7f044e | 2014-09-23 16:56:20 -0700 | [diff] [blame] | 315 | } |
| 316 | |
Yuta HIGUCHI | 33faeaf | 2014-10-07 18:19:44 -0700 | [diff] [blame] | 317 | // code clone |
Ray Milkey | cc53abd | 2015-02-19 12:31:33 -0800 | [diff] [blame] | 318 | private final class TestClusterService extends ClusterServiceAdapter { |
Yuta HIGUCHI | 33faeaf | 2014-10-07 18:19:44 -0700 | [diff] [blame] | 319 | |
| 320 | ControllerNode local = new DefaultControllerNode(NID_LOCAL, LOCALHOST); |
| 321 | |
| 322 | @Override |
| 323 | public ControllerNode getLocalNode() { |
| 324 | return local; |
| 325 | } |
| 326 | |
Yuta HIGUCHI | 33faeaf | 2014-10-07 18:19:44 -0700 | [diff] [blame] | 327 | } |
| 328 | |
Sahil Lele | 3a0cdd5 | 2015-07-21 14:16:31 -0700 | [diff] [blame] | 329 | private class TestNetworkConfigService extends NetworkConfigServiceAdapter { |
| 330 | } |
tom | e5ec3fd | 2014-09-04 15:18:06 -0700 | [diff] [blame] | 331 | } |