Differential D905

modify the testcloud code and add a "reboot" option
ClosedPublic
Actions

Authored by lnie on Jun 27 2016, 7:59 AM.

Details

Reviewers
lbrabec
jskladan
Group Reviewers
testcloud
Commits
rTCLOUDe3b12a700a1c: modify the testcloud code and add a "reboot" option
Summary

print the ip of vm to screen when users try to start an existing testcloud instance,so they can easily know ssh to where
add a "reboot" option for users who do some work to testcloud instance and want to see what will happen after a reboot

Test Plan

Just start an existing instance and see whether the ip is printed to the screen
reboot a running instance and check whether the option works well

Diff Detail

Repository
rTCLOUD testcloud
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
lnie retitled this revision from to modify the testcloud code and add a "reboot" option.Jun 27 2016, 7:59 AM
lnie updated this object.
lnie edited the test plan for this revision. (Show Details)
lnie added a reviewer: testcloud.
lnie added a subscriber: tflink.
jskladan requested changes to this revision.Jun 27 2016, 1:39 PM
jskladan mentioned this in D899: validate raw.xz-ended img for disposable minion.
jskladan added a reviewer: jskladan.
jskladan added a subscriber: jskladan.

It seems like you wrapped changes for two different tickets into one diff, which ended up in both reviews (D899 and D905). Please make sure just the relevant changes are present in the Differentials.

testcloud/cli.py
121

Use os.path.join() instead.

163

Please add docstring.

This revision now requires changes to proceed.Jun 27 2016, 1:40 PM
lnie updated this revision to Diff 2309.Jun 28 2016, 6:58 AM

update the diff using hints from the review

jskladan accepted this revision.Jun 28 2016, 11:58 AM
This revision is now accepted and ready to land.Jun 28 2016, 11:58 AM
lbrabec accepted this revision.Jul 11 2016, 11:30 AM
kparal added a subscriber: kparal.Jul 11 2016, 11:38 AM

I pushed this to the testcloud repo. Lili, next time, please base your patches on the dev branch, not master. I had to rebase it, but fortunately it had no conflicts. Also, you might want to set up your proper name and email in ~/.config/git/config.

Closed by commit rTCLOUDe3b12a700a1c: modify the testcloud code and add a "reboot" option (authored by lnie, committed by kparal). · Explain WhyJul 11 2016, 11:38 AM
This revision was automatically updated to reflect the committed changes.
lnie added a comment.Jul 12 2016, 4:36 AM
In D905#17442, @kparal wrote:

I pushed this to the testcloud repo. Lili, next time, please base your patches on the dev branch, not master. I had to rebase it, but fortunately it had no conflicts. Also, you might want to set up your proper name and email in ~/.config/git/config.

Thanks a lot for your gentle help and useful information : )

Revision Contents

PathPackages
Mtestcloud/cli.py (28 lines)

Diff 2365

View Options

testcloud/cli.py

1#!/usr/bin/env python 1​#!/usr/bin/env python
2# -*- coding: utf-8 -*- 2​# -*- coding: utf-8 -*-
3# Copyright 2015, Red Hat, Inc. 3​# Copyright 2015, Red Hat, Inc.
4# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+> 4​# License: GPL-2.0+ <http://spdx.org/licenses/GPL-2.0+>
5# See the LICENSE file for more details on Licensing 5​# See the LICENSE file for more details on Licensing
6 6​
7""" 7​"""
8This is the primary user entry point for testcloud 8​This is the primary user entry point for testcloud
9""" 9​"""
10 10​
11import argparse 11​import argparse
12import logging 12​import logging
13from time import sleep 13​from time import sleep
14 14​import os
15from . import config 15​from . import config
16from . import image 16​from . import image
17from . import instance 17​from . import instance
18from . import util 18​from . import util
19from .exceptions import DomainNotFoundError, TestcloudCliError, TestcloudInstanceError 19​from .exceptions import DomainNotFoundError, TestcloudCliError, TestcloudInstanceError
20 20​
21config_data = config.get_config() 21​config_data = config.get_config()
22 22​
▲ Show 20 Lines • Show All 90 Lines • ▼ Show 20 Line(s)106def _start_instance(args):
113 113​
114 tc_instance = instance.find_instance(args.name) 114​ tc_instance = instance.find_instance(args.name)
115 115​
116 if tc_instance is None: 116​ if tc_instance is None:
117 raise TestcloudCliError("Cannot start instance {} because it does " 117​ raise TestcloudCliError("Cannot start instance {} because it does "
118 "not exist".format(args.name)) 118​ "not exist".format(args.name))
119 119​
120 tc_instance.start(args.timeout) 120​ tc_instance.start(args.timeout)
121​ with open(os.path.join(config_data.DATA_DIR, 'instances', args.name, 'ip'), 'r') as ip_file:
jskladanUnsubmitted
Not Done

