Differential D394

fix: made code PEP8 compliant. Fixes T506.
ClosedPublic
Actions

Authored by roshi on Jun 16 2015, 9:33 PM.

Details

Reviewers
tflink
Maniphest Tasks
T506: Make code PEP8 Compliant
Commits
rTCLOUD66d11438a3c7: fix: made code PEP8 compliant. Fixes T506.
rTCLOUD1464a51bfeb1: fix: added flake8 config to tox
Test Plan
Ran through test suite. Tested functionality locally.

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.
roshi added a task: T506: Make code PEP8 Compliant.Jun 16 2015, 9:33 PM
roshi retitled this revision from to fix: made code PEP8 compliant. Fixes T506..
roshi updated this object.
roshi edited the test plan for this revision. (Show Details)
roshi added a reviewer: tflink.
tflink added a comment.Jun 16 2015, 10:12 PM

Overall, it looks good to me but I think the config should be in the repo - either a tox.ini or setup.cfg file

roshi updated this revision to Diff 1043.Jun 16 2015, 10:53 PM
  • fix: added flake8 config to tox
This revision is now accepted and ready to land.Jun 16 2015, 11:10 PM
Closed by commit rTCLOUD66d11438a3c7: fix: made code PEP8 compliant. Fixes T506. (authored by roshi). · Explain WhyJun 16 2015, 11:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathPackages
Mconf/settings-example.py (3 lines)
Msetup.py (25 lines)
Mtest/test_cli.py (2 lines)
Mtest/test_config.py (2 lines)
Mtest/test_image.py (2 lines)
Mtest/test_instance.py (4 lines)
MtestCloud/cli.py (85 lines)
MtestCloud/config.py (4 lines)
MtestCloud/exceptions.py (4 lines)
MtestCloud/image.py (9 lines)
MtestCloud/instance.py (59 lines)
MtestCloud/util.py (7 lines)

Diff 1044

View Options

conf/settings-example.py

1import os ​
2 ​
3 ​
4# Commented out default values with details are displayed below. To override 1​# Commented out default values with details are displayed below. To override
5# these default values, uncomment the values, rename the file to settings.py 2​# these default values, uncomment the values, rename the file to settings.py
6# and place it in a supported config location 3​# and place it in a supported config location
7 4​
8# Do not modify this file directly, it will not be picked up unless the filename 5​# Do not modify this file directly, it will not be picked up unless the filename
9# is changed to settings.py 6​# is changed to settings.py
10 7​
11#DOWNLOAD_PROGRESS = True 8​#DOWNLOAD_PROGRESS = True
Show All 30 Lines
View Options

setup.py

1from setuptools import setup, Command 1​from setuptools import setup
2 2​
3import testCloud 3​import testCloud
4 4​
5 5​
6setup(name='testCloud', 6​setup(name='testCloud',
7 version=testCloud.__version__, 7​ version=testCloud.__version__,
8 description="small helper script to download and boot cloud images locally", 8​ description="small helper script to download and "
9 author="Mike Ruckman", 9​ "boot cloud images locally",
10 author_email="roshi@fedoraproject.org", 10​ author="Mike Ruckman",
11 license="GPLv2+", 11​ author_email="roshi@fedoraproject.org",
12 url="https://github.com/Rorosha/testCloud", 12​ license="GPLv2+",
13 packages=["testCloud"], 13​ url="https://github.com/Rorosha/testCloud",
14 package_dir={"testCloud":"testCloud"}, 14​ packages=["testCloud"],
15 include_package_data=True, 15​ package_dir={"testCloud": "testCloud"},
16 entry_points=dict(console_scripts=["testCloud=testCloud.cli:main"]), 16​ include_package_data=True,
17) 17​ entry_points=dict(console_scripts=["testCloud=testCloud.cli:main"]),
18​ )
View Options

test/test_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""" This module is for testing the behaviour of cli functions.""" 7​""" This module is for testing the behaviour of cli functions."""
8 8​
9class TestCLI: ​
10 9​
10​class TestCLI:
11 def test_run(self): 11​ def test_run(self):
12 pass 12​ pass
13 13​
14 def test_main(self): 14​ def test_main(self):
15 pass 15​ pass
View Options

