Code Review
/
doctor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
refactor local installer
[doctor.git]
/
tests
/
main.py
diff --git
a/tests/main.py
b/tests/main.py
index
6644b54
..
b59cd7a
100644
(file)
--- a/
tests/main.py
+++ b/
tests/main.py
@@
-12,9
+12,11
@@
import sys
from alarm import Alarm
import config
from alarm import Alarm
import config
+from consumer import get_consumer
from image import Image
from instance import Instance
from inspector import get_inspector
from image import Image
from instance import Instance
from inspector import get_inspector
+from installer import get_installer
import logger as doctor_log
from user import User
from network import Network
import logger as doctor_log
from user import User
from network import Network
@@
-37,9
+39,12
@@
class DoctorTest(object):
self.monitor = get_monitor(self.conf,
self.inspector.get_inspector_url(),
LOG)
self.monitor = get_monitor(self.conf,
self.inspector.get_inspector_url(),
LOG)
+ self.consumer = get_consumer(self.conf, LOG)
+ self.installer = get_installer(self.conf, LOG)
def setup(self):
# prepare the cloud env
def setup(self):
# prepare the cloud env
+ self.installer.setup()
# preparing VM image...
self.image.create()
# preparing VM image...
self.image.create()
@@
-59,6
+64,7
@@
class DoctorTest(object):
# starting doctor sample components...
self.inspector.start()
self.monitor.start()
# starting doctor sample components...
self.inspector.start()
self.monitor.start()
+ self.consumer.start()
def run(self):
"""run doctor test"""
def run(self):
"""run doctor test"""
@@
-85,6
+91,8
@@
class DoctorTest(object):
self.user.delete()
self.inspector.stop()
self.monitor.stop()
self.user.delete()
self.inspector.stop()
self.monitor.stop()
+ self.consumer.stop()
+ self.installer.cleanup()
def main():
def main():