Code Review
/
doctor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add create instances
[doctor.git]
/
tests
/
main.py
diff --git
a/tests/main.py
b/tests/main.py
index
bb2c912
..
540a924
100644
(file)
--- a/
tests/main.py
+++ b/
tests/main.py
@@
-12,9
+12,10
@@
import sys
import config
from image import Image
import config
from image import Image
+from instance import Instance
import logger as doctor_log
from user import User
import logger as doctor_log
from user import User
-
+from network import Network
LOG = doctor_log.Logger('doctor').getLogger()
LOG = doctor_log.Logger('doctor').getLogger()
@@
-25,6
+26,8
@@
class DoctorTest(object):
self.conf = conf
self.image = Image(self.conf, LOG)
self.user = User(self.conf, LOG)
self.conf = conf
self.image = Image(self.conf, LOG)
self.user = User(self.conf, LOG)
+ self.network = Network(self.conf, LOG)
+ self.instance = Instance(self.conf, LOG)
def setup(self):
# prepare the cloud env
def setup(self):
# prepare the cloud env
@@
-36,6
+39,11
@@
class DoctorTest(object):
self.user.create()
self.user.update_quota()
self.user.create()
self.user.update_quota()
+ # creating VM...
+ self.network.create()
+ self.instance.create()
+ self.instance.wait_for_vm_launch()
+
def run(self):
"""run doctor test"""
try:
def run(self):
"""run doctor test"""
try:
@@
-54,6
+62,8
@@
class DoctorTest(object):
self.cleanup()
def cleanup(self):
self.cleanup()
def cleanup(self):
+ self.instance.delete()
+ self.network.delete()
self.image.delete()
self.user.delete()
self.image.delete()
self.user.delete()