Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tools: adjust for qubesmgmt module

Browse Source 
For now comment out HelpPropertiesAction, as we don't have VM classes
here and accessing properties help require VM instances.
This needs some better idea...
This commit is contained in:
Marek Marczykowski-Górecki 2017-02-27 23:50:36 +01:00
parent 2e2ce8454b
commit a813d50267
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
qubesmgmt/tools/__init__.py
View File

@ -1,3 +1,4 @@
# encoding=utf-8
# #
# The Qubes OS Project, https://www.qubes-os.org/ # The Qubes OS Project, https://www.qubes-os.org/
# #
@ -32,7 +33,8 @@ import subprocess
import sys import sys
import textwrap import textwrap
import qubes.log import qubesmgmt.log
import qubesmgmt.exc
#: constant returned when some action should be performed on all qubes #: constant returned when some action should be performed on all qubes
VM_ALL = object() VM_ALL = object()
@ -105,46 +107,47 @@ class SinglePropertyAction(argparse.Action):
if self.const is None else self.const if self.const is None else self.const
class HelpPropertiesAction(argparse.Action): # class HelpPropertiesAction(argparse.Action):
'''Action for argument parser that displays all properties and exits.''' # '''Action for argument parser that displays all properties and exits.'''
# pylint: disable=redefined-builtin,too-few-public-methods # # pylint: disable=redefined-builtin,too-few-public-methods
def __init__(self, # def __init__(self,
option_strings, # option_strings,
klass=None, # klass=None,
dest=argparse.SUPPRESS, # dest=argparse.SUPPRESS,
default=argparse.SUPPRESS, # default=argparse.SUPPRESS,
help='list all available properties with short descriptions' # help='list all available properties with short descriptions'
' and exit'): # ' and exit'):
super(HelpPropertiesAction, self).__init__( # super(HelpPropertiesAction, self).__init__(
option_strings=option_strings, # option_strings=option_strings,
dest=dest, # dest=dest,
default=default, # default=default,
nargs=0, # nargs=0,
help=help) # help=help)
#
# late import because of circular dependency # # late import because of circular dependency
import qubes # pylint: disable=redefined-outer-name # import qubes # pylint: disable=redefined-outer-name
self._klass = klass if klass is not None else qubes.Qubes # self._klass = klass if klass is not None else qubes.Qubes
#
#
def __call__(self, parser, namespace, values, option_string=None): # def __call__(self, parser, namespace, values, option_string=None):
# pylint: disable=redefined-outer-name # # pylint: disable=redefined-outer-name
properties = self._klass.property_list() # properties = self._klass.property_list()
width = max(len(prop.__name__) for prop in properties) # width = max(len(prop.__name__) for prop in properties)
wrapper = textwrap.TextWrapper(width=80, # wrapper = textwrap.TextWrapper(width=80,
initial_indent=' ', subsequent_indent=' ' * (width + 6)) # initial_indent=' ', subsequent_indent=' ' * (width + 6))
#
text = 'Common properties:\n' + '\n'.join( # text = 'Common properties:\n' + '\n'.join(
wrapper.fill('{name:{width}s} {doc}'.format( # wrapper.fill('{name:{width}s} {doc}'.format(
name=prop.__name__, # name=prop.__name__,
doc=qubes.utils.format_doc(prop.__doc__) if prop.__doc__ else'', # doc=qubesmgmt.utils.format_doc(prop.__doc__) if prop.__doc__
width=width)) # else'',
for prop in sorted(properties)) # width=width))
if self._klass is not qubes.Qubes: # for prop in sorted(properties))
text += '\n\n' \ # if self._klass is not qubes.Qubes:
'There may be more properties in specific domain classes.\n' # text += '\n\n' \
parser.exit(message=text) # 'There may be more properties in specific domain classes.\n'
# parser.exit(message=text)
#
class VmNameAction(QubesAction): class VmNameAction(QubesAction):
''' Action for parsing one ore multiple domains from provided VMNAMEs ''' ''' Action for parsing one ore multiple domains from provided VMNAMEs '''
@ -290,7 +293,7 @@ class PoolsAction(QubesAction):
try: try:
pools = [app.get_pool(name) for name in pool_names] pools = [app.get_pool(name) for name in pool_names]
setattr(namespace, self.dest, pools) setattr(namespace, self.dest, pools)
except qubes.exc.QubesException as e: except qubesmgmt.exc.QubesException as e:
parser.error(str(e)) parser.error(str(e))
sys.exit(2) sys.exit(2)
@ -357,8 +360,7 @@ class QubesArgumentParser(argparse.ArgumentParser):
if self._want_app and not self._want_app_no_instance: if self._want_app and not self._want_app_no_instance:
self.set_qubes_verbosity(namespace) self.set_qubes_verbosity(namespace)
namespace.app = qubes.Qubes(namespace.app, namespace.app = qubesmgmt.Qubes()
offline_mode=namespace.offline_mode)
if self._want_force_root: if self._want_force_root:
self.dont_run_as_root(namespace) self.dont_run_as_root(namespace)
@ -419,9 +421,9 @@ class QubesArgumentParser(argparse.ArgumentParser):
verbose = namespace.verbose - namespace.quiet verbose = namespace.verbose - namespace.quiet
if verbose >= 2: if verbose >= 2:
qubes.log.enable_debug() qubesmgmt.log.enable_debug()
elif verbose >= 1: elif verbose >= 1:
qubes.log.enable() qubesmgmt.log.enable()
# pylint: disable=no-self-use # pylint: disable=no-self-use
def print_error(self, *args, **kwargs): def print_error(self, *args, **kwargs):
@ -430,16 +432,17 @@ class QubesArgumentParser(argparse.ArgumentParser):
class AliasedSubParsersAction(argparse._SubParsersAction): class AliasedSubParsersAction(argparse._SubParsersAction):
'''SubParser with support for action aliases'''
# source https://gist.github.com/sampsyo/471779 # source https://gist.github.com/sampsyo/471779
# pylint: disable=protected-access,too-few-public-methods # pylint: disable=protected-access,too-few-public-methods,missing-docstring
class _AliasedPseudoAction(argparse.Action): class _AliasedPseudoAction(argparse.Action):
# pylint: disable=redefined-builtin # pylint: disable=redefined-builtin
def __init__(self, name, aliases, help): def __init__(self, name, aliases, help):
dest = name dest = name
if aliases: if aliases:
dest += ' (%s)' % ','.join(aliases) dest += ' (%s)' % ','.join(aliases)
sup = super(AliasedSubParsersAction._AliasedPseudoAction, self) super(AliasedSubParsersAction._AliasedPseudoAction, self).\
sup.__init__(option_strings=[], dest=dest, help=help) __init__(option_strings=[], dest=dest, help=help)
def __call__(self, **kwargs): def __call__(self, **kwargs):
super(AliasedSubParsersAction._AliasedPseudoAction, self).__call__( super(AliasedSubParsersAction._AliasedPseudoAction, self).__call__(