test/test_config.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​
7from testCloud import config 7​from testCloud import config
8 8​
9 9​
10REF_DATA_DIR = "/some/random/dir/for/testing/" 10​REF_DATA_DIR = "/some/random/dir/for/testing/"
11REF_CACHE_DIR = "/some/random/dir/for/testing/cache/" 11​REF_CACHE_DIR = "/some/random/dir/for/testing/cache/"
12REF_CONF_CONTENTS = """DATA_DIR = "{}" 12​REF_CONF_CONTENTS = """DATA_DIR = "{}"
13CACHE_DIR = "{}/cache" 13​CACHE_DIR = "{}/cache"
14""".format(REF_DATA_DIR, REF_CACHE_DIR) 14​""".format(REF_DATA_DIR, REF_CACHE_DIR)
15 15​
16​
16class TestConfig(object): 17​class TestConfig(object):
17 def setup_method(self, method): 18​ def setup_method(self, method):
18 config._config = None 19​ config._config = None
19 20​
20 def test_get_config_object(self, monkeypatch): 21​ def test_get_config_object(self, monkeypatch):
21 '''Simple test to grab a config object, will return default config 22​ '''Simple test to grab a config object, will return default config
22 values. 23​ values.
23 ''' 24​ '''
▲ Show 20 Lines • Show All 54 Lines • ▼ Show 20 Line(s)73 def test_load_merge_config_file(self, tmpdir, monkeypatch):
78 ref_conf_filename = '{}/{}'.format(refdir, config.CONF_FILE) 79​ ref_conf_filename = '{}/{}'.format(refdir, config.CONF_FILE)
79 with open(ref_conf_filename, 'w+') as ref_conffile: 80​ with open(ref_conf_filename, 'w+') as ref_conffile:
80 ref_conffile.write(REF_CONF_CONTENTS) 81​ ref_conffile.write(REF_CONF_CONTENTS)
81 82​
82 monkeypatch.setattr(config, 'CONF_DIRS', [str(refdir)]) 83​ monkeypatch.setattr(config, 'CONF_DIRS', [str(refdir)])
83 test_config = config.get_config() 84​ test_config = config.get_config()
84 85​
85 assert test_config.DATA_DIR == REF_DATA_DIR 86​ assert test_config.DATA_DIR == REF_DATA_DIR
86 ​
View Options

test/test_image.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""" This module is for testing the behaviour of the Image class.""" 7​""" This module is for testing the behaviour of the Image class."""
8 8​
9import pytest 9​import pytest
10 10​
11from testCloud import image 11​from testCloud import image
12from testCloud.exceptions import TestCloudImageError 12​from testCloud.exceptions import TestCloudImageError
13 13​
14​
14class TestImage: 15​class TestImage:
15 16​
16 def test_image_download_path(self): 17​ def test_image_download_path(self):
17 pass 18​ pass
18 19​
19 def test_image_name(self): 20​ def test_image_name(self):
20 pass 21​ pass
21 22​
22 def test_download(self): 23​ def test_download(self):
23 pass 24​ pass
24 25​
25# def test_save_pristine(self): 26​# def test_save_pristine(self):
26# pass 27​# pass
27# 28​#
28# def test_load_pristine(self): 29​# def test_load_pristine(self):
29# pass 30​# pass
30 31​
32​
31class TestImageUriProcess(object): 33​class TestImageUriProcess(object):
32 """The basic idea of what these tests do is to make sure that uris are 34​ """The basic idea of what these tests do is to make sure that uris are
33 parsed properly. http, https and file are OK and supported. ftp is an 35​ parsed properly. http, https and file are OK and supported. ftp is an
34 an example of a type which is not currently supported and should raise an 36​ an example of a type which is not currently supported and should raise an
35 exception.""" 37​ exception."""
36 38​
37 def setup_method(self, method): 39​ def setup_method(self, method):
38 self.image_name = 'image.img' 40​ self.image_name = 'image.img'
▲ Show 20 Lines • Show All 54 Lines • Show Last 20 Lines
View Options

