Expose -C option of portstats.

PF WARNING: several "pass" statements were used in the making of
this commit.

xmlrpc/emulabserver.py.in

 #! /usr/bin/env python
 #
-# Copyright (c) 2004-2015 University of Utah and the Flux Group.
+# Copyright (c) 2004-2016 University of Utah and the Flux Group.
 # 
 # {{{EMULAB-LICENSE
 # 
@@ -2869,6 +2869,11 @@ class experiment:
                     argstr += " -p "
                     pass
                 pass
+            elif opt == "control-net":
+                if xbool(val):
+                    argstr += " -C "
+                    pass
+                pass
             elif opt == "proj":
                 proj = val;
                 pass

xmlrpc/script_wrapper.py.in

@@ -1016,7 +1016,7 @@ class portstats:
 
     def apply(self):
         try:
-            opts, req_args = getopt.getopt(self.argv, "azqcpe", [ "help" ]);
+            opts, req_args = getopt.getopt(self.argv, "azqcpeC", [ "help" ]);
             pass
         except getopt.error, e:
             print e.args[0]
@@ -1047,6 +1047,9 @@ class portstats:
             elif opt == "-p":
                 params["physnames"] = "yes";
                 pass
+            elif opt == "-C":
+                params["control-net"] = "yes";
+                pass
             pass
 
         # Do this after so --help is seen.
@@ -1079,6 +1082,8 @@ class portstats:
         print "    -c    - Print absolute, rather than relative, counts";
         print "    -p    - The machines given are physical, not virtual, node";
         print "            IDs. No pid and eid should be given with this option";
+        print "    -C    - Show counters for the control network interface ";
+        print "            rather than experimental interfaces";
         print "";
         print "If only pid and eid are given, prints out information about all";
         print "ports in the experiment. Otherwise, output is limited to the";