| roshi | |
| tflink |
Do not touch global logging configuration when running in library mode,
do that only when running as the main script.
seems to work from taskotron
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | testcloud/cli.py (15 lines) | |||
| M | testcloud/instance.py (3 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| 50dc1eeb1aa6 | 6e50502f41c3 | 23b2d15a8d5c | Kamil Páral | only top-level NullHandler is needed | Aug 28 2015, 8:00 AM |
| 23b2d15a8d5c | 75995cd401e7 | 98b1f77e5eeb | Kamil Páral | logging: behave in a library mode (Show More…) | Aug 27 2015, 10:19 AM |
| Show All 14 Lines | |||||
| 15 | from . import config | 15 | from . import config | ||
| 16 | from . import image | 16 | from . import image | ||
| 17 | from . import instance | 17 | from . import instance | ||
| 18 | from . import util | 18 | from . import util | ||
| 19 | from .exceptions import DomainNotFoundError, TestcloudCliError | 19 | from .exceptions import DomainNotFoundError, TestcloudCliError | ||
| 20 | 20 | | |||
| 21 | config_data = config.get_config() | 21 | config_data = config.get_config() | ||
| 22 | 22 | | |||
| 23 | log = logging.getLogger('libtestcloud') | 23 | log = logging.getLogger('testcloud') | ||
| 24 | logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.DEBUG) | 24 | log.addHandler(logging.NullHandler()) # this is needed when running in library mode | ||
| 25 | 25 | | |||
| 26 | description = """Testcloud is a small wrapper program designed to quickly and | 26 | description = """Testcloud is a small wrapper program designed to quickly and | ||
| 27 | simply boot images designed for cloud systems.""" | 27 | simply boot images designed for cloud systems.""" | ||
| 28 | 28 | | |||
| 29 | 29 | | |||
| 30 | ################################################################################ | 30 | ################################################################################ | ||
| 31 | # instance handling functions | 31 | # instance handling functions | ||
| 32 | ################################################################################ | 32 | ################################################################################ | ||
| ▲ Show 20 Lines • Show All 215 Lines • ▼ Show 20 Line(s) | 174 | def get_argparser(): | |||
| 248 | imgarg_destroy = imgarg_subp.add_parser("destroy", help="destroy image") | 248 | imgarg_destroy = imgarg_subp.add_parser("destroy", help="destroy image") | ||
| 249 | imgarg_destroy.add_argument("name", | 249 | imgarg_destroy.add_argument("name", | ||
| 250 | help="name of image to destroy") | 250 | help="name of image to destroy") | ||
| 251 | imgarg_destroy.set_defaults(func=_destroy_image) | 251 | imgarg_destroy.set_defaults(func=_destroy_image) | ||
| 252 | 252 | | |||
| 253 | return parser | 253 | return parser | ||
| 254 | 254 | | |||
| 255 | 255 | | |||
| 256 | def _configure_logging(level=logging.DEBUG): | ||||
| 257 | '''Set up logging framework, when running in main script mode. Should not | ||||
| 258 | be called when running in library mode. | ||||
| 259 | | ||||
| 260 | :param int level: the stream log level to be set (one of the constants from logging.*) | ||||
| 261 | ''' | ||||
| 262 | logging.basicConfig(format='%(levelname)s:%(message)s', level=level) | ||||
| 263 | | ||||
| 264 | | ||||
| 256 | def main(): | 265 | def main(): | ||
| 257 | parser = get_argparser() | 266 | parser = get_argparser() | ||
| 258 | args = parser.parse_args() | 267 | args = parser.parse_args() | ||
| 259 | 268 | | |||
| 269 | _configure_logging() | ||||
| 270 | | ||||
| 260 | args.func(args) | 271 | args.func(args) | ||
| 261 | 272 | | |||
| 262 | 273 | | |||
| 263 | def find_vm_ip(name): | 274 | def find_vm_ip(name): | ||
| 264 | """Finds the ip of a local vm given it's name used by libvirt. | 275 | """Finds the ip of a local vm given it's name used by libvirt. | ||
| 265 | 276 | | |||
| 266 | :param name: name of the VM (as used by libvirt) | 277 | :param name: name of the VM (as used by libvirt) | ||
| 267 | :returns: ip address of VM | 278 | :returns: ip address of VM | ||
| Show All 35 Lines | |||||
| Show First 20 Lines • Show All 284 Lines • ▼ Show 20 Line(s) | 263 | def spawn_vm(self): | |||
|---|---|---|---|---|---|
| 285 | if self.graphics: | 285 | if self.graphics: | ||
| 286 | boot_args.extend(['--noautoconsole']) | 286 | boot_args.extend(['--noautoconsole']) | ||
| 287 | 287 | | |||
| 288 | if self.vnc: | 288 | if self.vnc: | ||
| 289 | boot_args.extend(['-vnc', '0.0.0.0:1']) | 289 | boot_args.extend(['-vnc', '0.0.0.0:1']) | ||
| 290 | 290 | | |||
| 291 | vm = subprocess.Popen(boot_args) | 291 | vm = subprocess.Popen(boot_args) | ||
| 292 | 292 | | |||
| 293 | log.info("Successfully booted your local cloud image!") | 293 | log.info("Successfully booted your local cloud image! PID: %d" % vm.pid) | ||
| 294 | log.info("PID: %d" % vm.pid) | | |||
| 295 | 294 | | |||
| 296 | return vm | 295 | return vm | ||
| 297 | 296 | | |||
| 298 | def expand_qcow(self, size="+10G"): | 297 | def expand_qcow(self, size="+10G"): | ||
| 299 | """Expand the storage for a qcow image. Currently only used for Atomic | 298 | """Expand the storage for a qcow image. Currently only used for Atomic | ||
| 300 | Hosts.""" | 299 | Hosts.""" | ||
| 301 | 300 | | |||
| 302 | log.info("expanding qcow2 image {}".format(self.image_path)) | 301 | log.info("expanding qcow2 image {}".format(self.image_path)) | ||
| ▲ Show 20 Lines • Show All 80 Lines • Show Last 20 Lines | |||||