test/test_instance.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""" This module is for testing the behaviour of the Image class.""" 7​""" This module is for testing the behaviour of the Image class."""
8 8​
9import os 9​import os
10 10​
11import mock 11​import mock
12 12​
13from testCloud import instance, image, config 13​from testCloud import instance, image, config
14 14​
15​
15class TestInstance: 16​class TestInstance:
16 17​
17 def test_expand_qcow(self): 18​ def test_expand_qcow(self):
18 pass 19​ pass
19 20​
20 def test_create_seed(self): 21​ def test_create_seed(self):
21 pass 22​ pass
22 23​
23 def test_set_seed_path(self): 24​ def test_set_seed_path(self):
24 pass 25​ pass
25 26​
26 def test_download_initrd_and_kernel(self): 27​ def test_download_initrd_and_kernel(self):
27 pass 28​ pass
28 29​
29 def test_boot_base(self): 30​ def test_boot_base(self):
30 pass 31​ pass
31 32​
32 def test_boot_atomic(self): 33​ def test_boot_atomic(self):
33 pass 34​ pass
34 35​
35 def test_boot_pristine(self): 36​ def test_boot_pristine(self):
36 pass 37​ pass
37 38​
39​
38class TestFindInstance(object): 40​class TestFindInstance(object):
39 41​
40 def setup_method(self, method): 42​ def setup_method(self, method):
41 self.conf = config.ConfigData() 43​ self.conf = config.ConfigData()
42 44​
43 def test_non_existant_instance(self, monkeypatch): 45​ def test_non_existant_instance(self, monkeypatch):
44 ref_name = 'test-123' 46​ ref_name = 'test-123'
45 ref_image = image.Image('file:///someimage.qcow2') 47​ ref_image = image.Image('file:///someimage.qcow2')
46 48​
47 stub_listdir = mock.Mock() 49​ stub_listdir = mock.Mock()
48 stub_listdir.return_value = [] 50​ stub_listdir.return_value = []
49 monkeypatch.setattr(os, 'listdir', stub_listdir) 51​ monkeypatch.setattr(os, 'listdir', stub_listdir)
50 52​
51 test_instance = instance.find_instance(ref_name, ref_image) 53​ test_instance = instance.find_instance(ref_name, ref_image)
52 54​
53 assert test_instance is None 55​ assert test_instance is None
54 56​
55 ​
56 def test_find_exist_instance(self, monkeypatch): 57​ def test_find_exist_instance(self, monkeypatch):
57 ref_name = 'test-123' 58​ ref_name = 'test-123'
58 ref_image = image.Image('file:///someimage.qcow2') 59​ ref_image = image.Image('file:///someimage.qcow2')
59 ref_path = os.path.join(self.conf.DATA_DIR, 60​ ref_path = os.path.join(self.conf.DATA_DIR,
60 'instances/{}'.format(ref_name)) 61​ 'instances/{}'.format(ref_name))
61 62​
62 stub_listdir = mock.Mock() 63​ stub_listdir = mock.Mock()
63 stub_listdir.return_value = [ref_name] 64​ stub_listdir.return_value = [ref_name]
64 monkeypatch.setattr(os, 'listdir', stub_listdir) 65​ monkeypatch.setattr(os, 'listdir', stub_listdir)
65 66​
66 test_instance = instance.find_instance(ref_name, ref_image) 67​ test_instance = instance.find_instance(ref_name, ref_image)
67 68​
68 assert test_instance.path == ref_path 69​ assert test_instance.path == ref_path
69 ​
View Options

testCloud/cli.py

