Merge pull request #236 from mssumanth/1.1-DEV

1.1-DEV

Author: alshabib

RELEASE-NOTES

@@ -1,6 +1,26 @@
+FlowVisor 1.1.3-DEV: May 15 2013
+    * FLOWVISOR-59 : Flowvisor should be able to ask the flow table from the switch
+    * FLOWVISOR-62 : Allow slice perms to be specfied with "rwd" in addition to by number
+    * FLOWVISOR-191: fvctl add-flowspace should check whether a slice exist before returning
+    * FLOWVISOR-187: Log level of packets not matching any slice in Flowvisor
+    * FLOWVISOR-15 : LLDP packet made by FlowVisor doesn't have "the end of LLDPDU" nor a TLV header before padding(0xcafebabe) 
+    * FLOWVISOR-158: Control planes with multiple flowvisors should not broadcast LLDP packet-ins to all slices  
+
+FlowVisor 1.0.6 : May 10 2013
+   * FLOWVISOR-230 : fvctl list-slice-info gives confusing error message if you specify a non-existent slice
+   * FLOWVISOR-231 : fvctl and network specs
+   * FLOWVISOR-232 : Error adding flowspace rules with MAC addresses
+
+FlowVisor 1.0.5 : May 2 2013
+   * FLOWVISOR-216 : Undo changes to default port configurations
+   * Potential fix for FV crashes; awaiting confirmation
+
+FlowVisor 1.0.4 : May 1 2013
+    * FLOWVISOR-226 : fvconfig load hangs
+
 FlowVisor 1.0.3 : April 30 2013
     * FLOWVISOR-187 : Log level of packets not matching any slice in Flowvisor
-    * FLWOVISOR-217 : Clients can't detect failures that happen after a request is accepted
+    * FLOWVISOR-217 : Clients can't detect failures that happen after a request is accepted
 
 FlowVisor 1.0.2 : April 29 2013
     * FLOWVISOR-193 : fvctl add-flowspace <match> not working Right
@@ -30,6 +50,7 @@ FlowVisor 1.0.0 : February 28 2013
     * FLOWVISOR-65  : Provide RPC API as JSON service
     * FLOWVISOR-60  : Need to be able to set a slice as "administratively down"
     * FLOWVISOR-49  : dl_vlan only accepts in decimal and only prints in hex
+    * FLOWVISOR-24  : Need to flush old flow entries
     * FLOWVISOR-7   : Queue_stats: FV doesn't filter the ports for a slice
     * FLOWVISOR-6   : Aggregate_flow_stats_req: FV doesn't extract the request
 

scripts/FlowVisorDB.sql