Use os.path.join() instead.

122​ vm_ip = ip_file.read()
123​ print("The IP of vm {}: {}".format(args.name, vm_ip))
121 124​
122 125​
123def _stop_instance(args): 126​def _stop_instance(args):
124 """Handler for 'instance stop' command. Expects the following elements in args: 127​ """Handler for 'instance stop' command. Expects the following elements in args:
125 * name(str) 128​ * name(str)
126 129​
127 :param args: args from argparser 130​ :param args: args from argparser
128 """ 131​ """
Show All 23 Lines154 raise TestcloudCliError("Cannot remove instance {} because it does "
152 "not exist".format(args.name)) 155​ "not exist".format(args.name))
153 156​
154 if args.force: 157​ if args.force:
155 tc_instance.stop() 158​ tc_instance.stop()
156 159​
157 tc_instance.destroy() 160​ tc_instance.destroy()
158 161​
159 162​
163​def _reboot_instance(args):
jskladanUnsubmitted
Not Done

Please add docstring.

164​ """Handler for 'instance reboot' command. Expects the following elements in args:
165​ * name(str)
166​
167​ :param args: args from argparser
168​ """
169​ _stop_instance(args)
170​ _start_instance(args)
171​
172​
160################################################################################ 173​################################################################################
161# image handling functions 174​# image handling functions
162################################################################################ 175​################################################################################
163def _list_image(args): 176​def _list_image(args):
164 """Handler for 'image list' command. Does not expect anything else in args. 177​ """Handler for 'image list' command. Does not expect anything else in args.
165 178​
166 :param args: args from argparser 179​ :param args: args from argparser
167 """ 180​ """
▲ Show 20 Lines • Show All 55 Lines • ▼ Show 20 Line(s)231 instarg_start.add_argument("--timeout",
223 default=config_data.BOOT_TIMEOUT) 236​ default=config_data.BOOT_TIMEOUT)
224 instarg_start.set_defaults(func=_start_instance) 237​ instarg_start.set_defaults(func=_start_instance)
225 238​
226 # instance stop 239​ # instance stop
227 instarg_stop = instarg_subp.add_parser("stop", help="stop instance") 240​ instarg_stop = instarg_subp.add_parser("stop", help="stop instance")
228 instarg_stop.add_argument("name", 241​ instarg_stop.add_argument("name",
229 help="name of instance to stop") 242​ help="name of instance to stop")
230 instarg_stop.set_defaults(func=_stop_instance) 243​ instarg_stop.set_defaults(func=_stop_instance)
231 ​
232 # instance destroy 244​ # instance destroy
233 instarg_destroy = instarg_subp.add_parser("destroy", help="destroy instance") 245​ instarg_destroy = instarg_subp.add_parser("destroy", help="destroy instance")
234 instarg_destroy.add_argument("name", 246​ instarg_destroy.add_argument("name",
235 help="name of instance to destroy") 247​ help="name of instance to destroy")
236 instarg_destroy.add_argument("-f", 248​ instarg_destroy.add_argument("-f",
237 "--force", 249​ "--force",
238 help="Stop the instance if it's running", 250​ help="Stop the instance if it's running",
239 action="store_true") 251​ action="store_true")
240 instarg_destroy.set_defaults(func=_destroy_instance) 252​ instarg_destroy.set_defaults(func=_destroy_instance)
241 253​ # instance reboot
254​ instarg_reboot = instarg_subp.add_parser("reboot", help="reboot instance")
255​ instarg_reboot.add_argument("name",
256​ help="name of instance to reboot")
257​ instarg_reboot.add_argument("--timeout",
258​ help="Time (in seconds) to wait for boot to "
259​ "complete before completion, setting to 0"
260​ " disables all waiting.",
261​ type=int,
262​ default=config_data.BOOT_TIMEOUT)
263​ instarg_reboot.set_defaults(func=_reboot_instance)
242 # instance create 264​ # instance create
243 instarg_create = instarg_subp.add_parser("create", help="create instance") 265​ instarg_create = instarg_subp.add_parser("create", help="create instance")
244 instarg_create.set_defaults(func=_create_instance) 266​ instarg_create.set_defaults(func=_create_instance)
245 instarg_create.add_argument("name", 267​ instarg_create.add_argument("name",
246 help="name of instance to create") 268​ help="name of instance to create")
247 instarg_create.add_argument("--ram", 269​ instarg_create.add_argument("--ram",
248 help="Specify the amount of ram in MiB for the VM.", 270​ help="Specify the amount of ram in MiB for the VM.",
249 type=int, 271​ type=int,
▲ Show 20 Lines • Show All 97 Lines • Show Last 20 Lines