Merge "Add unit test for quotas"

Change-Id: Id0d6ee5142687f64cbf448a8983683b19eb4b1f6

.gitreview

@@ -2,4 +2,3 @@
 host=review.opendev.org
 port=29418
 project=openstack/python-karborclient.git
-defaultbranch=stable/train

karborclient/tests/unit/v1/test_operation_logs.py

@@ -21,6 +21,22 @@ mock_request_return = ({}, {'operation_log': {}})
 
 class OperationLogsTest(base.TestCaseShell):
 
+    @mock.patch('karborclient.common.http.HTTPClient.json_request')
+    def test_list_operation_logs(self, mock_request):
+        mock_request.return_value = mock_request_return
+        cs.operation_logs.list()
+        mock_request.assert_called_with(
+            'GET',
+            '/operation_logs', headers={})
+
+    @mock.patch('karborclient.common.http.HTTPClient.json_request')
+    def test_list_operation_logs_with_all_tenants(self, mock_request):
+        mock_request.return_value = mock_request_return
+        cs.operation_logs.list(search_opts={'all_tenants': 1})
+        mock_request.assert_called_with(
+            'GET',
+            '/operation_logs?all_tenants=1', headers={})
+
     @mock.patch('karborclient.common.http.HTTPClient.json_request')
     def test_list_operation_logs_with_marker_limit(self, mock_request):
         mock_request.return_value = mock_request_return

karborclient/tests/unit/v1/test_quota_classes.py

@@ -30,6 +30,15 @@ class QuotaClassesTest(base.TestCaseShell):
             '/quota_classes/default',
             data={'quota_class': {'plans': 50}}, headers={})
 
+    @mock.patch('karborclient.common.http.HTTPClient.json_request')
+    def test_quota_class_update_with_none(self, mock_request):
+        mock_request.return_value = mock_request_return
+        cs.quota_classes.update('default', {'plans': None})
+        mock_request.assert_called_with(
+            'PUT',
+            '/quota_classes/default',
+            data={'quota_class': {'plans': 50}}, headers={})
+
     @mock.patch('karborclient.common.http.HTTPClient.json_request')
     def test_show_quota_class(self, mock_request):
         mock_request.return_value = mock_request_return
@@ -38,3 +47,12 @@ class QuotaClassesTest(base.TestCaseShell):
             'GET',
             '/quota_classes/default',
             headers={})
+
+    @mock.patch('karborclient.common.http.HTTPClient.json_request')
+    def test_show_quota_class_with_headers(self, mock_request):
+        mock_request.return_value = mock_request_return
+        cs.quota_classes.get('default', session_id='fake_session_id')
+        mock_request.assert_called_with(
+            'GET',
+            '/quota_classes/default',
+            headers={'X-Configuration-Session': 'fake_session_id'})

karborclient/tests/unit/v1/test_quotas.py

@@ -30,6 +30,15 @@ class QuotasTest(base.TestCaseShell):
             '/quotas/{project_id}'.format(project_id=fakes.PROJECT_ID),
             data={'quota': {'plans': 50}}, headers={})
 
+    @mock.patch('karborclient.common.http.HTTPClient.json_request')
+    def test_quota_update_with_none(self, mock_request):
+        mock_request.return_value = mock_request_return
+        cs.quotas.update(fakes.PROJECT_ID, {'plans': None})
+        mock_request.assert_called_with(
+            'PUT',
+            '/quotas/{project_id}'.format(project_id=fakes.PROJECT_ID),
+            data={'quota': {'plans': 50}}, headers={})
+
     @mock.patch('karborclient.common.http.HTTPClient.json_request')
     def test_show_quota(self, mock_request):
         mock_request.return_value = mock_request_return
@@ -39,6 +48,15 @@ class QuotasTest(base.TestCaseShell):
             '/quotas/{project_id}'.format(project_id=fakes.PROJECT_ID),
             headers={})
 
+    @mock.patch('karborclient.common.http.HTTPClient.json_request')
+    def test_show_quota_with_headers(self, mock_request):
+        mock_request.return_value = mock_request_return
+        cs.quotas.get(fakes.PROJECT_ID, False, session_id='fake_session_id')
+        mock_request.assert_called_with(
+            'GET',
+            '/quotas/{project_id}'.format(project_id=fakes.PROJECT_ID),
+            headers={'X-Configuration-Session': 'fake_session_id'})
+
     @mock.patch('karborclient.common.http.HTTPClient.json_request')
     def test_show_quota_with_detail(self, mock_request):
         mock_request.return_value = mock_request_return