Show All 12 Lines
13import sys 13​import sys
14from pprint import pprint 14​from pprint import pprint
15 15​
16from . import config 16​from . import config
17from . import image 17​from . import image
18from . import instance 18​from . import instance
19 19​
20# these are used in commented out code, may be reactivated 20​# these are used in commented out code, may be reactivated
21#import os 21​
22from time import sleep 22​from time import sleep
23from . import util 23​from . import util
24#import libvirt ​
25from .exceptions import DomainNotFoundError, TestCloudCliError 24​from .exceptions import DomainNotFoundError, TestCloudCliError
26 25​
27config_data = config.get_config() 26​config_data = config.get_config()
28 27​
29log = logging.getLogger('libtestcloud') 28​log = logging.getLogger('libtestcloud')
30logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.DEBUG) 29​logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.DEBUG)
31 30​
32description = """TestCloud is a small wrapper program designed to quickly and 31​description = """TestCloud is a small wrapper program designed to quickly and
33simply boot images designed for cloud systems.""" 32​simply boot images designed for cloud systems."""
34 33​
35 34​
36################################################################################ 35​################################################################################
37# instance handling functions 36​# instance handling functions
38################################################################################ 37​################################################################################
39 38​
40def _list_instance(args): 39​def _list_instance(args):
41 """Handler for 'instance create' command. Expects the following elements in args: 40​ """Handler for 'list' command. Expects the following elements in args:
42 * name(str) 41​ * name(str)
43 42​
44 :param args: args from argparser 43​ :param args: args from argparser
45 """ 44​ """
46 instances = instance.list_instances() 45​ instances = instance.list_instances()
47 46​
48 print("{:<40} {:<10}".format("Name", "State")) 47​ print("{:<40} {:<10}".format("Name", "State"))
49 print("--------------------------------------------------") 48​ print("--------------------------------------------------")
50 for inst in instances.keys(): 49​ for inst in instances.keys():
51 if args.all or instances[inst] == 'running': 50​ if args.all or instances[inst] == 'running':
52 print("{:<40} {:<10}".format(inst, instances[inst])) 51​ print("{:<40} {:<10}".format(inst, instances[inst]))
53 52​
54 print("") 53​ print("")
55 54​
55​
56def _create_instance(args): 56​def _create_instance(args):
57 """Handler for 'instance create' command. Expects the following elements in args: 57​ """Handler for 'instance create' command. Expects the following elements in args:
58 * name(str) 58​ * name(str)
59 59​
60 :param args: args from argparser 60​ :param args: args from argparser
61 """ 61​ """
62 62​
63 log.debug("create instance") 63​ log.debug("create instance")
64 pprint(args) 64​ pprint(args)
65 65​
66 tc_image = image.Image(args.url) 66​ tc_image = image.Image(args.url)
67 tc_image.prepare() 67​ tc_image.prepare()
68 68​
69 existing_instance = instance.find_instance(args.name, tc_image) 69​ existing_instance = instance.find_instance(args.name, tc_image)
70 70​
71 # can't create existing instances 71​ # can't create existing instances
72 if existing_instance is not None: 72​ if existing_instance is not None:
73 raise TestCloudCliError("A testCloud instance named {} already "\ 73​ raise TestCloudCliError("A testCloud instance named {} already "
74 "exists at {}. Use 'testcloud instance start "\ 74​ "exists at {}. Use 'testcloud instance start "
75 "{}' to start the instance or remove it before"\ 75​ "{}' to start the instance or remove it before"
76 " re-creating ".format(args.name, 76​ " re-creating ".format(args.name,
77 existing_instance.path, 77​ existing_instance.path,
78 args.name)) 78​ args.name))
79 79​
80 else: 80​ else:
81 tc_instance = instance.Instance(args.name, tc_image) 81​ tc_instance = instance.Instance(args.name, tc_image)
82 82​
83 # prepare instance 83​ # prepare instance
84 tc_instance.prepare() 84​ tc_instance.prepare()
85 85​
86 # boot instance 86​ # boot instance
87 tc_instance.spawn_vm() 87​ tc_instance.spawn_vm()
88 88​
89 # find vm ip 89​ # find vm ip
90 vm_ip = find_vm_ip(args.name) 90​ vm_ip = find_vm_ip(args.name)
91 print("The IP of vm {}: {}".format(args.name, vm_ip)) 91​ print("The IP of vm {}: {}".format(args.name, vm_ip))
92 92​
93​
93def _start_instance(args): 94​def _start_instance(args):
94 """Handler for 'instance start' command. Expects the following elements in args: 95​ """Handler for 'instance start' command. Expects the following elements in args:
95 * name(str) 96​ * name(str)
96 97​
97 :param args: args from argparser 98​ :param args: args from argparser
98 """ 99​ """
99 log.debug("start instance: {}".format(args.name)) 100​ log.debug("start instance: {}".format(args.name))
100 101​
101 tc_instance = instance.find_instance(args.name) 102​ tc_instance = instance.find_instance(args.name)
102 103​
103 if tc_instance is None: 104​ if tc_instance is None:
104 raise TestCloudCliError("Cannot start instance {} because it does "\ 105​ raise TestCloudCliError("Cannot start instance {} because it does "
105 "not exist".format(args.name)) 106​ "not exist".format(args.name))
106 107​
107 tc_instance.start() 108​ tc_instance.start()
108 109​
110​
109def _stop_instance(args): 111​def _stop_instance(args):
110 """Handler for 'instance stop' command. Expects the following elements in args: 112​ """Handler for 'instance stop' command. Expects the following elements in args:
111 * name(str) 113​ * name(str)
112 114​
113 :param args: args from argparser 115​ :param args: args from argparser
114 """ 116​ """
115 log.debug("stop instance: {}".format(args.name)) 117​ log.debug("stop instance: {}".format(args.name))
116 118​
117 tc_instance = instance.find_instance(args.name) 119​ tc_instance = instance.find_instance(args.name)
118 120​
119 if tc_instance is None: 121​ if tc_instance is None:
120 raise TestCloudCliError("Cannot stop instance {} because it does "\ 122​ raise TestCloudCliError("Cannot stop instance {} because it does "
121 "not exist".format(args.name)) 123​ "not exist".format(args.name))
122 124​
123 tc_instance.stop() 125​ tc_instance.stop()
124 126​
127​
125def _destroy_instance(args): 128​def _destroy_instance(args):
126 """Handler for 'instance destroy' command. Expects the following elements in args: 129​ """Handler for 'instance destroy' command. Expects the following elements in args:
127 * name(str) 130​ * name(str)
128 131​
129 :param args: args from argparser 132​ :param args: args from argparser
130 """ 133​ """
131 log.debug("destroy instance: {}".format(args.name)) 134​ log.debug("destroy instance: {}".format(args.name))
132 135​
133 tc_instance = instance.find_instance(args.name) 136​ tc_instance = instance.find_instance(args.name)
134 137​
135 if tc_instance is None: 138​ if tc_instance is None:
136 raise TestCloudCliError("Cannot remove instance {} because it does "\ 139​ raise TestCloudCliError("Cannot remove instance {} because it does "
137 "not exist".format(args.name)) 140​ "not exist".format(args.name))
138 141​
139 tc_instance.destroy() 142​ tc_instance.destroy()
140 143​
141 144​
142################################################################################ 145​################################################################################
143# image handling functions 146​# image handling functions
144################################################################################ 147​################################################################################
145def _list_image(args): 148​def _list_image(args):
146 """Handler for 'image list' command. Does not expect anything else in args. 149​ """Handler for 'image list' command. Does not expect anything else in args.
147 150​
148 :param args: args from argparser 151​ :param args: args from argparser
149 """ 152​ """
150 log.debug("list images") 153​ log.debug("list images")
151 images = image.list_images() 154​ images = image.list_images()
152 print("Current Images:") 155​ print("Current Images:")
153 for img in images: 156​ for img in images:
154 print(" {}".format(img)) 157​ print(" {}".format(img))
155 158​
159​
156def _destroy_image(args): 160​def _destroy_image(args):
157 """Handler for 'image destroy' command. Expects the following elements in args: 161​ """Handler for 'image destroy' command. Expects the following elements in args:
158 * name(str) 162​ * name(str)
159 163​
160 :param args: args from argparser 164​ :param args: args from argparser
161 """ 165​ """
162 166​
163 log.debug("destroying image {}".format(args.name)) 167​ log.debug("destroying image {}".format(args.name))
164 168​
165 tc_image = image.find_image(args.name) 169​ tc_image = image.find_image(args.name)
166 170​
167 if tc_image is None: 171​ if tc_image is None:
168 log.error("image {} not found, cannot destroy".format(args.name)) 172​ log.error("image {} not found, cannot destroy".format(args.name))
169 173​
170 tc_image.destroy() 174​ tc_image.destroy()
171 175​
172 176​
173def get_argparser(): 177​def get_argparser():
174 parser = argparse.ArgumentParser(description = description) 178​ parser = argparse.ArgumentParser(description=description)
175 subparsers = parser.add_subparsers(title="Command Types", 179​ subparsers = parser.add_subparsers(title="Command Types",
176 description="Types of commands available", 180​ description="Types of commands available",
177 help="<command> help") 181​ help="<command> help")
178 182​
179 ​
180 instarg = subparsers.add_parser("instance", help="help on instance options") 183​ instarg = subparsers.add_parser("instance", help="help on instance options")
181 instarg.add_argument("-c", 184​ instarg.add_argument("-c",
182 "--connection", 185​ "--connection",
183 default="qemu:///system", 186​ default="qemu:///system",
184 help="libvirt connection url to use") 187​ help="libvirt connection url to use")
185 instarg_subp = instarg.add_subparsers(title="instance commands", 188​ instarg_subp = instarg.add_subparsers(title="instance commands",
186 description="Commands available for instance operations", 189​ description="Commands available for instance operations",
187 help="<command> help") 190​ help="<command> help")
188 191​
189 #instance list 192​ # instance list
190 instarg_list = instarg_subp.add_parser("list", help="list instances") 193​ instarg_list = instarg_subp.add_parser("list", help="list instances")
191 instarg_list.set_defaults(func=_list_instance) 194​ instarg_list.set_defaults(func=_list_instance)
192 instarg_list.add_argument("--all", 195​ instarg_list.add_argument("--all",
193 help="list all instances, running and stopped", 196​ help="list all instances, running and stopped",
194 action="store_true") 197​ action="store_true")
195 198​
196 #instance start 199​ # instance start
197 instarg_start = instarg_subp.add_parser("start", help="start instance") 200​ instarg_start = instarg_subp.add_parser("start", help="start instance")
198 instarg_start.add_argument("name", 201​ instarg_start.add_argument("name",
199 help="name of instance to start") 202​ help="name of instance to start")
200 instarg_start.set_defaults(func=_start_instance) 203​ instarg_start.set_defaults(func=_start_instance)
201 204​
202 #instance stop 205​ # instance stop
203 instarg_stop = instarg_subp.add_parser("stop", help="stop instance") 206​ instarg_stop = instarg_subp.add_parser("stop", help="stop instance")
204 instarg_stop.add_argument("name", 207​ instarg_stop.add_argument("name",
205 help="name of instance to stop") 208​ help="name of instance to stop")
206 instarg_stop.set_defaults(func=_stop_instance) 209​ instarg_stop.set_defaults(func=_stop_instance)
207 210​
208 #instance destroy 211​ # instance destroy
209 instarg_destroy = instarg_subp.add_parser("destroy", help="destroy instance") 212​ instarg_destroy = instarg_subp.add_parser("destroy", help="destroy instance")
210 instarg_destroy.add_argument("name", 213​ instarg_destroy.add_argument("name",
211 help="name of instance to destroy") 214​ help="name of instance to destroy")
212 instarg_destroy.set_defaults(func=_destroy_instance) 215​ instarg_destroy.set_defaults(func=_destroy_instance)
213 216​
214 #instance create 217​ # instance create
215 instarg_create = instarg_subp.add_parser("create", help="create instance") 218​ instarg_create = instarg_subp.add_parser("create", help="create instance")
216 instarg_create.set_defaults(func=_create_instance) 219​ instarg_create.set_defaults(func=_create_instance)
217 instarg_create.add_argument("name", 220​ instarg_create.add_argument("name",
218 help="name of instance to create") 221​ help="name of instance to create")
219 instarg_create.add_argument("--ram", 222​ instarg_create.add_argument("--ram",
220 help="Specify the amount of ram for the VM.", 223​ help="Specify the amount of ram for the VM.",
221 type=int, 224​ type=int,
222 default=512) 225​ default=512)
223 instarg_create.add_argument("--no-graphic", 226​ instarg_create.add_argument("--no-graphic",
224 help="Turn off graphical display.", 227​ help="Turn off graphical display.",
225 action="store_true") 228​ action="store_true")
226 instarg_create.add_argument("--vnc", 229​ instarg_create.add_argument("--vnc",
227 help="Turns on vnc at :1 to the instance.", 230​ help="Turns on vnc at :1 to the instance.",
228 action="store_true") 231​ action="store_true")
229 instarg_create.add_argument("--atomic", 232​ instarg_create.add_argument("--atomic",
230 help="Use this flag if you're booting an Atomic Host.", 233​ help="Use this flag if you're booting an Atomic Host.",
231 action="store_true") 234​ action="store_true")
232 # this might work better as a second, required positional arg 235​ # this might work better as a second, required positional arg
233 instarg_create.add_argument("-u", 236​ instarg_create.add_argument("-u",
234 "--url", 237​ "--url",
235 help="URL to qcow2 image is required.", 238​ help="URL to qcow2 image is required.",
236 type=str) 239​ type=str)
237 ​
238 240​
239 imgarg = subparsers.add_parser("image", help="help on image options") 241​ imgarg = subparsers.add_parser("image", help="help on image options")
240 imgarg_subp = imgarg.add_subparsers(title="subcommands", 242​ imgarg_subp = imgarg.add_subparsers(title="subcommands",
241 description="Types of commands available", 243​ description="Types of commands available",
242 help="<command> help") 244​ help="<command> help")
243 245​
244 #image list 246​ # image list
245 imgarg_list = imgarg_subp.add_parser("list", help="list images") 247​ imgarg_list = imgarg_subp.add_parser("list", help="list images")
246 imgarg_list.set_defaults(func=_list_image) 248​ imgarg_list.set_defaults(func=_list_image)
247 249​
248 #image destroy 250​ # image destroy
249 imgarg_destroy = imgarg_subp.add_parser("destroy", help="destroy image") 251​ imgarg_destroy = imgarg_subp.add_parser("destroy", help="destroy image")
250 imgarg_destroy.add_argument("name", 252​ imgarg_destroy.add_argument("name",
251 help="name of image to destroy") 253​ help="name of image to destroy")
252 imgarg_destroy.set_defaults(func=_destroy_image) 254​ imgarg_destroy.set_defaults(func=_destroy_image)
253 255​
254 return parser 256​ return parser
255 257​
256 258​
Show All 12 Lines259def main():
269 271​
270 tc_image = image.Image(args.url) 272​ tc_image = image.Image(args.url)
271 tc_image.prepare() 273​ tc_image.prepare()
272 274​
273 instance_path = instance.find_instance(args.name, tc_image.name) 275​ instance_path = instance.find_instance(args.name, tc_image.name)
274 276​
275 # for the moment, rebooting existing instances is noworky, so blow up early 277​ # for the moment, rebooting existing instances is noworky, so blow up early
276 if instance_path is not None: 278​ if instance_path is not None:
277 raise NotImplementedError("testCloud does not yet support booting " \ 279​ raise NotImplementedError("testCloud does not yet support booting "
278 "existing instances. Please remove {} before"\ 280​ "existing instances. Please remove {} before"
279 " continuing".format(instance_path)) 281​ " continuing".format(instance_path))
280 282​
281 else: 283​ else:
282 tc_instance = instance.Instance(args.name, tc_image) 284​ tc_instance = instance.Instance(args.name, tc_image)
283 285​
284 # prepare instance 286​ # prepare instance
285 tc_instance.prepare() 287​ tc_instance.prepare()
286 288​
Show All 18 Lines
305def find_vm_ip(name): 307​def find_vm_ip(name):
306 """Finds the ip of a local vm given it's name used by libvirt. 308​ """Finds the ip of a local vm given it's name used by libvirt.
307 309​
308 :param name: name of the VM (as used by libvirt) 310​ :param name: name of the VM (as used by libvirt)
309 :returns: ip address of VM 311​ :returns: ip address of VM
310 :rtype: str 312​ :rtype: str
311 """ 313​ """
312 314​
313 log.info("Don't worry about these 'QEMU Driver' errors. libvirt is whiny " + \ 315​ log.info("Don't worry about these 'QEMU Driver' errors. libvirt is whiny " +
314 "and has no method to shut it up...\n") 316​ "and has no method to shut it up...\n")
315 317​
316 for _ in xrange(100): 318​ for _ in xrange(100):
317 vm_xml = util.get_vm_xml(name) 319​ vm_xml = util.get_vm_xml(name)
318 if vm_xml is not None: 320​ if vm_xml is not None:
319 break 321​ break
320 322​
321 else: 323​ else:
322 sleep(.2) 324​ sleep(.2)
323 else: 325​ else:
324 raise DomainNotFoundError 326​ raise DomainNotFoundError
325 327​
326 vm_mac = util.find_mac(vm_xml) 328​ vm_mac = util.find_mac(vm_xml)
327 vm_mac = vm_mac[0] 329​ vm_mac = vm_mac[0]
328 330​
329 # The arp cache takes some time to populate, so this keeps looking 331​ # The arp cache takes some time to populate, so this keeps looking
330 # for the entry until it shows up. 332​ # for the entry until it shows up.
331 333​
332 for _ in xrange(100): 334​ for _ in xrange(100):
333 vm_ip = util.find_ip_from_mac(vm_mac.attrib['address']) 335​ vm_ip = util.find_ip_from_mac(vm_mac.attrib['address'])
334 336​
335 if vm_ip: break 337​ if vm_ip:
338​ break
339​
336 sleep(.2) 340​ sleep(.2)
337 341​
338 #print("The IP of your VM is: {}".format(vm_ip)) ​
339 return vm_ip 342​ return vm_ip
340 343​
341 344​
342if __name__ == '__main__': 345​if __name__ == '__main__':
343 main() 346​ main()
View Options

