Merge pull request #335 from alexreimers/master

Updates to VNF.

src/main/java/net/floodlightcontroller/core/annotations/LogMessageDoc.java

@@ -47,10 +47,14 @@ public @interface LogMessageDoc {
             "This is likely a defect in the switch.  Please report this " +
             "issue.  Restarting the controller or switch may help to " +
             "alleviate.";
+    public static final String TRANSIENT_CONDITION =
+            "This is normally a transient condition that does not necessarily " +
+            "represent an error.  If, however, the condition persists or " +
+            "happens frequently you should report this as a controller defect.";
 
     /**
      * The log level for the log message
-     * @return the log level as a tring
+     * @return the log level as a string
      */
     String level() default "INFO";
     /**
@@ -64,7 +68,7 @@ public @interface LogMessageDoc {
      */
     String explanation() default UNKNOWN_ERROR;
     /**
-     * The recommendated action associated with the log message
+     * The recommended action associated with the log message
      * @return the recommendation
      */
     String recommendation() default NO_ACTION;

src/main/java/net/floodlightcontroller/routing/IRoutingDecision.java

@@ -33,10 +33,9 @@ public interface IRoutingDecision {
          *                          if the destination is not known at this time, initiate a discovery action for it (e.g. ARP)
          * FORWARD_OR_FLOOD:        Forward this packet, and this flow, to the first (and only device) in getDestinationDevices(),
          *                          if the destination is not known at this time, flood this packet on the source switch
-         * BROADCAST:               Broadcast this packet on all links                         
          * MULTICAST:               Multicast this packet to all the interfaces and devices attached
          */
-        NONE, DROP, FORWARD, FORWARD_OR_FLOOD, BROADCAST, MULTICAST
+        NONE, DROP, FORWARD, FORWARD_OR_FLOOD, MULTICAST
     }
     
     public static final FloodlightContextStore<IRoutingDecision> rtStore =

src/main/java/net/floodlightcontroller/virtualnetwork/VirtualNetworkFilter.java

@@ -139,7 +139,8 @@ public class VirtualNetworkFilter
                 }
             }
         }
-        nameToGuid.put(network, guid);
+        if(network != null)
+            nameToGuid.put(network, guid);
         if (vNetsByGuid.containsKey(guid))
             vNetsByGuid.get(guid).setName(network); //network already exists, just updating name
         else