@@ -58,3 +76,13 @@ class QuotasTest(base.TestCaseShell):
             '/quotas/{project_id}/defaults'.format(
                 project_id=fakes.PROJECT_ID),
             headers={})
+
+    @mock.patch('karborclient.common.http.HTTPClient.json_request')
+    def test_show_quota_default_with_headers(self, mock_request):
+        mock_request.return_value = mock_request_return
+        cs.quotas.defaults(fakes.PROJECT_ID, session_id='fake_session_id')
+        mock_request.assert_called_with(
+            'GET',
+            '/quotas/{project_id}/defaults'.format(
+                project_id=fakes.PROJECT_ID),
+            headers={'X-Configuration-Session': 'fake_session_id'})

karborclient/tests/unit/v1/test_triggers.py

@@ -22,6 +22,22 @@ mock_request_return = ({}, {'trigger_info': {'name': 'fake_name'}})
 
 class TriggersTest(base.TestCaseShell):
 
+    @mock.patch('karborclient.common.http.HTTPClient.json_request')
+    def test_list_triggers(self, mock_request):
+        mock_request.return_value = mock_request_return
+        cs.triggers.list()
+        mock_request.assert_called_with(
+            'GET',
+            '/triggers', headers={})
+
+    @mock.patch('karborclient.common.http.HTTPClient.json_request')
+    def test_list_triggers_with_all_tenants(self, mock_request):
+        mock_request.return_value = mock_request_return
+        cs.triggers.list(search_opts={'all_tenants': 1})
+        mock_request.assert_called_with(
+            'GET',
+            '/triggers?all_tenants=1', headers={})
+
     @mock.patch('karborclient.common.http.HTTPClient.json_request')
     def test_list_triggers_with_marker_limit(self, mock_request):
         mock_request.return_value = mock_request_return
@@ -103,3 +119,9 @@ class TriggersTest(base.TestCaseShell):
             data=body,
             headers={}
         )
+
+    def test_update_trigger_with_invalid_window(self):
+        trigger_id = '123'
+        self.assertRaises(exceptions.CommandError,
+                          cs.triggers.update,
+                          trigger_id, {'properties': {'window': 'fake'}})

karborclient/v1/quota_classes.py

@@ -26,6 +26,9 @@ class QuotaClassManager(base.ManagerWithFind):
 
     def update(self, class_name, data):
 
+        if "plans" in data and data["plans"] is None:
+            data["plans"] = 50
+
         body = {"quota_class": data}
 
         return self._update('/quota_classes/{class_name}'

karborclient/v1/quotas.py

@@ -26,6 +26,9 @@ class QuotaManager(base.ManagerWithFind):
 
     def update(self, project_id, data):
 
+        if "plans" in data and data["plans"] is None:
+            data["plans"] = 50
+
         body = {"quota": data}
 
         return self._update('/quotas/{project_id}'

karborclient/v1/shell.py

@@ -1357,7 +1357,7 @@ def _quota_set_pretty_show(quotas):
     metavar='<plans>',
     type=int,
     default=None,
-    help='New value for the "plans" quota.')
+    help='New value for the "plans" quota. The default value is 50.')
 def do_quota_update(cs, args):
     """Update the quotas for a project (Admin only)."""
     project_id = args.tenant
@@ -1400,7 +1400,7 @@ def do_quota_class_show(cs, args):
     metavar='<plans>',
     type=int,
     default=None,
-    help='New value for the "plans" quota.')
+    help='New value for the "plans" quota. The default value is 50.')
 def do_quota_class_update(cs, args):
     """Update the quotas for a quota class (Admin only)."""
     class_name = args.class_name

tox.ini

@@ -10,7 +10,7 @@ setenv =
    VIRTUAL_ENV={envdir}
    PYTHONWARNINGS=default::DeprecationWarning
 deps =
-       -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
+       -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 whitelist_externals = rm
@@ -35,7 +35,7 @@ commands =
 [testenv:docs]
 basepython = python3
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -W -b html doc/source doc/build/html