← Back to branch summary

~hazmat/pyjuju/proposed-support

« back to all changes in this revision

Viewing changes to juju/state/tests/test_firewall.py

  • Committer: kapil.thangavelu at canonical
  • Date: 2012-05-22 22:08:15 UTC
  • mfrom: (484.1.53 trunk)
  • Revision ID: kapil.thangavelu@canonical.com-20120522220815-acyt8m89i9ybe0w1
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju/state/tests/test_firewall.py
3
3
from twisted.internet.defer import (
4
4
    Deferred, inlineCallbacks, fail, returnValue, succeed)
5
5
 
6
 
from juju.environment.config import EnvironmentsConfig
7
6
from juju.errors import ProviderInteractionError
8
7
from juju.lib.mocker import MATCH
9
 
from juju.machine.constraints import Constraints
 
8
from juju.machine.tests.test_constraints import series_constraints
10
9
from juju.providers.dummy import DummyMachine, MachineProvider
11
10
from juju.state.errors import StopWatcher
12
11
from juju.state.firewall import FirewallManager
17
16
 
18
17
MATCH_MACHINE = MATCH(lambda x: isinstance(x, DummyMachine))
19
18
 
20
 
SAMPLE_ENV = """\
21
 
environments:
22
 
  myfirstenv:
23
 
    type: dummy
24
 
    foo: bar
25
 
    storage-directory: %s
26
 
"""
27
 
 
28
19
 
29
20
class FirewallTestBase(ServiceStateManagerTestBase):
30
21
 
32
23
    def setUp(self):
33
24
        yield super(FirewallTestBase, self).setUp()
34
25
        self._running = True
35
 
        self.environment = yield self.get_test_environment()
 
26
        self.environment = self.config.get_default()
36
27
        self.provider = self.environment.get_machine_provider()
37
 
        self.firewall_manager = FirewallManager(self.client, self.is_running, self.provider)
 
28
        self.firewall_manager = FirewallManager(
 
29
            self.client, self.is_running, self.provider)
38
30
        self.service_state_manager = ServiceStateManager(self.client)
39
31
        self.output = self.capture_logging(level=logging.DEBUG)
40
32
 
41
 
    def get_test_environment_config(self):
42
 
        sample_config = SAMPLE_ENV % self.makeDir()
43
 
        config = EnvironmentsConfig()
44
 
        config.parse(sample_config)
45
 
        return config
46
 
 
47
 
    def get_test_environment(self):
48
 
        return self.get_test_environment_config().get_default()
49
 
 
50
33
    # The following methods are used to provide the scaffolding given
51
34
    # by the provisioning agent, which normally runs the FirewallManager
52
35
 
279
262
 
280
263
    def add_machine_state(self):
281
264
        manager = MachineStateManager(self.client)
282
 
        constraints = Constraints.from_strs("dummy", []).with_series("series")
283
 
        return manager.add_machine_state(constraints)
 
265
        return manager.add_machine_state(series_constraints)
284
266
 
285
267
    @inlineCallbacks
286
268
    def get_provider_ports(self, machine):