import ceph 16.2.7

[ceph.git] / ceph / qa / tasks / mgr / dashboard / test_auth.py

diff --git a/ceph/qa/tasks/mgr/dashboard/test_auth.py b/ceph/qa/tasks/mgr/dashboard/test_auth.py
index 8fc7cd1992e6dce79511411b91d1b6f9fafb479f..a2266229bef7fd0055d89320c1b9aae14057b291 100644 (file)
--- a/ceph/qa/tasks/mgr/dashboard/test_auth.py
+++ b/ceph/qa/tasks/mgr/dashboard/test_auth.py
@@ -154,7 +154,7 @@ class AuthTest(DashboardTestCase):
         self.assertJsonBody({
             "redirect_url": "#/login"
         })
-        self._get("/api/host")
+        self._get("/api/host", version='1.1')
         self.assertStatus(401)
         self.set_jwt_token(None)
 
@@ -169,7 +169,7 @@ class AuthTest(DashboardTestCase):
         self.assertJsonBody({
             "redirect_url": "#/login"
         })
-        self._get("/api/host", set_cookies=True)
+        self._get("/api/host", set_cookies=True, version='1.1')
         self.assertStatus(401)
         self.set_jwt_token(None)
 
@@ -179,10 +179,10 @@ class AuthTest(DashboardTestCase):
         self._post("/api/auth", {'username': 'admin', 'password': 'admin'})
         self.assertStatus(201)
         self.set_jwt_token(self.jsonBody()['token'])
-        self._get("/api/host")
+        self._get("/api/host", version='1.1')
         self.assertStatus(200)
         time.sleep(6)
-        self._get("/api/host")
+        self._get("/api/host", version='1.1')
         self.assertStatus(401)
         self._ceph_cmd(['dashboard', 'set-jwt-token-ttl', '28800'])
         self.set_jwt_token(None)
@@ -192,10 +192,10 @@ class AuthTest(DashboardTestCase):
         self._post("/api/auth", {'username': 'admin', 'password': 'admin'}, set_cookies=True)
         self.assertStatus(201)
         self.set_jwt_token(self.jsonBody()['token'])
-        self._get("/api/host", set_cookies=True)
+        self._get("/api/host", set_cookies=True, version='1.1')
         self.assertStatus(200)
         time.sleep(6)
-        self._get("/api/host", set_cookies=True)
+        self._get("/api/host", set_cookies=True, version='1.1')
         self.assertStatus(401)
         self._ceph_cmd(['dashboard', 'set-jwt-token-ttl', '28800'])
         self.set_jwt_token(None)
@@ -209,7 +209,7 @@ class AuthTest(DashboardTestCase):
         # the following call adds the token to the blocklist
         self._post("/api/auth/logout")
         self.assertStatus(200)
-        self._get("/api/host")
+        self._get("/api/host", version='1.1')
         self.assertStatus(401)
         time.sleep(6)
         self._ceph_cmd(['dashboard', 'set-jwt-token-ttl', '28800'])
@@ -229,7 +229,7 @@ class AuthTest(DashboardTestCase):
         # the following call adds the token to the blocklist
         self._post("/api/auth/logout", set_cookies=True)
         self.assertStatus(200)
-        self._get("/api/host", set_cookies=True)
+        self._get("/api/host", set_cookies=True, version='1.1')
         self.assertStatus(401)
         time.sleep(6)
         self._ceph_cmd(['dashboard', 'set-jwt-token-ttl', '28800'])
@@ -243,61 +243,61 @@ class AuthTest(DashboardTestCase):
 
     def test_unauthorized(self):
         # test with Authorization header
-        self._get("/api/host")
+        self._get("/api/host", version='1.1')
         self.assertStatus(401)
 
         # test with Cookies set
-        self._get("/api/host", set_cookies=True)
+        self._get("/api/host", set_cookies=True, version='1.1')
         self.assertStatus(401)
 
     def test_invalidate_token_by_admin(self):
         # test with Authorization header
-        self._get("/api/host")
+        self._get("/api/host", version='1.1')
         self.assertStatus(401)
         self.create_user('user', 'user', ['read-only'])
         time.sleep(1)
         self._post("/api/auth", {'username': 'user', 'password': 'user'})
         self.assertStatus(201)
         self.set_jwt_token(self.jsonBody()['token'])
-        self._get("/api/host")
+        self._get("/api/host", version='1.1')
         self.assertStatus(200)
         time.sleep(1)
         self._ceph_cmd_with_secret(['dashboard', 'ac-user-set-password', '--force-password',
                                     'user'],
                                    'user2')
         time.sleep(1)
-        self._get("/api/host")
+        self._get("/api/host", version='1.1')
         self.assertStatus(401)
         self.set_jwt_token(None)
         self._post("/api/auth", {'username': 'user', 'password': 'user2'})
         self.assertStatus(201)
         self.set_jwt_token(self.jsonBody()['token'])
-        self._get("/api/host")
+        self._get("/api/host", version='1.1')
         self.assertStatus(200)
         self.delete_user("user")
 
         # test with Cookies set
-        self._get("/api/host", set_cookies=True)
+        self._get("/api/host", set_cookies=True, version='1.1')
         self.assertStatus(401)
         self.create_user('user', 'user', ['read-only'])
         time.sleep(1)
         self._post("/api/auth", {'username': 'user', 'password': 'user'}, set_cookies=True)
         self.assertStatus(201)
         self.set_jwt_token(self.jsonBody()['token'])
-        self._get("/api/host", set_cookies=True)
+        self._get("/api/host", set_cookies=True, version='1.1')
         self.assertStatus(200)
         time.sleep(1)
         self._ceph_cmd_with_secret(['dashboard', 'ac-user-set-password', '--force-password',
                                     'user'],
                                    'user2')
         time.sleep(1)
-        self._get("/api/host", set_cookies=True)
+        self._get("/api/host", set_cookies=True, version='1.1')
         self.assertStatus(401)
         self.set_jwt_token(None)
         self._post("/api/auth", {'username': 'user', 'password': 'user2'}, set_cookies=True)
         self.assertStatus(201)
         self.set_jwt_token(self.jsonBody()['token'])
-        self._get("/api/host", set_cookies=True)
+        self._get("/api/host", set_cookies=True, version='1.1')
         self.assertStatus(200)
         self.delete_user("user")
 
@@ -335,7 +335,8 @@ class AuthTest(DashboardTestCase):
         self.assertStatus(200)
         data = self.jsonBody()
         self.assertSchema(data, JObj(sub_elems={
-            "login_url": JLeaf(str)
+            "login_url": JLeaf(str),
+            "cluster_status": JLeaf(str)
         }, allow_unknown=False))
         self.logout()
 
@@ -345,6 +346,7 @@ class AuthTest(DashboardTestCase):
         self.assertStatus(200)
         data = self.jsonBody()
         self.assertSchema(data, JObj(sub_elems={
-            "login_url": JLeaf(str)
+            "login_url": JLeaf(str),
+            "cluster_status": JLeaf(str)
         }, allow_unknown=False))
         self.logout(set_cookies=True)