Hyunsun Moon | e9d7599 | 2015-09-15 22:39:16 -0700 | [diff] [blame] | 1 | /* |
Brian O'Connor | 8e57fd5 | 2016-04-09 01:19:45 -0700 | [diff] [blame] | 2 | * Copyright 2015-present Open Networking Laboratory |
Hyunsun Moon | e9d7599 | 2015-09-15 22:39:16 -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 | */ |
alshabib | b4d3171 | 2016-06-01 18:51:03 -0700 | [diff] [blame] | 16 | package org.opencord.cordvtn.impl; |
Hyunsun Moon | e9d7599 | 2015-09-15 22:39:16 -0700 | [diff] [blame] | 17 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 18 | import com.google.common.collect.ImmutableMap; |
| 19 | import com.google.common.collect.ImmutableSet; |
Hyunsun Moon | 8b530e3 | 2016-02-03 00:11:11 -0800 | [diff] [blame] | 20 | import com.google.common.collect.Lists; |
Hyunsun Moon | b5f92e5 | 2016-02-17 15:02:06 -0800 | [diff] [blame] | 21 | import com.google.common.collect.Maps; |
Hyunsun Moon | e9d7599 | 2015-09-15 22:39:16 -0700 | [diff] [blame] | 22 | import org.apache.felix.scr.annotations.Activate; |
| 23 | import org.apache.felix.scr.annotations.Component; |
| 24 | import org.apache.felix.scr.annotations.Deactivate; |
| 25 | import org.apache.felix.scr.annotations.Reference; |
| 26 | import org.apache.felix.scr.annotations.ReferenceCardinality; |
| 27 | import org.apache.felix.scr.annotations.Service; |
Hyunsun Moon | 022272f | 2016-01-11 15:30:42 -0800 | [diff] [blame] | 28 | import org.onlab.packet.Ethernet; |
Hyunsun Moon | 8b530e3 | 2016-02-03 00:11:11 -0800 | [diff] [blame] | 29 | import org.onlab.packet.Ip4Address; |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 30 | import org.onlab.packet.Ip4Prefix; |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 31 | import org.onlab.util.KryoNamespace; |
| 32 | import org.onosproject.cluster.ClusterService; |
| 33 | import org.onosproject.cluster.LeadershipService; |
| 34 | import org.onosproject.cluster.NodeId; |
| 35 | import org.onosproject.store.serializers.KryoNamespaces; |
| 36 | import org.onosproject.store.service.ConsistentMap; |
| 37 | import org.onosproject.store.service.MapEvent; |
| 38 | import org.onosproject.store.service.MapEventListener; |
| 39 | import org.onosproject.store.service.Serializer; |
| 40 | import org.onosproject.store.service.StorageService; |
| 41 | import org.opencord.cordvtn.api.CordVtnAdminService; |
Hyunsun Moon | fe31dd4 | 2016-09-30 11:34:22 -0700 | [diff] [blame] | 42 | import org.onosproject.store.service.Versioned; |
alshabib | b4d3171 | 2016-06-01 18:51:03 -0700 | [diff] [blame] | 43 | import org.opencord.cordvtn.api.CordVtnNode; |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 44 | import org.opencord.cordvtn.api.Dependency; |
| 45 | import org.opencord.cordvtn.api.Dependency.Type; |
Hyunsun Moon | 5401aaa | 2016-06-12 17:40:34 -0700 | [diff] [blame] | 46 | import org.opencord.cordvtn.api.DependencyService; |
alshabib | b4d3171 | 2016-06-01 18:51:03 -0700 | [diff] [blame] | 47 | import org.opencord.cordvtn.api.Instance; |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 48 | import org.onosproject.core.DefaultGroupId; |
| 49 | import org.onosproject.core.GroupId; |
| 50 | import org.onosproject.net.DeviceId; |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 51 | import org.onosproject.net.PortNumber; |
| 52 | import org.onosproject.net.flow.DefaultFlowRule; |
| 53 | import org.onosproject.net.flow.DefaultTrafficSelector; |
| 54 | import org.onosproject.net.flow.DefaultTrafficTreatment; |
| 55 | import org.onosproject.net.flow.FlowRule; |
| 56 | import org.onosproject.net.flow.TrafficSelector; |
| 57 | import org.onosproject.net.flow.TrafficTreatment; |
| 58 | import org.onosproject.net.flow.instructions.ExtensionTreatment; |
| 59 | import org.onosproject.net.group.DefaultGroupDescription; |
| 60 | import org.onosproject.net.group.DefaultGroupKey; |
| 61 | import org.onosproject.net.group.Group; |
| 62 | import org.onosproject.net.group.GroupBucket; |
| 63 | import org.onosproject.net.group.GroupBuckets; |
| 64 | import org.onosproject.net.group.GroupDescription; |
| 65 | import org.onosproject.net.group.GroupKey; |
Hyunsun Moon | ba29007 | 2015-12-16 20:53:23 -0800 | [diff] [blame] | 66 | import org.onosproject.net.group.GroupService; |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 67 | import org.opencord.cordvtn.api.NetworkId; |
| 68 | import org.opencord.cordvtn.api.ProviderNetwork; |
| 69 | import org.opencord.cordvtn.api.SegmentId; |
| 70 | import org.opencord.cordvtn.api.ServiceNetwork.ServiceNetworkType; |
| 71 | import org.opencord.cordvtn.api.VtnNetwork; |
| 72 | import org.opencord.cordvtn.api.VtnNetworkEvent; |
| 73 | import org.opencord.cordvtn.api.VtnNetworkListener; |
| 74 | import org.opencord.cordvtn.impl.handler.AbstractInstanceHandler; |
Hyunsun Moon | e9d7599 | 2015-09-15 22:39:16 -0700 | [diff] [blame] | 75 | import org.slf4j.Logger; |
| 76 | |
Hyunsun Moon | fe31dd4 | 2016-09-30 11:34:22 -0700 | [diff] [blame] | 77 | import java.util.Collection; |
Hyunsun Moon | 8b530e3 | 2016-02-03 00:11:11 -0800 | [diff] [blame] | 78 | import java.util.List; |
Hyunsun Moon | 7dca9b3 | 2015-10-08 22:25:30 -0700 | [diff] [blame] | 79 | import java.util.Map; |
Hyunsun Moon | d05b32e | 2016-03-02 19:27:26 -0800 | [diff] [blame] | 80 | import java.util.Objects; |
Hyunsun Moon | 05f528a | 2015-11-04 17:34:35 -0800 | [diff] [blame] | 81 | import java.util.Set; |
Hyunsun Moon | 05f528a | 2015-11-04 17:34:35 -0800 | [diff] [blame] | 82 | import java.util.stream.Collectors; |
Hyunsun Moon | e9d7599 | 2015-09-15 22:39:16 -0700 | [diff] [blame] | 83 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 84 | import static org.opencord.cordvtn.api.Dependency.Type.BIDIRECTIONAL; |
| 85 | import static org.opencord.cordvtn.api.ServiceNetwork.ServiceNetworkType.ACCESS_AGENT; |
alshabib | b4d3171 | 2016-06-01 18:51:03 -0700 | [diff] [blame] | 86 | import static org.opencord.cordvtn.impl.CordVtnPipeline.*; |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 87 | import static org.onosproject.net.group.DefaultGroupBucket.createSelectGroupBucket; |
Hyunsun Moon | e9d7599 | 2015-09-15 22:39:16 -0700 | [diff] [blame] | 88 | import static org.slf4j.LoggerFactory.getLogger; |
| 89 | |
| 90 | /** |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 91 | * Provisions service dependency capabilities between network services. |
Hyunsun Moon | e9d7599 | 2015-09-15 22:39:16 -0700 | [diff] [blame] | 92 | */ |
| 93 | @Component(immediate = true) |
| 94 | @Service |
Hyunsun Moon | 5401aaa | 2016-06-12 17:40:34 -0700 | [diff] [blame] | 95 | public class DependencyManager extends AbstractInstanceHandler implements DependencyService { |
Hyunsun Moon | e9d7599 | 2015-09-15 22:39:16 -0700 | [diff] [blame] | 96 | |
| 97 | protected final Logger log = getLogger(getClass()); |
| 98 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 99 | private static final String ERR_NET_FAIL = "Failed to get VTN network "; |
| 100 | private static final String MSG_CREATE = "Created dependency %s"; |
| 101 | private static final String MSG_REMOVE = "Removed dependency %s"; |
| 102 | private static final String ADDED = "Added "; |
| 103 | private static final String REMOVED = "Removed "; |
| 104 | |
| 105 | private static final KryoNamespace SERIALIZER_DEPENDENCY = KryoNamespace.newBuilder() |
| 106 | .register(KryoNamespaces.API) |
| 107 | .register(VtnNetwork.class) |
| 108 | .register(NetworkId.class) |
| 109 | .register(SegmentId.class) |
| 110 | .register(ServiceNetworkType.class) |
| 111 | .register(ProviderNetwork.class) |
| 112 | .register(Dependency.class) |
| 113 | .register(Type.class) |
| 114 | .build(); |
| 115 | |
Hyunsun Moon | e9d7599 | 2015-09-15 22:39:16 -0700 | [diff] [blame] | 116 | @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) |
Hyunsun Moon | ba29007 | 2015-12-16 20:53:23 -0800 | [diff] [blame] | 117 | protected GroupService groupService; |
| 118 | |
Hyunsun Moon | 5401aaa | 2016-06-12 17:40:34 -0700 | [diff] [blame] | 119 | @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 120 | protected LeadershipService leadershipService; |
| 121 | |
| 122 | @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) |
| 123 | protected ClusterService clusterService; |
| 124 | |
| 125 | @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) |
| 126 | protected StorageService storageService; |
| 127 | |
| 128 | @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) |
Hyunsun Moon | 5401aaa | 2016-06-12 17:40:34 -0700 | [diff] [blame] | 129 | protected CordVtnPipeline pipeline; |
| 130 | |
| 131 | @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) |
| 132 | protected CordVtnNodeManager nodeManager; |
| 133 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 134 | @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) |
| 135 | protected CordVtnAdminService vtnService; |
| 136 | |
| 137 | private final VtnNetworkListener vtnNetListener = new InternalVtnNetListener(); |
| 138 | private final MapEventListener<NetworkId, Set<Dependency>> dependencyListener = |
| 139 | new DependencyMapListener(); |
| 140 | |
| 141 | private ConsistentMap<NetworkId, Set<Dependency>> dependencyStore; |
| 142 | private NodeId localNodeId; |
| 143 | |
Hyunsun Moon | e9d7599 | 2015-09-15 22:39:16 -0700 | [diff] [blame] | 144 | @Activate |
| 145 | protected void activate() { |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 146 | super.activate(); |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 147 | |
| 148 | dependencyStore = storageService.<NetworkId, Set<Dependency>>consistentMapBuilder() |
| 149 | .withSerializer(Serializer.using(SERIALIZER_DEPENDENCY)) |
| 150 | .withName("cordvtn-dependencymap") |
| 151 | .withApplicationId(appId) |
| 152 | .build(); |
| 153 | dependencyStore.addListener(dependencyListener); |
| 154 | |
| 155 | localNodeId = clusterService.getLocalNode().id(); |
| 156 | leadershipService.runForLeadership(appId.name()); |
| 157 | vtnService.addListener(vtnNetListener); |
Hyunsun Moon | e9d7599 | 2015-09-15 22:39:16 -0700 | [diff] [blame] | 158 | } |
| 159 | |
| 160 | @Deactivate |
| 161 | protected void deactivate() { |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 162 | super.deactivate(); |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 163 | dependencyStore.removeListener(dependencyListener); |
| 164 | vtnService.removeListener(vtnNetListener); |
| 165 | leadershipService.withdraw(appId.name()); |
Hyunsun Moon | de37257 | 2016-01-14 03:42:47 -0800 | [diff] [blame] | 166 | } |
| 167 | |
| 168 | @Override |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 169 | public void createDependency(NetworkId subNetId, NetworkId proNetId, Type type) { |
| 170 | // FIXME this is not safe |
Hyunsun Moon | 5c14395 | 2016-10-19 18:34:46 -0700 | [diff] [blame] | 171 | VtnNetwork existing = vtnService.vtnNetwork(subNetId); |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 172 | if (existing == null) { |
| 173 | log.warn("Failed to create dependency between {} and {}", subNetId, proNetId); |
Hyunsun Moon | ba29007 | 2015-12-16 20:53:23 -0800 | [diff] [blame] | 174 | return; |
| 175 | } |
Hyunsun Moon | 5c14395 | 2016-10-19 18:34:46 -0700 | [diff] [blame] | 176 | vtnService.createServiceNetwork(existing); |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 177 | VtnNetwork updated = VtnNetwork.builder(existing) |
| 178 | .addProvider(proNetId, type) |
| 179 | .build(); |
Hyunsun Moon | 5c14395 | 2016-10-19 18:34:46 -0700 | [diff] [blame] | 180 | vtnService.updateServiceNetwork(updated); |
Hyunsun Moon | 9274aaf | 2015-12-04 11:35:25 -0800 | [diff] [blame] | 181 | } |
| 182 | |
| 183 | @Override |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 184 | public void removeDependency(NetworkId subNetId, NetworkId proNetId) { |
| 185 | // FIXME this is not safe |
Hyunsun Moon | 5c14395 | 2016-10-19 18:34:46 -0700 | [diff] [blame] | 186 | VtnNetwork subNet = vtnService.vtnNetwork(subNetId); |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 187 | if (subNet == null) { |
| 188 | log.warn("No dependency exists between {} and {}", subNetId, proNetId); |
Hyunsun Moon | ba29007 | 2015-12-16 20:53:23 -0800 | [diff] [blame] | 189 | return; |
| 190 | } |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 191 | VtnNetwork updated = VtnNetwork.builder(subNet) |
| 192 | .delProvider(proNetId) |
| 193 | .build(); |
Hyunsun Moon | 5c14395 | 2016-10-19 18:34:46 -0700 | [diff] [blame] | 194 | vtnService.updateServiceNetwork(updated); |
Hyunsun Moon | 9274aaf | 2015-12-04 11:35:25 -0800 | [diff] [blame] | 195 | } |
| 196 | |
Hyunsun Moon | cb79944 | 2016-01-15 20:03:18 -0800 | [diff] [blame] | 197 | @Override |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 198 | public void instanceDetected(Instance instance) { |
Hyunsun Moon | 1e88fef | 2016-08-04 14:00:35 -0700 | [diff] [blame] | 199 | // TODO remove this when XOS provides access agent information |
| 200 | // and handle it the same way wit the other instances |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 201 | if (instance.netType() == ACCESS_AGENT) { |
Hyunsun Moon | 1e88fef | 2016-08-04 14:00:35 -0700 | [diff] [blame] | 202 | return; |
| 203 | } |
| 204 | |
Hyunsun Moon | 5c14395 | 2016-10-19 18:34:46 -0700 | [diff] [blame] | 205 | VtnNetwork vtnNet = vtnService.vtnNetwork(instance.netId()); |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 206 | if (vtnNet == null) { |
| 207 | final String error = ERR_NET_FAIL + instance.netId(); |
| 208 | throw new IllegalStateException(error); |
Hyunsun Moon | 4edb017 | 2015-11-07 22:08:43 -0800 | [diff] [blame] | 209 | } |
| 210 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 211 | if (!vtnNet.providers().isEmpty()) { |
| 212 | updateSubscriberInstances(vtnNet, instance, true); |
| 213 | } |
| 214 | // TODO check if subscribers on this network |
| 215 | updateProviderInstances(vtnNet); |
Hyunsun Moon | 4edb017 | 2015-11-07 22:08:43 -0800 | [diff] [blame] | 216 | } |
| 217 | |
Hyunsun Moon | cb79944 | 2016-01-15 20:03:18 -0800 | [diff] [blame] | 218 | @Override |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 219 | public void instanceRemoved(Instance instance) { |
Hyunsun Moon | 1e88fef | 2016-08-04 14:00:35 -0700 | [diff] [blame] | 220 | // TODO remove this when XOS provides access agent information |
| 221 | // and handle it the same way wit the other instances |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 222 | if (instance.netType() == ACCESS_AGENT) { |
Hyunsun Moon | 1e88fef | 2016-08-04 14:00:35 -0700 | [diff] [blame] | 223 | return; |
| 224 | } |
| 225 | |
Hyunsun Moon | 5c14395 | 2016-10-19 18:34:46 -0700 | [diff] [blame] | 226 | VtnNetwork vtnNet = vtnService.vtnNetwork(instance.netId()); |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 227 | if (vtnNet == null) { |
| 228 | final String error = ERR_NET_FAIL + instance.netId(); |
| 229 | throw new IllegalStateException(error); |
Hyunsun Moon | 01556a5 | 2016-02-12 12:48:47 -0800 | [diff] [blame] | 230 | } |
| 231 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 232 | if (!vtnNet.providers().isEmpty()) { |
| 233 | updateSubscriberInstances(vtnNet, instance, false); |
Hyunsun Moon | d05b32e | 2016-03-02 19:27:26 -0800 | [diff] [blame] | 234 | } |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 235 | // TODO check if subscribers on this network |
| 236 | updateProviderInstances(vtnNet); |
Hyunsun Moon | 01556a5 | 2016-02-12 12:48:47 -0800 | [diff] [blame] | 237 | } |
| 238 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 239 | private void dependencyCreated(Dependency dependency) { |
| 240 | populateDependencyRules(dependency.subscriber(), dependency.provider(), |
| 241 | dependency.type(), true); |
| 242 | log.info(String.format(MSG_CREATE, dependency)); |
| 243 | } |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 244 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 245 | private void dependencyRemoved(Dependency dependency) { |
| 246 | populateDependencyRules(dependency.subscriber(), dependency.provider(), |
| 247 | dependency.type(), false); |
Hyunsun Moon | fe31dd4 | 2016-09-30 11:34:22 -0700 | [diff] [blame] | 248 | if (getSubscribers(dependency.provider().id()).isEmpty()) { |
| 249 | removeProviderGroup(dependency.provider().id()); |
| 250 | } |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 251 | log.info(String.format(MSG_REMOVE, dependency)); |
| 252 | } |
| 253 | |
| 254 | private void updateProviderInstances(VtnNetwork provider) { |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 255 | Set<DeviceId> devices = nodeManager.completeNodes().stream() |
Hyunsun Moon | 81a1356 | 2016-08-04 13:48:08 -0700 | [diff] [blame] | 256 | .map(CordVtnNode::integrationBridgeId) |
Hyunsun Moon | cb79944 | 2016-01-15 20:03:18 -0800 | [diff] [blame] | 257 | .collect(Collectors.toSet()); |
Hyunsun Moon | 01556a5 | 2016-02-12 12:48:47 -0800 | [diff] [blame] | 258 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 259 | GroupKey groupKey = getGroupKey(provider.id()); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 260 | for (DeviceId deviceId : devices) { |
| 261 | Group group = groupService.getGroup(deviceId, groupKey); |
| 262 | if (group == null) { |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 263 | continue; |
Hyunsun Moon | 7004fcf | 2016-03-08 04:36:02 -0800 | [diff] [blame] | 264 | } |
| 265 | |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 266 | List<GroupBucket> oldBuckets = group.buckets().buckets(); |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 267 | List<GroupBucket> newBuckets = getProviderGroupBuckets( |
| 268 | deviceId, |
| 269 | provider.segmentId().id(), |
| 270 | getInstances(provider.id())).buckets(); |
Hyunsun Moon | 7004fcf | 2016-03-08 04:36:02 -0800 | [diff] [blame] | 271 | |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 272 | if (oldBuckets.equals(newBuckets)) { |
| 273 | continue; |
Hyunsun Moon | 3fc17f7 | 2016-01-24 21:47:06 -0800 | [diff] [blame] | 274 | } |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 275 | |
| 276 | List<GroupBucket> bucketsToRemove = Lists.newArrayList(oldBuckets); |
| 277 | bucketsToRemove.removeAll(newBuckets); |
| 278 | if (!bucketsToRemove.isEmpty()) { |
| 279 | groupService.removeBucketsFromGroup( |
| 280 | deviceId, |
| 281 | groupKey, |
| 282 | new GroupBuckets(bucketsToRemove), |
| 283 | groupKey, appId); |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 284 | log.debug("Removed buckets from provider({}) group on {}: {}", |
| 285 | provider.id(), deviceId, bucketsToRemove); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 286 | } |
| 287 | |
| 288 | List<GroupBucket> bucketsToAdd = Lists.newArrayList(newBuckets); |
| 289 | bucketsToAdd.removeAll(oldBuckets); |
| 290 | if (!bucketsToAdd.isEmpty()) { |
| 291 | groupService.addBucketsToGroup( |
| 292 | deviceId, |
| 293 | groupKey, |
| 294 | new GroupBuckets(bucketsToAdd), |
| 295 | groupKey, appId); |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 296 | log.debug("Added buckets to provider({}) group on {}: {}", |
| 297 | provider.id(), deviceId, bucketsToAdd); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 298 | } |
| 299 | } |
| 300 | } |
| 301 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 302 | private void updateSubscriberInstances(VtnNetwork subscriber, Instance instance, |
| 303 | boolean isDetected) { |
| 304 | DeviceId deviceId = instance.deviceId(); |
| 305 | final String isAdded = isDetected ? ADDED : REMOVED; |
| 306 | subscriber.providers().stream().forEach(provider -> { |
| 307 | populateInPortRule( |
| 308 | ImmutableMap.of(deviceId, ImmutableSet.of(instance.portNumber())), |
| 309 | ImmutableMap.of(deviceId, getGroupId(provider.id(), deviceId)), |
| 310 | isDetected); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 311 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 312 | log.info(isAdded + "subscriber instance({}) for provider({})", |
| 313 | instance.host().id(), provider.id()); |
Hyunsun Moon | 3fc17f7 | 2016-01-24 21:47:06 -0800 | [diff] [blame] | 314 | }); |
| 315 | } |
| 316 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 317 | private void populateDependencyRules(VtnNetwork subscriber, |
| 318 | VtnNetwork provider, |
| 319 | Type type, boolean install) { |
| 320 | Map<DeviceId, GroupId> providerGroups = Maps.newHashMap(); |
| 321 | Map<DeviceId, Set<PortNumber>> subscriberPorts = Maps.newHashMap(); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 322 | |
| 323 | nodeManager.completeNodes().stream().forEach(node -> { |
Hyunsun Moon | 81a1356 | 2016-08-04 13:48:08 -0700 | [diff] [blame] | 324 | DeviceId deviceId = node.integrationBridgeId(); |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 325 | GroupId groupId = getProviderGroup(provider, deviceId); |
| 326 | providerGroups.put(deviceId, groupId); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 327 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 328 | Set<PortNumber> ports = getInstances(subscriber.id()) |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 329 | .stream() |
| 330 | .filter(instance -> instance.deviceId().equals(deviceId)) |
| 331 | .map(Instance::portNumber) |
| 332 | .collect(Collectors.toSet()); |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 333 | subscriberPorts.put(deviceId, ports); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 334 | }); |
| 335 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 336 | Ip4Prefix subscriberIp = subscriber.subnet().getIp4Prefix(); |
| 337 | Ip4Prefix providerIp = provider.subnet().getIp4Prefix(); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 338 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 339 | populateInPortRule(subscriberPorts, providerGroups, install); |
| 340 | populateIndirectAccessRule( |
| 341 | subscriberIp, |
| 342 | provider.serviceIp().getIp4Address(), |
| 343 | providerGroups, |
| 344 | install); |
| 345 | populateDirectAccessRule(subscriberIp, providerIp, install); |
| 346 | if (type == BIDIRECTIONAL) { |
| 347 | populateDirectAccessRule(providerIp, subscriberIp, install); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 348 | } |
Hyunsun Moon | b5f92e5 | 2016-02-17 15:02:06 -0800 | [diff] [blame] | 349 | } |
| 350 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 351 | private void populateIndirectAccessRule(Ip4Prefix srcIp, Ip4Address serviceIp, |
| 352 | Map<DeviceId, GroupId> outGroups, |
| 353 | boolean install) { |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 354 | TrafficSelector selector = DefaultTrafficSelector.builder() |
| 355 | .matchEthType(Ethernet.TYPE_IPV4) |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 356 | .matchIPSrc(srcIp) |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 357 | .matchIPDst(serviceIp.toIpPrefix()) |
| 358 | .build(); |
| 359 | |
| 360 | for (Map.Entry<DeviceId, GroupId> outGroup : outGroups.entrySet()) { |
| 361 | TrafficTreatment treatment = DefaultTrafficTreatment.builder() |
| 362 | .group(outGroup.getValue()) |
| 363 | .build(); |
| 364 | |
| 365 | FlowRule flowRule = DefaultFlowRule.builder() |
| 366 | .fromApp(appId) |
| 367 | .withSelector(selector) |
| 368 | .withTreatment(treatment) |
| 369 | .withPriority(PRIORITY_HIGH) |
| 370 | .forDevice(outGroup.getKey()) |
Hyunsun Moon | 1e88fef | 2016-08-04 14:00:35 -0700 | [diff] [blame] | 371 | .forTable(TABLE_ACCESS) |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 372 | .makePermanent() |
| 373 | .build(); |
| 374 | |
| 375 | pipeline.processFlowRule(install, flowRule); |
| 376 | } |
| 377 | } |
| 378 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 379 | private void populateDirectAccessRule(Ip4Prefix srcIp, Ip4Prefix dstIp, boolean install) { |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 380 | TrafficSelector selector = DefaultTrafficSelector.builder() |
| 381 | .matchEthType(Ethernet.TYPE_IPV4) |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 382 | .matchIPSrc(srcIp) |
| 383 | .matchIPDst(dstIp) |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 384 | .build(); |
| 385 | |
| 386 | TrafficTreatment treatment = DefaultTrafficTreatment.builder() |
Hyunsun Moon | 1e88fef | 2016-08-04 14:00:35 -0700 | [diff] [blame] | 387 | .transition(TABLE_DST) |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 388 | .build(); |
| 389 | |
| 390 | nodeManager.completeNodes().stream().forEach(node -> { |
Hyunsun Moon | 81a1356 | 2016-08-04 13:48:08 -0700 | [diff] [blame] | 391 | DeviceId deviceId = node.integrationBridgeId(); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 392 | FlowRule flowRuleDirect = DefaultFlowRule.builder() |
| 393 | .fromApp(appId) |
| 394 | .withSelector(selector) |
| 395 | .withTreatment(treatment) |
| 396 | .withPriority(PRIORITY_DEFAULT) |
| 397 | .forDevice(deviceId) |
Hyunsun Moon | 1e88fef | 2016-08-04 14:00:35 -0700 | [diff] [blame] | 398 | .forTable(TABLE_ACCESS) |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 399 | .makePermanent() |
| 400 | .build(); |
| 401 | |
| 402 | pipeline.processFlowRule(install, flowRuleDirect); |
| 403 | }); |
| 404 | } |
| 405 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 406 | private void populateInPortRule(Map<DeviceId, Set<PortNumber>> subscriberPorts, |
| 407 | Map<DeviceId, GroupId> providerGroups, |
| 408 | boolean install) { |
| 409 | for (Map.Entry<DeviceId, Set<PortNumber>> entry : subscriberPorts.entrySet()) { |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 410 | Set<PortNumber> ports = entry.getValue(); |
| 411 | DeviceId deviceId = entry.getKey(); |
| 412 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 413 | GroupId groupId = providerGroups.get(deviceId); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 414 | if (groupId == null) { |
| 415 | continue; |
| 416 | } |
| 417 | |
| 418 | ports.stream().forEach(port -> { |
| 419 | TrafficSelector selector = DefaultTrafficSelector.builder() |
| 420 | .matchInPort(port) |
| 421 | .build(); |
| 422 | |
| 423 | TrafficTreatment treatment = DefaultTrafficTreatment.builder() |
| 424 | .group(groupId) |
| 425 | .build(); |
| 426 | |
| 427 | FlowRule flowRule = DefaultFlowRule.builder() |
| 428 | .fromApp(appId) |
| 429 | .withSelector(selector) |
| 430 | .withTreatment(treatment) |
| 431 | .withPriority(PRIORITY_DEFAULT) |
| 432 | .forDevice(deviceId) |
| 433 | .forTable(TABLE_IN_SERVICE) |
| 434 | .makePermanent() |
| 435 | .build(); |
| 436 | |
| 437 | pipeline.processFlowRule(install, flowRule); |
| 438 | }); |
| 439 | } |
| 440 | } |
| 441 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 442 | private GroupId getGroupId(NetworkId netId, DeviceId deviceId) { |
| 443 | return new DefaultGroupId(Objects.hash(netId, deviceId)); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 444 | } |
| 445 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 446 | private GroupKey getGroupKey(NetworkId netId) { |
| 447 | return new DefaultGroupKey(netId.id().getBytes()); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 448 | } |
| 449 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 450 | private GroupId getProviderGroup(VtnNetwork provider, DeviceId deviceId) { |
| 451 | GroupKey groupKey = getGroupKey(provider.id()); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 452 | Group group = groupService.getGroup(deviceId, groupKey); |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 453 | GroupId groupId = getGroupId(provider.id(), deviceId); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 454 | |
| 455 | if (group != null) { |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 456 | return groupId; |
Hyunsun Moon | 3fc17f7 | 2016-01-24 21:47:06 -0800 | [diff] [blame] | 457 | } |
| 458 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 459 | GroupBuckets buckets = getProviderGroupBuckets( |
| 460 | deviceId, provider.segmentId().id(), getInstances(provider.id())); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 461 | GroupDescription groupDescription = new DefaultGroupDescription( |
| 462 | deviceId, |
| 463 | GroupDescription.Type.SELECT, |
| 464 | buckets, |
| 465 | groupKey, |
| 466 | groupId.id(), |
| 467 | appId); |
Hyunsun Moon | 486ed1b | 2016-05-13 18:58:35 -0700 | [diff] [blame] | 468 | |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 469 | groupService.addGroup(groupDescription); |
| 470 | return groupId; |
| 471 | } |
| 472 | |
Hyunsun Moon | fe31dd4 | 2016-09-30 11:34:22 -0700 | [diff] [blame] | 473 | private Set<Dependency> getSubscribers(NetworkId netId) { |
| 474 | return dependencyStore.values().stream().map(Versioned::value) |
| 475 | .flatMap(Collection::stream) |
| 476 | .filter(dependency -> dependency.provider().id().equals(netId)) |
| 477 | .collect(Collectors.toSet()); |
| 478 | } |
| 479 | |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 480 | private void removeProviderGroup(NetworkId netId) { |
| 481 | GroupKey groupKey = getGroupKey(netId); |
| 482 | nodeManager.completeNodes().stream() |
| 483 | .forEach(node -> { |
| 484 | DeviceId deviceId = node.integrationBridgeId(); |
| 485 | Group group = groupService.getGroup(deviceId, groupKey); |
| 486 | if (group != null) { |
| 487 | groupService.removeGroup(deviceId, groupKey, appId); |
| 488 | } |
| 489 | }); |
| 490 | log.debug("Removed group for network {}", netId); |
| 491 | } |
| 492 | |
| 493 | private GroupBuckets getProviderGroupBuckets(DeviceId deviceId, |
| 494 | long tunnelId, |
| 495 | Set<Instance> instances) { |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 496 | List<GroupBucket> buckets = Lists.newArrayList(); |
| 497 | instances.stream().forEach(instance -> { |
Hyunsun Moon | 81a1356 | 2016-08-04 13:48:08 -0700 | [diff] [blame] | 498 | Ip4Address tunnelIp = nodeManager.dataIp(instance.deviceId()).getIp4Address(); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 499 | |
| 500 | if (deviceId.equals(instance.deviceId())) { |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 501 | TrafficTreatment treatment = DefaultTrafficTreatment.builder() |
| 502 | .setEthDst(instance.mac()) |
| 503 | .setOutput(instance.portNumber()) |
| 504 | .build(); |
| 505 | buckets.add(createSelectGroupBucket(treatment)); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 506 | } else { |
| 507 | ExtensionTreatment tunnelDst = |
| 508 | pipeline.tunnelDstTreatment(deviceId, tunnelIp); |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 509 | TrafficTreatment treatment = DefaultTrafficTreatment.builder() |
| 510 | .setEthDst(instance.mac()) |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 511 | .extension(tunnelDst, deviceId) |
| 512 | .setTunnelId(tunnelId) |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 513 | .setOutput(nodeManager.tunnelPort(instance.deviceId())) |
| 514 | .build(); |
| 515 | buckets.add(createSelectGroupBucket(treatment)); |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 516 | } |
Hyunsun Moon | e7e4bb3 | 2016-05-16 04:32:45 -0700 | [diff] [blame] | 517 | }); |
| 518 | return new GroupBuckets(buckets); |
Hyunsun Moon | 61e79ee | 2016-04-14 19:04:23 -0700 | [diff] [blame] | 519 | } |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 520 | |
| 521 | private class InternalVtnNetListener implements VtnNetworkListener { |
| 522 | |
| 523 | @Override |
| 524 | public void event(VtnNetworkEvent event) { |
| 525 | NodeId leader = leadershipService.getLeader(appId.name()); |
| 526 | if (!Objects.equals(localNodeId, leader)) { |
| 527 | // do not allow to proceed without leadership |
| 528 | return; |
| 529 | } |
| 530 | |
| 531 | switch (event.type()) { |
| 532 | case VTN_NETWORK_CREATED: |
| 533 | case VTN_NETWORK_UPDATED: |
| 534 | log.debug("Processing dependency for {}", event.subject()); |
| 535 | eventExecutor.execute(() -> updateDependency(event.subject())); |
| 536 | break; |
| 537 | case VTN_NETWORK_REMOVED: |
| 538 | log.debug("Removing dependency for {}", event.subject()); |
| 539 | NetworkId netId = event.subject().id(); |
| 540 | eventExecutor.execute(() -> dependencyStore.remove(netId)); |
| 541 | break; |
| 542 | case VTN_PORT_CREATED: |
| 543 | case VTN_PORT_UPDATED: |
| 544 | case VTN_PORT_REMOVED: |
| 545 | default: |
| 546 | // do nothing for the other events |
| 547 | break; |
| 548 | } |
| 549 | } |
| 550 | |
| 551 | private void updateDependency(VtnNetwork subscriber) { |
| 552 | Set<Dependency> dependencies = subscriber.providers().stream() |
| 553 | .map(provider -> Dependency.builder() |
| 554 | .subscriber(subscriber) |
Hyunsun Moon | 5c14395 | 2016-10-19 18:34:46 -0700 | [diff] [blame] | 555 | .provider(vtnService.vtnNetwork(provider.id())) |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 556 | .type(provider.type()) |
| 557 | .build()) |
| 558 | .collect(Collectors.toSet()); |
| 559 | dependencyStore.put(subscriber.id(), dependencies); |
| 560 | } |
| 561 | } |
| 562 | |
| 563 | private class DependencyMapListener implements MapEventListener<NetworkId, Set<Dependency>> { |
| 564 | |
| 565 | @Override |
| 566 | public void event(MapEvent<NetworkId, Set<Dependency>> event) { |
| 567 | NodeId leader = leadershipService.getLeader(appId.name()); |
| 568 | if (!Objects.equals(localNodeId, leader)) { |
| 569 | // do not allow to proceed without leadership |
| 570 | return; |
| 571 | } |
| 572 | |
| 573 | switch (event.type()) { |
| 574 | case UPDATE: |
| 575 | log.debug("Subscriber {} updated", event.key()); |
| 576 | eventExecutor.execute(() -> dependencyUpdated( |
| 577 | event.oldValue().value(), |
| 578 | event.newValue().value() |
| 579 | )); |
| 580 | break; |
| 581 | case INSERT: |
| 582 | log.debug("Subscriber {} inserted", event.key()); |
| 583 | eventExecutor.execute(() -> dependencyUpdated( |
| 584 | ImmutableSet.of(), |
| 585 | event.newValue().value() |
| 586 | )); |
| 587 | break; |
| 588 | case REMOVE: |
| 589 | log.debug("Subscriber {} removed", event.key()); |
| 590 | eventExecutor.execute(() -> dependencyUpdated( |
| 591 | event.oldValue().value(), |
| 592 | ImmutableSet.of() |
| 593 | )); |
| 594 | break; |
| 595 | default: |
| 596 | log.error("Unsupported event type"); |
| 597 | break; |
| 598 | } |
| 599 | } |
| 600 | |
| 601 | private void dependencyUpdated(Set<Dependency> oldDeps, Set<Dependency> newDeps) { |
| 602 | oldDeps.stream().filter(oldDep -> !newDeps.contains(oldDep)) |
| 603 | .forEach(DependencyManager.this::dependencyRemoved); |
| 604 | |
| 605 | newDeps.stream().filter(newDep -> !oldDeps.contains(newDep)) |
| 606 | .forEach(DependencyManager.this::dependencyCreated); |
Hyunsun Moon | eaf75e6 | 2016-09-27 16:40:23 -0700 | [diff] [blame] | 607 | } |
| 608 | } |
Hyunsun Moon | e9d7599 | 2015-09-15 22:39:16 -0700 | [diff] [blame] | 609 | } |