Merge branch '1.0-MAINT' of git://github.com/OPENNETWORKINGLAB/flowvisor into 1.0-MAINT

Author: Sumanth Sathyanarayana

RELEASE-NOTES

@@ -1,3 +1,29 @@
+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
+    * 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
+    * FLOWVISOR-195 : improve error reporting when FV is not running
+    * FLOWVISOR-197 : more concise fvctl actions w/default empty password
+    * FLOWVISOR-201 : Typo in system restart script
+    * FLOWVISOR-203 : No error message when trying to run FV with another controller already running
+    * FLOWVISOR-204 : Unfriendly error message when running fvctl to non-running FlowVisor
+    * FLOWVISOR-207 : different result when running from script vs copying/pasting commands
+    * FLOWVISOR-216 : Undo changes to default port configurations  
+
 FlowVisor 1.0.0 : February 28 2013
     * FLOWVISOR-161 : Make it easy for GENI people to find versions other than the latest
     * FLOWVISOR-160 : FV does not negotiate an acceptable OpenFlow version if a switch advertises >1.0

scripts/FlowVisorDB.sql

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

scripts/fv-startup.sh

@@ -50,7 +50,7 @@ abend ()
 case "$1" in
 start)
   echo Starting flowvisor with the configuration stored in DB >&2
-  echo "If DB unpopulated, laod config using 'fvconfig load config.json'" >&2
+  echo "If DB unpopulated, load config using 'fvconfig load config.json'" >&2
 
   sudo -u $FV_USER PREFIX/sbin/flowvisor >> /var/log/flowvisor/flowvisor-stderr.log 2>&1 &
   ;;

scripts/fvctl.py

@@ -12,6 +12,8 @@
 from optparse import OptionParser
 
 def getPassword(opts):
+    if opts.no_passwd:
+        return ""
     if opts.fv_passwdfile is None:
         passwd = getpass.getpass("Password: ")
     else:
@@ -21,10 +23,12 @@ def getPassword(opts):
 def addCommonOpts (parser):
     parser.add_option("-h", "--hostname", dest="host", default="localhost",
                     help="Specify the FlowVisor host; default='localhost'")
-    parser.add_option("-p", "--port", dest="port", default="8080",
-                    help="Specify the FlowVisor web port; default=8080")
+    parser.add_option("-p", "--port", dest="port", default="8081",
+                    help="Specify the FlowVisor web port; default=8081")
     parser.add_option("-u", "--user", dest="fv_user", default="fvadmin",
                     help="FlowVisor admin user; default='fvadmin'")
+    parser.add_option("-n", "--no-passwd", action="store_true",  dest="no_passwd", default=False,
+                    help="Run fvctl with no password; default false")
     parser.add_option("-f", "--passwd-file", dest="fv_passwdfile", default=None,
                     help="Password file; default=none")
     parser.add_option("-v", "--version", action="callback", callback=printVersion)
@@ -241,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)
@@ -260,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"
@@ -319,7 +327,7 @@ def do_addFlowSpace(gopts, opts, args):
     req['slice-action'] = acts
     ret = connect(gopts, "add-flowspace", passwd, data=[req])  
     if ret:
-        print "Flowspace %s has been created." % args[0]
+        print "FlowSpace %s was added with request id %s." % (args[0], ret)
 
 def pa_updateFlowSpace(args, cmd):
     usage = "%s [options] <flowspace-name>" % USAGE.format(cmd)
@@ -374,7 +382,7 @@ def do_updateFlowSpace(gopts, opts, args):
         sys.exit()
     ret = connect(gopts, "update-flowspace", passwd, data=[req])  
     if ret:
-        print "Flowspace %s has been updated." % args[0]
+        print "Flowspace %s was updated with request id %s" % (args[0], ret)
 
 def do_listVersion(gopts, opts, args):
     passwd = getPassword(gopts)
@@ -658,6 +666,21 @@ def do_listrewritedb(gopts, opts, args):
     for fbe in ret:
         print fbe
 
+def pa_listFSStatus(args, cmd):
+    usage = "%s <fs-id>" % USAGE.format(cmd)
+    (sdesc, ldesc) = DESCS[cmd]
+    parser = OptionParser(usage, description=ldesc)
+    return parser.parse_args(args)
+
+def do_listFSStatus(gopts, opts, args):
+    if len(args) != 1:
+        print "list-fs-status : Please specify a flowspace id"
+        sys.exit()
+    passwd = getPassword(gopts)
+    req = { 'fs-id' : int(args[0]) }
+    ret = connect(gopts, "list-fs-status", passwd, data=req)
+    print "FlowSpace Request id %s : %s" % (args[0], ret)
+
 
 def pa_help(args, cmd):
     usage = "%s <cmd>" % USAGE.format(cmd)
@@ -714,6 +737,10 @@ def connect(opts, cmd, passwd, data=None):
             sys.exit(1)
         else:
             print e
+    except urllib2.URLError, e:
+        print "Could not reach a FlowVisor RPC server at %s:%s." % (opts.host, opts.port) 
+        print "Please check that FlowVisor is running and try again."
+        sys.exit(1)
     except RuntimeError, e:
         print e
 
@@ -731,6 +758,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)
 
@@ -766,10 +801,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),
@@ -799,6 +834,7 @@ def print_help(option, opt, value, parser):
     'save-config' : (pa_saveConfig, do_saveConfig),
     'get-config' : (pa_getConfig, do_getConfig),
     'set-config' : (pa_setConfig, do_setConfig),
