openstack/fuel-library
Code Issues Proposed changes

Run astute with verbose flag

Browse Source
This commit is contained in:
vic
2013-05-27 02:28:36 +04:00
parent 3d8ce132c4
commit d4ed57968a
7 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fuel_test/cobbler/test_compact.py
View File

@@ -3,17 +3,17 @@ import unittest
from fuel_test.config import Config
from fuel_test.helpers import write_config
from fuel_test.manifest import Manifest, Template
from fuel_test.settings import ASTUTE_USE
from fuel_test.settings import ASTUTE_USE, PUPPET_AGENT_COMMAND
class CompactTestCase(CobblerTestCase):
def deploy_compact(self, quantum_node=True, loopback=True):
self.validate(self.nodes().controllers[:1], 'puppet agent --test 2>&1')
self.validate(self.nodes().controllers[1:], 'puppet agent --test 2>&1')
self.validate(self.nodes().controllers[:1], 'puppet agent --test 2>&1')
self.validate(self.nodes().controllers[:1], PUPPET_AGENT_COMMAND)
self.validate(self.nodes().controllers[1:], PUPPET_AGENT_COMMAND)
self.validate(self.nodes().controllers[:1], PUPPET_AGENT_COMMAND)
if quantum_node:
self.validate(self.nodes().quantums, 'puppet agent --test 2>&1')
self.validate(self.nodes().computes, 'puppet agent --test 2>&1')
self.validate(self.nodes().quantums, PUPPET_AGENT_COMMAND)
self.validate(self.nodes().computes, PUPPET_AGENT_COMMAND)
def test_deploy_compact_quantum(self):
if ASTUTE_USE:
@@ -168,7 +168,7 @@ class CompactTestCase(CobblerTestCase):
write_config(self.remote(), config_path, str(config))
self.remote().check_call("cobbler_system -f %s" % config_path)
self.remote().check_stderr("openstack_system -c %s -o /etc/puppet/manifests/site.pp -a /root/astute.yaml" % config_path)
self.remote().check_stderr("astute -f /root/astute.yaml")
self.remote().check_stderr("astute -f /root/astute.yaml -v")
if __name__ == '__main__':
unittest.main()

18
fuel_test/cobbler/test_full.py
View File

