moving igmp app to use access device config
Change-Id: I2940b3db9c6da3a3c43c192a2b390c46b40749e7
diff --git a/apps/igmp/pom.xml b/apps/igmp/pom.xml
index 94cdbe9..5f5ed13 100644
--- a/apps/igmp/pom.xml
+++ b/apps/igmp/pom.xml
@@ -51,6 +51,12 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.onosproject</groupId>
+ <artifactId>onos-app-olt-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.onosproject</groupId>
diff --git a/apps/igmp/src/main/java/org/onosproject/igmp/IgmpDeviceConfig.java b/apps/igmp/src/main/java/org/onosproject/igmp/IgmpDeviceConfig.java
deleted file mode 100644
index 309aca4..0000000
--- a/apps/igmp/src/main/java/org/onosproject/igmp/IgmpDeviceConfig.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onosproject.igmp;
-
-import org.onosproject.net.DeviceId;
-import org.onosproject.net.config.Config;
-
-/**
- * Config object for access device data.
- */
-public class IgmpDeviceConfig extends Config<DeviceId> {
-
- /**
- * Gets the device information.
- *
- * @return device information
- */
- public IgmpDeviceData getDevice() {
- return new IgmpDeviceData(subject());
- }
-}
diff --git a/apps/igmp/src/main/java/org/onosproject/igmp/IgmpDeviceData.java b/apps/igmp/src/main/java/org/onosproject/igmp/IgmpDeviceData.java
deleted file mode 100644
index 228494e..0000000
--- a/apps/igmp/src/main/java/org/onosproject/igmp/IgmpDeviceData.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.onosproject.igmp;
-
-import org.onosproject.net.DeviceId;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-/**
- * Information about an igmp enabled device.
- */
-public class IgmpDeviceData {
-
- private static final String DEVICE_ID_MISSING = "Device ID cannot be null";
-
- private final DeviceId deviceId;
-
- public IgmpDeviceData(DeviceId deviceId) {
- this.deviceId = checkNotNull(deviceId, DEVICE_ID_MISSING);
- }
-
- /**
- * Retrieves the access device ID.
- *
- * @return device ID
- */
- public DeviceId deviceId() {
- return deviceId;
- }
-}
diff --git a/apps/igmp/src/main/java/org/onosproject/igmp/IgmpSnoop.java b/apps/igmp/src/main/java/org/onosproject/igmp/IgmpSnoop.java
index cf5f8a0..c0af0bf 100644
--- a/apps/igmp/src/main/java/org/onosproject/igmp/IgmpSnoop.java
+++ b/apps/igmp/src/main/java/org/onosproject/igmp/IgmpSnoop.java
@@ -15,37 +15,51 @@
*/
package org.onosproject.igmp;
-import static org.slf4j.LoggerFactory.getLogger;
-
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.onlab.packet.EthType;
import org.onlab.packet.Ethernet;
+import org.onlab.packet.IGMP;
import org.onlab.packet.IPv4;
import org.onlab.packet.Ip4Address;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
-import org.onlab.packet.IGMP;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
+import org.onosproject.net.Port;
+import org.onosproject.net.PortNumber;
import org.onosproject.net.config.NetworkConfigRegistry;
-import org.onosproject.net.flow.DefaultTrafficSelector;
-import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.device.DeviceEvent;
+import org.onosproject.net.device.DeviceListener;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
+import org.onosproject.net.flow.criteria.Criteria;
+import org.onosproject.net.flowobjective.DefaultFilteringObjective;
+import org.onosproject.net.flowobjective.FilteringObjective;
+import org.onosproject.net.flowobjective.FlowObjectiveService;
+import org.onosproject.net.flowobjective.Objective;
+import org.onosproject.net.flowobjective.ObjectiveContext;
+import org.onosproject.net.flowobjective.ObjectiveError;
import org.onosproject.net.mcast.McastRoute;
import org.onosproject.net.mcast.MulticastRouteService;
import org.onosproject.net.packet.InboundPacket;
import org.onosproject.net.packet.PacketContext;
-import org.onosproject.net.packet.PacketPriority;
import org.onosproject.net.packet.PacketProcessor;
import org.onosproject.net.packet.PacketService;
+import org.onosproject.olt.AccessDeviceConfig;
+import org.onosproject.olt.AccessDeviceData;
import org.slf4j.Logger;
-import java.util.Optional;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static org.slf4j.LoggerFactory.getLogger;
/**
* Internet Group Management Protocol.
@@ -61,6 +75,9 @@
private String multicastAddress = DEFAULT_MCAST_ADDR;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ protected FlowObjectiveService flowObjectiveService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected PacketService packetService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@@ -72,6 +89,12 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected MulticastRouteService multicastService;
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ protected DeviceService deviceService;
+
+ private Map<DeviceId, AccessDeviceData> oltData = new ConcurrentHashMap<>();
+
+ private DeviceListener deviceListener = new InternalDeviceListener();
private IgmpPacketProcessor processor = new IgmpPacketProcessor();
private static ApplicationId appId;
@@ -81,17 +104,19 @@
packetService.addProcessor(processor, PacketProcessor.director(1));
- networkConfig.getSubjects(DeviceId.class, IgmpDeviceConfig.class).forEach(
+ networkConfig.getSubjects(DeviceId.class, AccessDeviceConfig.class).forEach(
subject -> {
- IgmpDeviceConfig config = networkConfig.getConfig(subject,
- IgmpDeviceConfig.class);
+ AccessDeviceConfig config = networkConfig.getConfig(subject,
+ AccessDeviceConfig.class);
if (config != null) {
- IgmpDeviceData data = config.getDevice();
- submitPacketRequests(data.deviceId());
+ AccessDeviceData data = config.getOlt();
+ oltData.put(data.deviceId(), data);
}
}
);
+ deviceService.addListener(deviceListener);
+
log.info("Started");
}
@@ -99,18 +124,52 @@
public void deactivate() {
packetService.removeProcessor(processor);
processor = null;
+ deviceService.removeListener(deviceListener);
log.info("Stopped");
}
- private void submitPacketRequests(DeviceId deviceId) {
- TrafficSelector.Builder selector = DefaultTrafficSelector.builder();
- selector.matchEthType(Ethernet.TYPE_IPV4);
- selector.matchIPProtocol(IPv4.PROTOCOL_IGMP);
- packetService.requestPackets(selector.build(),
- PacketPriority.REACTIVE,
- appId,
- Optional.of(deviceId));
+ private void processFilterObjective(DeviceId devId, Port port, boolean remove) {
+ //TODO migrate to packet requests when packet service uses filtering objectives
+ DefaultFilteringObjective.Builder builder = DefaultFilteringObjective.builder();
+
+ builder = remove ? builder.deny() : builder.permit();
+
+ FilteringObjective igmp = builder
+ .withKey(Criteria.matchInPort(port.number()))
+ .addCondition(Criteria.matchEthType(EthType.EtherType.IPV4.ethType()))
+ .addCondition(Criteria.matchIPProtocol(IPv4.PROTOCOL_IGMP))
+ .withMeta(DefaultTrafficTreatment.builder()
+ .setOutput(PortNumber.CONTROLLER).build())
+ .fromApp(appId)
+ .withPriority(1000)
+ .add(new ObjectiveContext() {
+ @Override
+ public void onSuccess(Objective objective) {
+ log.info("Igmp filter for {} on {} installed.",
+ devId, port);
+ }
+
+ @Override
+ public void onError(Objective objective, ObjectiveError error) {
+ log.info("Igmp filter for {} on {} failed because {}.",
+ devId, port, error);
+ }
+ });
+
+ flowObjectiveService.filter(devId, igmp);
+ }
+
+ private void processQuery(IGMP pkt, ConnectPoint location) {
+ pkt.getGroups().forEach(group -> group.getSources().forEach(src -> {
+
+ McastRoute route = new McastRoute(src,
+ group.getGaddr(),
+ McastRoute.Type.IGMP);
+ multicastService.add(route);
+ multicastService.addSink(route, location);
+
+ }));
}
/**
@@ -188,15 +247,45 @@
}
}
- private void processQuery(IGMP pkt, ConnectPoint location) {
- pkt.getGroups().forEach(group -> group.getSources().forEach(src -> {
- McastRoute route = new McastRoute(src,
- group.getGaddr(),
- McastRoute.Type.IGMP);
- multicastService.add(route);
- multicastService.addSink(route, location);
- }));
+ private class InternalDeviceListener implements DeviceListener {
+ @Override
+ public void event(DeviceEvent event) {
+ switch (event.type()) {
+
+ case DEVICE_ADDED:
+ case DEVICE_UPDATED:
+ case DEVICE_REMOVED:
+ case DEVICE_SUSPENDED:
+ case DEVICE_AVAILABILITY_CHANGED:
+ case PORT_STATS_UPDATED:
+ break;
+ case PORT_ADDED:
+ if (event.port().isEnabled()) {
+ processFilterObjective(event.subject().id(), event.port(), false);
+ }
+ break;
+ case PORT_UPDATED:
+ if (event.port().isEnabled()) {
+ processFilterObjective(event.subject().id(), event.port(), false);
+ } else {
+ processFilterObjective(event.subject().id(), event.port(), true);
+ }
+ break;
+ case PORT_REMOVED:
+ processFilterObjective(event.subject().id(), event.port(), false);
+ break;
+ default:
+ log.warn("Unknown device event {}", event.type());
+ break;
+ }
+
+ }
+
+ @Override
+ public boolean isRelevant(DeviceEvent event) {
+ return oltData.containsKey(event.subject().id());
+ }
}
}
diff --git a/apps/olt/app/src/main/java/org/onosproject/olt/impl/AccessDeviceConfig.java b/apps/olt/api/src/main/java/org/onosproject/olt/AccessDeviceConfig.java
similarity index 97%
rename from apps/olt/app/src/main/java/org/onosproject/olt/impl/AccessDeviceConfig.java
rename to apps/olt/api/src/main/java/org/onosproject/olt/AccessDeviceConfig.java
index c13ffae..07b73c8 100644
--- a/apps/olt/app/src/main/java/org/onosproject/olt/impl/AccessDeviceConfig.java
+++ b/apps/olt/api/src/main/java/org/onosproject/olt/AccessDeviceConfig.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.onosproject.olt.impl;
+package org.onosproject.olt;
import com.fasterxml.jackson.databind.JsonNode;
import org.onlab.packet.VlanId;
diff --git a/apps/olt/app/src/main/java/org/onosproject/olt/impl/AccessDeviceData.java b/apps/olt/api/src/main/java/org/onosproject/olt/AccessDeviceData.java
similarity index 98%
rename from apps/olt/app/src/main/java/org/onosproject/olt/impl/AccessDeviceData.java
rename to apps/olt/api/src/main/java/org/onosproject/olt/AccessDeviceData.java
index 1cfc62b..0092cd3 100644
--- a/apps/olt/app/src/main/java/org/onosproject/olt/impl/AccessDeviceData.java
+++ b/apps/olt/api/src/main/java/org/onosproject/olt/AccessDeviceData.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.onosproject.olt.impl;
+package org.onosproject.olt;
import org.onlab.packet.VlanId;
import org.onosproject.net.DeviceId;
diff --git a/apps/olt/app/src/main/java/org/onosproject/olt/impl/Olt.java b/apps/olt/app/src/main/java/org/onosproject/olt/impl/Olt.java
index 95e7693..0a97cca 100644
--- a/apps/olt/app/src/main/java/org/onosproject/olt/impl/Olt.java
+++ b/apps/olt/app/src/main/java/org/onosproject/olt/impl/Olt.java
@@ -24,7 +24,6 @@
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.onlab.packet.EthType;
-import org.onlab.packet.IPv4;
import org.onlab.packet.VlanId;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
@@ -54,6 +53,8 @@
import org.onosproject.net.flowobjective.Objective;
import org.onosproject.net.flowobjective.ObjectiveContext;
import org.onosproject.net.flowobjective.ObjectiveError;
+import org.onosproject.olt.AccessDeviceConfig;
+import org.onosproject.olt.AccessDeviceData;
import org.onosproject.olt.AccessDeviceEvent;
import org.onosproject.olt.AccessDeviceListener;
import org.onosproject.olt.AccessDeviceService;
@@ -366,32 +367,8 @@
}
});
-
- FilteringObjective igmp = DefaultFilteringObjective.builder()
- .permit()
- .withKey(Criteria.matchInPort(port.number()))
- .addCondition(Criteria.matchEthType(EthType.EtherType.IPV4.ethType()))
- .addCondition(Criteria.matchIPProtocol(IPv4.PROTOCOL_IGMP))
- .withMeta(DefaultTrafficTreatment.builder()
- .setOutput(PortNumber.CONTROLLER).build())
- .fromApp(appId)
- .withPriority(1000)
- .add(new ObjectiveContext() {
- @Override
- public void onSuccess(Objective objective) {
- log.info("Igmp filter for {} on {} installed.",
- devId, port);
- }
-
- @Override
- public void onError(Objective objective, ObjectiveError error) {
- log.info("Igmp filter for {} on {} failed because {}.",
- devId, port, error);
- }
- });
-
flowObjectiveService.filter(devId, eapol);
- flowObjectiveService.filter(devId, igmp);
+
}
private class InternalDeviceListener implements DeviceListener {