Added javadocs and simplified the reactive fwd app in attempt to find the glitch; no dice
diff --git a/core/api/src/main/java/org/onlab/onos/net/HostId.java b/core/api/src/main/java/org/onlab/onos/net/HostId.java
index c406954..170e2a2 100644
--- a/core/api/src/main/java/org/onlab/onos/net/HostId.java
+++ b/core/api/src/main/java/org/onlab/onos/net/HostId.java
@@ -42,10 +42,19 @@
* @param vlanId vlan identifier
* @return host identifier
*/
- // FIXME: replace vlanId long with a rich data-type, e.g. VLanId or something like that
public static HostId hostId(MACAddress mac, VLANID vlanId) {
// FIXME: use more efficient means of encoding
return hostId("nic" + ":" + mac + "/" + vlanId);
}
+ /**
+ * Creates a device id using the supplied MAC and default VLAN.
+ *
+ * @param mac mac address
+ * @return host identifier
+ */
+ public static HostId hostId(MACAddress mac) {
+ return hostId(mac, VLANID.vlanId(VLANID.UNTAGGED));
+ }
+
}
diff --git a/core/trivial/src/main/java/org/onlab/onos/net/trivial/packet/impl/SimplePacketManager.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/packet/impl/SimplePacketManager.java
index 637ada8..53c3fbc 100644
--- a/core/trivial/src/main/java/org/onlab/onos/net/trivial/packet/impl/SimplePacketManager.java
+++ b/core/trivial/src/main/java/org/onlab/onos/net/trivial/packet/impl/SimplePacketManager.java
@@ -25,10 +25,8 @@
import org.onlab.onos.net.provider.AbstractProviderService;
import org.slf4j.Logger;
-
/**
* Provides a basic implementation of the packet SB & NB APIs.
- *
*/
@Component(immediate = true)
@Service
@@ -43,7 +41,6 @@
private final Map<Integer, PacketProcessor> processors = new TreeMap<>();
-
@Activate
public void activate() {
log.info("Started");
@@ -62,19 +59,20 @@
@Override
public void removeProcessor(PacketProcessor processor) {
+ checkNotNull(processor, "Processor cannot be null");
processors.values().remove(processor);
}
@Override
public void emit(OutboundPacket packet) {
+ checkNotNull(packet, "Packet cannot be null");
final Device device = deviceService.getDevice(packet.sendThrough());
final PacketProvider packetProvider = getProvider(device.providerId());
packetProvider.emit(packet);
}
@Override
- protected PacketProviderService createProviderService(
- PacketProvider provider) {
+ protected PacketProviderService createProviderService(PacketProvider provider) {
return new InternalPacketProviderService(provider);
}