@@ -3,7 +3,7 @@ from fuel_test.cobbler.vm_test_case import CobblerTestCase
from fuel_test.config import Config
from fuel_test.helpers import write_config
from fuel_test.manifest import Manifest, Template
from fuel_test.settings import CREATE_SNAPSHOTS, ASTUTE_USE
from fuel_test.settings import CREATE_SNAPSHOTS, ASTUTE_USE, PUPPET_AGENT_COMMAND
class FullTestCase(CobblerTestCase):
@@ -27,16 +27,16 @@ class FullTestCase(CobblerTestCase):
Manifest().write_manifest(remote=self.remote(), manifest=manifest)
self.validate(self.nodes().proxies[:1], 'puppet agent --test 2>&1')
self.validate(self.nodes().proxies[1:], 'puppet agent --test 2>&1')
self.validate(self.nodes().storages, 'puppet agent --test 2>&1')
self.validate(self.nodes().controllers[:1], 'puppet agent --test 2>&1')
self.validate(self.nodes().controllers[1:], 'puppet agent --test 2>&1')
self.validate(self.nodes().controllers[:1], 'puppet agent --test 2>&1')
self.validate(self.nodes().computes, 'puppet agent --test 2>&1')
self.validate(self.nodes().proxies[:1], PUPPET_AGENT_COMMAND)
self.validate(self.nodes().proxies[1:], PUPPET_AGENT_COMMAND)
self.validate(self.nodes().storages, PUPPET_AGENT_COMMAND)
self.validate(self.nodes().controllers[:1], PUPPET_AGENT_COMMAND)
self.validate(self.nodes().controllers[1:], PUPPET_AGENT_COMMAND)
self.validate(self.nodes().controllers[:1], PUPPET_AGENT_COMMAND)
self.validate(self.nodes().computes, PUPPET_AGENT_COMMAND)
def deploy_by_astute(self):
self.remote().check_stderr("astute -f /root/astute.yaml")
self.remote().check_stderr("astute -f /root/astute.yaml -v")
def prepare_astute(self):
config = Config().generate(

3
fuel_test/cobbler/test_minimal.py
View File

@@ -1,5 +1,4 @@
import unittest
from fuel_test.ci.ci_vm import CiVM
from fuel_test.cobbler.vm_test_case import CobblerTestCase
from fuel_test.config import Config
from fuel_test.helpers import write_config
@@ -31,7 +30,7 @@ class MinimalTestCase(CobblerTestCase):
self.validate(self.nodes().computes, 'puppet agent --test')
def deploy_by_astute(self):
self.remote().check_stderr("astute -f /root/astute.yaml")
self.remote().check_stderr("astute -f /root/astute.yaml -v")
def prepare_astute(self):
config = Config().generate(

6
fuel_test/cobbler/test_simple.py
View File

@@ -3,7 +3,7 @@ from fuel_test.cobbler.vm_test_case import CobblerTestCase
from fuel_test.config import Config
from fuel_test.helpers import write_config
from fuel_test.manifest import Manifest, Template
from fuel_test.settings import OPENSTACK_SNAPSHOT, CREATE_SNAPSHOTS, ASTUTE_USE
from fuel_test.settings import OPENSTACK_SNAPSHOT, CREATE_SNAPSHOTS, ASTUTE_USE, PUPPET_AGENT_COMMAND
class SimpleTestCase(CobblerTestCase):
@@ -16,10 +16,10 @@ class SimpleTestCase(CobblerTestCase):
self.deploy_one_by_one()
def deploy_one_by_one(self):
self.validate(self.nodes().controllers[:1] + self.nodes().computes, 'puppet agent --test 2>&1')
self.validate(self.nodes().controllers[:1] + self.nodes().computes, PUPPET_AGENT_COMMAND)
def deploy_by_astute(self):
self.remote().check_stderr("astute -f astute.yaml")
self.remote().check_stderr("astute -f /root/astute.yaml -v")
def prepare_only_site_pp(self):
manifest = Manifest().generate_openstack_manifest(

4
fuel_test/cobbler/test_single.py
View File

@@ -1,7 +1,7 @@
import unittest
from fuel_test.cobbler.vm_test_case import CobblerTestCase
from fuel_test.manifest import Manifest
from fuel_test.settings import OPENSTACK_SNAPSHOT, CREATE_SNAPSHOTS
from fuel_test.settings import OPENSTACK_SNAPSHOT, CREATE_SNAPSHOTS, PUPPET_AGENT_COMMAND
class SingleTestCase(CobblerTestCase):
@@ -15,7 +15,7 @@ class SingleTestCase(CobblerTestCase):
)
self.validate(
self.nodes().controllers[:1],
'puppet agent --test 2>&1')
PUPPET_AGENT_COMMAND)
if CREATE_SNAPSHOTS:
self.environment().snapshot(OPENSTACK_SNAPSHOT, force=True)

12
fuel_test/cobbler/test_swift.py
View File

@@ -1,6 +1,8 @@
import unittest
from fuel_test.cobbler.vm_test_case import CobblerTestCase
from fuel_test.manifest import Manifest
from fuel_test.settings import PUPPET_AGENT_COMMAND
class SwiftCase(CobblerTestCase):
@@ -11,11 +13,11 @@ class SwiftCase(CobblerTestCase):
Manifest().generate_swift_manifest(
controllers=self.nodes().controllers)
)
self.validate(self.nodes().controllers[0], 'puppet agent --test 2>&1')
self.do(self.nodes().storages, 'puppet agent --test 2>&1')
self.do(self.nodes().storages, 'puppet agent --test 2>&1')
self.validate(self.nodes().proxies[0], 'puppet agent --test 2>&1')
self.validate(self.nodes().storages, 'puppet agent --test 2>&1')
self.validate(self.nodes().controllers[0], PUPPET_AGENT_COMMAND)
self.do(self.nodes().storages, PUPPET_AGENT_COMMAND)
self.do(self.nodes().storages, PUPPET_AGENT_COMMAND)
self.validate(self.nodes().proxies[0], PUPPET_AGENT_COMMAND)
self.validate(self.nodes().storages, PUPPET_AGENT_COMMAND)
if __name__ == '__main__':
unittest.main()

1
fuel_test/settings.py
View File

@@ -125,3 +125,4 @@ CURRENT_PROFILE = PROFILES_COBBLER_COMMON.get(OS_FAMILY)
ASTUTE_USE = os.environ.get('ASTUTE_USE', 'true') == 'true'
DOMAIN_NAME = os.environ.get('DOMAIN_NAME', '.localdomain')
PUPPET_AGENT_COMMAND = 'puppet agent --test 2>&1'