summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Chung <chungg@ca.ibm.com>2013-10-18 15:26:23 -0400
committerGordon Chung <chungg@ca.ibm.com>2013-10-18 15:26:23 -0400
commit49eaaf1fb2f0c138aeab8687694efefdda113eef (patch)
tree2770ce8f44fea792eb0e3a9ed3e3dbdd4986f250
parentd280b091320ab27a7de1325f1dc895016bb1c7a1 (diff)
downloadpycadf-49eaaf1fb2f0c138aeab8687694efefdda113eef.tar.gz
switch list action to read/list
CADF spec has changed 'list' action to 'read/list' action type. update library to reflect that. Change-Id: I5fe3b7d180f9a5b9117700e684bd659701da49b4
-rw-r--r--pycadf/cadftaxonomy.py2
-rw-r--r--pycadf/tests/audit/test_api.py6
2 files changed, 4 insertions, 4 deletions
diff --git a/pycadf/cadftaxonomy.py b/pycadf/cadftaxonomy.py
index 74b1bfb..52770aa 100644
--- a/pycadf/cadftaxonomy.py
+++ b/pycadf/cadftaxonomy.py
@@ -28,7 +28,7 @@ ACTION_READ = 'read'
ACTION_UPDATE = 'update'
ACTION_DELETE = 'delete'
# OpenStack specific, Profile or change CADF spec. to add this action
-ACTION_LIST = 'list'
+ACTION_LIST = 'read/list'
# TODO(mrutkows): Make global using WSGI mechanism
ACTION_TAXONOMY = frozenset([
diff --git a/pycadf/tests/audit/test_api.py b/pycadf/tests/audit/test_api.py
index bac6f4d..faefc72 100644
--- a/pycadf/tests/audit/test_api.py
+++ b/pycadf/tests/audit/test_api.py
@@ -63,7 +63,7 @@ class TestAuditApi(base.TestCase):
def test_get_list(self):
req = self.api_request('GET', 'http://host:8774/v2/public/servers')
payload = req.environ['CADF_EVENT']
- self.assertEqual(payload['action'], 'list')
+ self.assertEqual(payload['action'], 'read/list')
self.assertEqual(payload['typeURI'],
'http://schemas.dmtf.org/cloud/audit/1.0/event')
self.assertEqual(payload['outcome'], 'pending')
@@ -101,7 +101,7 @@ class TestAuditApi(base.TestCase):
req = self.api_request('GET',
'http://unknown:8774/v2/public/servers/')
payload = req.environ['CADF_EVENT']
- self.assertEqual(payload['action'], 'list')
+ self.assertEqual(payload['action'], 'read/list')
self.assertEqual(payload['outcome'], 'pending')
self.assertEqual(payload['target']['name'], 'unknown')
self.assertEqual(payload['target']['id'], 'unknown')
@@ -123,7 +123,7 @@ class TestAuditApi(base.TestCase):
req = self.api_request('GET',
'http://unknown:8774/v2/public/servers/')
payload = req.environ['CADF_EVENT']
- self.assertEqual(payload['action'], 'list')
+ self.assertEqual(payload['action'], 'read/list')
self.assertEqual(payload['outcome'], 'pending')
self.assertEqual(payload['target']['name'], 'nova')
self.assertEqual(payload['target']['id'], 'resource_id')