More cleanup

1 files changed, 13 insertions, 11 deletions

diff --git a/system-version-manager/system-version-manager b/system-version-manager/system-version-manager
index aa27b2c..0581a4c 100755
--- a/system-version-manager/system-version-manager
+++ b/system-version-manager/system-version-manager
@@ -52,7 +52,7 @@ class SystemVersionManager(object):
         # create the parser for the "deploy" command
         parser_deploy= subparsers.add_parser('deploy',
             help='deploy an updated base OS version to the running Baserock system')
-        parser_deploy.set_defaults(action='deploy')
+        parser_deploy.set_defaults(action=self.cmd_deploy)
         parser_deploy.add_argument('location')
 
         # create the parser for the "upgrade" command
@@ -64,23 +64,23 @@ class SystemVersionManager(object):
         # create the parser for the "get-default" command
         parser_get_default = subparsers.add_parser('get-default',
             help='prints the default system')
-        parser_get_default.set_defaults(action='get-default')
+        parser_get_default.set_defaults(action=self.cmd_get_default)
 
         # create the parser for the "get-running" command
         parser_get_running = subparsers.add_parser('get-running',
             help='prints the running system')
-        parser_get_running.set_defaults(action='get-running')
+        parser_get_running.set_defaults(action=self.cmd_get_running)
 
         # create the parser for the "remove" command
         parser_remove = subparsers.add_parser('remove', help='remove a system')
         parser_remove.add_argument('system_name', help='name of the system to remove')
-        parser_remove.set_defaults(action='remove')
+        parser_remove.set_defaults(action=self.cmd_remove)
 
         # create the parser for the "set-default" command
         parser_set_default = subparsers.add_parser('set-default',
             help='set a system as default')
         parser_set_default.add_argument('system_name', help='name of the system to set')
-        parser_set_default.set_defaults(action='set-default')
+        parser_set_default.set_defaults(action=self.cmd_set_default)
 
         self.args = parser.parse_args(args[1:])
 
@@ -163,7 +163,7 @@ class SystemVersionManager(object):
     def cmd_get_default(self, _):
         print self._get_default()
 
-    def cmd_get_running(self):
+    def cmd_get_running(self, _):
         print self.current_system
 
     def _parse_deploy_location(self, location):
@@ -176,7 +176,7 @@ class SystemVersionManager(object):
                     "/systems/$LABEL/orig" % location)
         return label
 
-    def cmd_deploy(self, location):
+    def cmd_deploy(self, args):
         '''Client-side deployment of a new base OS version.
 
         This code assumes that the 'orig' subvolume has been correctly created
@@ -185,7 +185,7 @@ class SystemVersionManager(object):
 
         '''
 
-        label = self._parse_deploy_location(location)
+        label = self._parse_deploy_location(args.location)
         version_root = os.path.join(self.mount_dir, 'systems', label)
 
         orig_dir = os.path.join(version_root, 'orig')
@@ -253,7 +253,8 @@ class SystemVersionManager(object):
         device = os.path.realpath(device)
         return device, current_system
 
-    def cmd_remove (self, system_name):
+    def cmd_remove (self, args):
+        system_name = args.system_name
         self._check_system_exists(system_name)
 
         default_system = self._get_default()
@@ -268,7 +269,7 @@ class SystemVersionManager(object):
         self.status(msg="Removing system: %s" % system_name)
         system_root = os.path.join(self.mount_dir, 'systems', system_name)
 
-        # We are not controlling if deleting the suvolume fails
+        # We are not controlling if deleting the subvolume fails
         subprocess.call(['btrfs', 'subvolume', 'delete',
             os.path.join(system_root, 'run')])
         subprocess.call(['btrfs', 'subvolume', 'delete',
@@ -277,7 +278,8 @@ class SystemVersionManager(object):
 
         self._rewrite_boot_menu(self.device, default_system, self._get_systems())
 
-    def cmd_set_default (self, system_name):
+    def cmd_set_default (self, args):
+        system_name = args.system_name
         self._check_system_exists(system_name)
         self._rewrite_boot_menu(self.device, system_name, self._get_systems())