|
5 | 5 | import re |
6 | 6 | import subprocess |
7 | 7 |
|
| 8 | +from subprocess import CalledProcessError |
| 9 | + |
8 | 10 |
|
9 | 11 | ROOT_DIR = os.path.join(os.getcwd(), 'coreos') |
10 | 12 | if not os.path.exists(ROOT_DIR): |
@@ -37,44 +39,12 @@ def setUp(self): |
37 | 39 | """ |
38 | 40 | Setup a CoreOS cluster including router and log aggregator |
39 | 41 | """ |
40 | | - #print 'Creating deis-router.1' |
41 | | - #self._create_router('deis-router.1', 'deis/router', command='', port=80) |
42 | | - #print 'Creating deis-logger.1' |
43 | | - #self._create_logger('deis-logger.1', 'deis/logger', command='', port=514) |
44 | 42 | return |
45 | 43 |
|
46 | | - def _create_router(self, name, image, command, port): |
47 | | - env = self.env.copy() |
48 | | - self._create_container(name, image, command, ROUTER_TEMPLATE, env, port) |
49 | | - self._create_announcer(name, image, command, ANNOUNCE_TEMPLATE, env, port) |
50 | | - self._start_container(name, env) |
51 | | - self._start_announcer(name, env) |
52 | | - |
53 | | - def _create_logger(self, name, image, command, port): |
54 | | - env = self.env.copy() |
55 | | - self._create_container(name, image, command, LOGGER_TEMPLATE, env, port) |
56 | | - self._create_announcer(name, image, command, ANNOUNCE_TEMPLATE, env, port) |
57 | | - self._start_container(name, env) |
58 | | - self._start_announcer(name, env) |
59 | | - |
60 | | - def _destroy_router(self, name, env): |
61 | | - env = self.env.copy() |
62 | | - self._destroy_container(name, env) |
63 | | - self._destroy_announcer(name, env) |
64 | | - |
65 | | - def _destroy_logger(self, name, env): |
66 | | - self._destroy_container(name, env) |
67 | | - self._destroy_announcer(name, env) |
68 | | - |
69 | 44 | def tearDown(self): |
70 | 45 | """ |
71 | 46 | Tear down a CoreOS cluster including router and log aggregator |
72 | 47 | """ |
73 | | - #env = self.env.copy() |
74 | | - #print 'Destroying deis-router.1' |
75 | | - #self._destroy_router('deis-router.1', env) |
76 | | - #print 'Destroying deis-logger.1' |
77 | | - #self._destroy_logger('deis-logger.1', env) |
78 | 48 | return |
79 | 49 |
|
80 | 50 | # job api |
|
0 commit comments