Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix field type to audit_type"

Browse Source
This commit is contained in:
Jenkins
2016-07-07 08:57:44 +00:00
committed by Gerrit Code Review
parent d61c4c12d1 47ff9bb105
commit b1c6ea71a4
12 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
watcher/tests/api/v1/test_audits.py
View File

@@ -75,7 +75,7 @@ class TestListAudit(api_base.FunctionalTest):
self.assertEqual([], response['audits'])
def _assert_audit_fields(self, audit):
audit_fields = ['type', 'deadline', 'state']
audit_fields = ['audit_type', 'deadline', 'state']
for field in audit_fields:
self.assertIn(field, audit)

4
watcher/tests/common/test_nova_helper.py
View File

@@ -107,9 +107,9 @@ class TestNovaHelper(base.TestCase):
instance = mock.MagicMock(id=self.instance_uuid)
setattr(instance, 'OS-EXT-SRV-ATTR:host', self.source_hypervisor)
addresses = mock.MagicMock()
type = mock.MagicMock()
network_type = mock.MagicMock()
networks = []
networks.append(("lan", type))
networks.append(("lan", network_type))
addresses.items.return_value = networks
attached_volumes = mock.MagicMock()
setattr(instance, 'addresses', addresses)

2
watcher/tests/db/test_action_plan.py
View File

@@ -252,7 +252,7 @@ class DbActionPlanTestCase(base.DbTestCase):
def test_get_action_plan_list_with_filters(self):
audit = self._create_test_audit(
id=1,
type='ONESHOT',
audit_type='ONESHOT',
uuid=w_utils.generate_uuid(),
deadline=None,
state='ONGOING')

12
watcher/tests/db/test_audit.py
View File

@@ -267,23 +267,23 @@ class DbAuditTestCase(base.DbTestCase):
def test_get_audit_list_with_filters(self):
audit1 = self._create_test_audit(
id=1,
type='ONESHOT',
audit_type='ONESHOT',
uuid=w_utils.generate_uuid(),
deadline=None,
state='ONGOING')
audit2 = self._create_test_audit(
id=2,
type='CONTINUOUS',
audit_type='CONTINUOUS',
uuid=w_utils.generate_uuid(),
deadline=None,
state='PENDING')
res = self.dbapi.get_audit_list(self.context,
filters={'type': 'ONESHOT'})
filters={'audit_type': 'ONESHOT'})
self.assertEqual([audit1['id']], [r.id for r in res])
res = self.dbapi.get_audit_list(self.context,
filters={'type': 'bad-type'})
filters={'audit_type': 'bad-type'})
self.assertEqual([], [r.id for r in res])
res = self.dbapi.get_audit_list(
@@ -331,7 +331,7 @@ class DbAuditTestCase(base.DbTestCase):
)
audit = self._create_test_audit(
type='ONESHOT',
audit_type='ONESHOT',
uuid=w_utils.generate_uuid(),
deadline=None,
state='ONGOING',
@@ -357,7 +357,7 @@ class DbAuditTestCase(base.DbTestCase):
)
audit = self._create_test_audit(
type='ONESHOT',
audit_type='ONESHOT',
uuid=w_utils.generate_uuid(),
deadline=None,
state='ONGOING',

2
watcher/tests/db/utils.py
View File

@@ -54,7 +54,7 @@ def get_test_audit(**kwargs):
return {
'id': kwargs.get('id', 1),
'uuid': kwargs.get('uuid', '10a47dd1-4874-4298-91cf-eff046dbdb8d'),
'type': kwargs.get('type', 'ONESHOT'),
'audit_type': kwargs.get('audit_type', 'ONESHOT'),
'state': kwargs.get('state'),
'deadline': kwargs.get('deadline'),
'audit_template_id': kwargs.get('audit_template_id', 1),