testCloud/config.py

1import os 1​import os
2import imp 2​import imp
3 3​
4import testCloud 4​import testCloud
5 5​
6 6​
7CONF_DIRS = [os.path.abspath(os.path.dirname(testCloud.__file__)) + '/../conf', 7​CONF_DIRS = [os.path.abspath(os.path.dirname(testCloud.__file__)) + '/../conf',
8 '{}/.config/testCloud'.format(os.environ['HOME']), 8​ '{}/.config/testCloud'.format(os.environ['HOME']),
9 '/etc/testCloud' 9​ '/etc/testCloud'
10 ] 10​ ]
11 11​
12CONF_FILE = 'settings.py' 12​CONF_FILE = 'settings.py'
13 13​
14_config = None 14​_config = None
15 15​
16​
16def get_config(): 17​def get_config():
17 '''Retrieve a config instance. If a config instance has already been parsed, 18​ '''Retrieve a config instance. If a config instance has already been parsed,
18 reuse that parsed instance. 19​ reuse that parsed instance.
19 20​
20 :return: :class:`.ConfigData` containing configuration values 21​ :return: :class:`.ConfigData` containing configuration values
21 ''' 22​ '''
22 23​
23 global _config 24​ global _config
Show All 40 Lines59def _load_config(conf_filename):
64 :return: object containing configuration values 65​ :return: object containing configuration values
65 ''' 66​ '''
66 67​
67 new_conf = imp.new_module('config') 68​ new_conf = imp.new_module('config')
68 new_conf.__file__ = conf_filename 69​ new_conf.__file__ = conf_filename
69 try: 70​ try:
70 with open(conf_filename, 'r') as conf_file: 71​ with open(conf_filename, 'r') as conf_file:
71 exec(compile(conf_file.read(), conf_filename, 'exec'), 72​ exec(compile(conf_file.read(), conf_filename, 'exec'),
72 new_conf.__dict__) 73​ new_conf.__dict__)
73 except IOError as e: 74​ except IOError as e:
74 e.strerror = 'Unable to load config file {}'.format(e.strerror) 75​ e.strerror = 'Unable to load config file {}'.format(e.strerror)
75 raise 76​ raise
76 return new_conf 77​ return new_conf
77 78​
79​
78class ConfigData(object): 80​class ConfigData(object):
79 '''Holds configuration data for TestCloud. Is initialized with default 81​ '''Holds configuration data for TestCloud. Is initialized with default
80 values which can be overridden. 82​ values which can be overridden.
81 ''' 83​ '''
82 84​
83 DOWNLOAD_PROGRESS = True 85​ DOWNLOAD_PROGRESS = True
84 86​
85 # Directories testCloud cares about 87​ # Directories testCloud cares about
▲ Show 20 Lines • Show All 44 Lines • Show Last 20 Lines
View Options

testCloud/exceptions.py

Loading...
View Options

testCloud/image.py

Loading...
View Options

testCloud/instance.py

Loading...
View Options

testCloud/util.py

Loading...