+    'list-fs-status' : (pa_listFSStatus, do_listFSStatus),
     'list-slice-info' : (pa_listSliceInfo, do_listSliceInfo),
     'list-datapaths' : (pa_none, do_listDatapaths),
     'list-datapath-info' : (pa_listDatapathInfo, do_listDatapathInfo),
@@ -822,7 +858,7 @@ def print_help(option, opt, value, parser):
     -32603 : "Internal Error"
 }
 
-USAGE="%prog {}"
+USAGE="%prog {0}"
 
 URL = "https://%s:%s"
 
@@ -907,6 +943,14 @@ def print_help(option, opt, value, parser):
                     "global flood permissions. For flowmod limits, the limit is set per slice per dpid. The dpid in "
                     "case could be 'any'."
                    )),
+    'list-fs-status' : ("Check the insertion status of a add-flowspace or update-flowspace request.",
+                   ("In some cases, inserting FlowSpace can take a long time. This command allows you to check "
+                    "whether the FlowSpace request has been processed or rejected. Return values are: UNKNOWN, PENDING, "
+                    "SUCCESS, or an error message. PENDING means the request has not been handled yet, UNKNOWN means the "
+                    "given id is not known to the system and SUCCESS means the request was successfully handled. An error "
+                    "is returned when a request fails."
+                   )),
+
     'list-slice-info' : ("Displays slice information",
                     ("Displays slice information about the configured slices at the FlowVisor, "
                     "including the current message rate and the number of currently installed "

src/org/flowvisor/FlowVisor.java

@@ -40,7 +40,7 @@ public class FlowVisor {
 	public final static int FLOWVISOR_VENDOR_EXTENSION = 0x80000001;
 
 	// VERSION
-	public final static String FLOWVISOR_VERSION = "flowvisor-1.0.0";
+	public final static String FLOWVISOR_VERSION = "flowvisor-1.0.7";
 	public final static int FLOWVISOR_DB_VERSION = 2;
 
 
@@ -66,7 +66,7 @@ public class FlowVisor {
 			new Option("l", "logging", "Log to stderr instead of syslog"),
 			new Option("p", "port", 0, "Override OpenFlow port from config"),
 			new Option("h", "help", "Print help"),
-			new Option("j", "JSON web api port",8080, "Override JSON API port from config"),
+			new Option("j", "JSON web api port",8081, "Override JSON API port from config"),
 
 	});
 
@@ -111,7 +111,7 @@ public int getJettyPort(){
 	 */
 	public void setPort(int port) {
 		try {
-			FlowvisorImpl.getProxy().setAPIWSPort(port);
+			FlowvisorImpl.getProxy().setListenPort(port);
 		} catch (ConfigError e) {
 			FVLog.log(LogLevel.WARN, null, "Failed to set api port");
 		}
@@ -149,6 +149,7 @@ public synchronized boolean unregisterHandler(FVEventHandler handler) {
 	}
 
 	public void run() throws ConfigError, IOException, UnhandledEvent {
+		FVLog.log(LogLevel.DEBUG, null, "HALLO");
 		FlowVisor.setInstance(this);
 		Runtime.getRuntime().addShutdownHook(new ShutdownHook());
 				// init polling loop

src/org/flowvisor/api/JettyServer.java

@@ -29,7 +29,7 @@
 
 public class JettyServer implements Runnable{
 
-	public static final int default_jetty_port = 8080;
+	public static final int default_jetty_port = 8081;
 
 	public static String REALM_NAME = "JETTYREALM";
 	private Server jettyServer;

src/org/flowvisor/api/handlers/ApiHandler.java

@@ -30,6 +30,7 @@ public interface ApiHandler<T> {
 	final static String FQUEUE = "force-enqueue";
 	final static String QUEUE = "queues";
 	final static String SHOW = "show-disabled";
+	final static String FSID = "fs-id";
 
 
 	final static String MSG = "msg";

src/org/flowvisor/api/handlers/ConfigurationHandler.java

@@ -5,6 +5,7 @@
 import org.flowvisor.api.handlers.configuration.AddFlowSpace;
 import org.flowvisor.api.handlers.configuration.AddSlice;
 import org.flowvisor.api.handlers.configuration.GetConfig;
+import org.flowvisor.api.handlers.configuration.ListFSInsertionStatus;
 import org.flowvisor.api.handlers.configuration.ListFlowSpace;
 import org.flowvisor.api.handlers.configuration.ListSlices;
 import org.flowvisor.api.handlers.configuration.ListVersion;
@@ -42,6 +43,7 @@ public class ConfigurationHandler implements RequestHandler {
 		put("save-config", new SaveConfig());
 		put("get-config", new GetConfig());
 		put("set-config", new SetConfig());
+		put("list-fs-status", new ListFSInsertionStatus());
 	}};
 
 

src/org/flowvisor/api/handlers/HandlerUtils.java

@@ -89,13 +89,17 @@ public static FVMatch matchFromMap(Map<String, Object> map)
 
 		String nw_dst = HandlerUtils.<String>fetchField(FVMatch.STR_NW_DST, map, false, null);
 		if (nw_dst != null) {
+			match.setWildcards(wildcards);
 			match.setFromCIDR(nw_dst, FVMatch.STR_NW_DST);
+			wildcards = match.getWildcards();
 			map.remove(FVMatch.STR_NW_DST);
 		}
 
 		String nw_src = HandlerUtils.<String>fetchField(FVMatch.STR_NW_SRC, map, false, null);
 		if (nw_src != null) {
+			match.setWildcards(wildcards);
 			match.setFromCIDR(nw_src, FVMatch.STR_NW_SRC);
+			wildcards = match.getWildcards();
 			map.remove(FVMatch.STR_NW_SRC);
 		}