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

Remove using of UUID field in POST methods of Watcher API

Browse Source 
This patch set removes the possibility of using UUID field
in POST methods of Watcher API.

Closes-Bug: #1572625

Change-Id: I88a8aa5346e937e3e9409b55da3316cbe1ed832a
This commit is contained in:
Alexander Chadin
2016-04-21 18:57:42 +03:00
parent 87087e9add
commit aaaf3f1c84
8 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -371,13 +371,13 @@ class DbAuditTestCase(base.DbTestCase):
self.context, audit['id'])
def test_destroy_audit_by_uuid(self):
uuid = w_utils.generate_uuid()
self._create_test_audit(uuid=uuid)
audit = self._create_test_audit()
self.assertIsNotNone(self.dbapi.get_audit_by_uuid(self.context,
uuid))
self.dbapi.destroy_audit(uuid)
audit['uuid']))
self.dbapi.destroy_audit(audit['uuid'])
self.assertRaises(exception.AuditNotFound,
self.dbapi.get_audit_by_uuid, self.context, uuid)
self.dbapi.get_audit_by_uuid, self.context,
audit['uuid'])
def test_destroy_audit_that_does_not_exist(self):
self.assertRaises(exception.AuditNotFound,
@@ -389,10 +389,3 @@ class DbAuditTestCase(base.DbTestCase):
self.assertEqual(audit['id'], action_plan.audit_id)
self.assertRaises(exception.AuditReferenced,
self.dbapi.destroy_audit, audit['id'])
def test_create_audit_already_exists(self):
uuid = w_utils.generate_uuid()
self._create_test_audit(id=1, uuid=uuid)
self.assertRaises(exception.AuditAlreadyExists,
self._create_test_audit,
id=2, uuid=uuid)

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

@@ -358,15 +358,3 @@ class DbAuditTemplateTestCase(base.DbTestCase):
utils.create_test_audit_template,
uuid=w_utils.generate_uuid(),
name='audit_template_name')
def test_audit_template_create_same_uuid(self):
uuid = w_utils.generate_uuid()
audit_template1 = utils.create_test_audit_template(
uuid=uuid,
name='audit_template_name_1')
self.assertEqual(audit_template1['uuid'], audit_template1.uuid)
self.assertRaises(
exception.AuditTemplateAlreadyExists,
utils.create_test_audit_template,
uuid=uuid,
name='audit_template_name_2')