@@ -4,7 +4,7 @@ AUTOCOMMIT off;
 
 CREATE TABLE Flowvisor (
   id INT GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
-  api_webserver_port INT DEFAULT -1 ,
+  api_webserver_port INT DEFAULT 8080 ,
   api_jetty_webserver_port INT DEFAULT 8081 ,
   checkpointing BOOLEAN DEFAULT false, 
   listen_port INT  DEFAULT 6633 ,

scripts/fvctl.py

@@ -245,6 +245,9 @@ def toHex(match):
             match[field] = hex(value)
     return match
 
+def prettify(fs):
+    pass
+
 
 def do_listFlowSpace(gopts, opts, args):
     passwd = getPassword(gopts)
@@ -264,6 +267,7 @@ def do_listFlowSpace(gopts, opts, args):
         print "  None"
         sys.exit()
     for item in ret:
+        prettify(item)
         if opts.pretty:
             print json.dumps(item, sort_keys=True, indent=1)
             print "\n\n"
@@ -318,7 +322,7 @@ def do_addFlowSpace(gopts, opts, args):
     acts = []
     for action in actions:
         parts = action.split('=')
-        act = { 'slice-name' : parts[0], "permission" : int(parts[1]) }
+        act = { 'slice-name' : parts[0], "permission" : parts[1] }
         acts.append(act)
     req['slice-action'] = acts
     ret = connect(gopts, "add-flowspace", passwd, data=[req])  
@@ -572,6 +576,8 @@ def pa_regEventCB(args, cmd):
 
     (sdesc, ldesc) = DESCS[cmd]
     parser = OptionParser(usage=usage, description=ldesc)
+    parser.add_option("-d", "--dpid", dest="dpid", type="string", default=None,
+            help="Set the dpid for registering for the flowtable information; default='all'")
     return parser.parse_args(args)
 
 def do_regEventCB(gopts, opts, args):
@@ -580,6 +586,10 @@ def do_regEventCB(gopts, opts, args):
         sys.exit()
     passwd = getPassword(gopts)
     req = { 'url' : args[0], 'method' : args[1], 'event-type' : args[2], 'cookie' : args[3]}
+    if opts.dpid is not None:
+        req['dpid'] = opts.dpid
+    else:
+        req['dpid'] = 'all'
     ret = connect(gopts, "register-event-callback", passwd, data=req)
     if ret:
         print "Callback %s successfully added" % args[3]
@@ -590,18 +600,23 @@ def pa_unregEventCB(args, cmd):
 
     (sdesc, ldesc) = DESCS[cmd]
     parser = OptionParser(usage=usage, description=ldesc)
+    parser.add_option("-d", "--dpid", dest="dpid", type="string", default=None,
+        help="Set the dpid for unregistering for the flowtable information; default='all'")
     return parser.parse_args(args)
 
 def do_unregEventCB(gopts, opts, args):
     if len(args) != 3:
         print "unregister-event-callback : Must specify all the arguments"
         sys.exit()
     passwd = getPassword(gopts)
-    req = { 'method' : args[1], 'event-type' : args[2], 'cookie' : args[3]}
+    req = { 'method' : args[0], 'event-type' : args[1], 'cookie' : args[2]}
+    if opts.dpid is not None:
+        req['dpid'] = opts.dpid
+    else:
+        req['dpid'] = 'all'
     ret = connect(gopts, "unregister-event-callback", passwd, data=req)
     if ret:
-        print "Callback %s successfully removed" % args[3]
-
+        print "Callback %s successfully removed" % args[2]
 
 def do_listFVHealth(gopts, opts, args):
     passwd = getPassword(gopts)
@@ -754,6 +769,14 @@ def toInt(val):
         return int(val,16) 
     return int(val)
 
+def toMacInt(val):
+    if val is None:
+        return
+    if val.find(":") != -1:
+        return int(val.replace(':', ''),16)
+    if val.find("-") != -1:
+        int(val.replace('-', ''),16)
+
 def toStr(val):
     return str(val)
 
@@ -789,10 +812,10 @@ def print_help(option, opt, value, parser):
 MATCHSTRS = {
     'in_port' : ('in_port', toInt),
     'input_port' : ('in_port', toInt),
-    'dl_dst' : ('dl_dst', toInt),
-    'eth_dst' : ('dl_dst', toInt),
-    'dl_src' : ('dl_src', toInt),
-    'eth_src' : ('dl_src',toInt),
+    'dl_dst' : ('dl_dst', toStr),
+    'eth_dst' : ('dl_dst', toStr),
+    'dl_src' : ('dl_src', toStr),
+    'eth_src' : ('dl_src',toStr),
     'dl_type' : ('dl_type',toInt),
     'eth_type' : ('dl_type',toInt),
     'dl_vlan' : ('dl_vlan', toInt),
@@ -975,7 +998,8 @@ def print_help(option, opt, value, parser):
                     )),
     'register-event-callback' : ("Registers your server, for events from FlowVisor",
                     ("Registers for events from FlowVisor. Possible events are: DEVICE_CONNECTED, "
-                    "SLICE_CONNECTED, and SLICE_DISCONNECTED. More may be added later."
+                    "SLICE_CONNECTED, SLICE_DISCONNECTED and FLOWTABLE_CALLBACK. For FLOWTABLE_CALLBACK"
+                    " event type dpid has to be input with -d option. More events may be added later."
                     )),
     'unregister-event-callback' : ("Unregisters your server from FlowVisor",
                     ("Unregisters your server from FlowVisor thereby deactivating event "

scripts/fvlog.config

@@ -2,7 +2,7 @@
 ## See README.syslog for more information
 #####
 
-log4j.rootCategory=DEBUG, system
+log4j.rootCategory=WARN, system
 
 # Console logger
 #log4j.appender.A1=org.apache.log4j.ConsoleAppender

src/org/flowvisor/FlowVisor.java

@@ -40,7 +40,9 @@ public class FlowVisor {
 	public final static int FLOWVISOR_VENDOR_EXTENSION = 0x80000001;
 
 	// VERSION
-	public final static String FLOWVISOR_VERSION = "flowvisor-1.1.2";
+
+	public final static String FLOWVISOR_VERSION = "flowvisor-1.1.3";
+
 	public final static int FLOWVISOR_DB_VERSION = 2;