From e57c3209eda10747274579970d5b9de3f840d800 Mon Sep 17 00:00:00 2001 From: MOIS3Y Date: Wed, 21 Sep 2022 03:43:00 +0900 Subject: [PATCH] Add url to get dcimgr admin key --- main.py | 11 +++++++++-- settings.py | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index 2caa417..8a3cc97 100644 --- a/main.py +++ b/main.py @@ -22,6 +22,7 @@ class Access(object): if platform == 'dci': self.input_container = 'input' self.user_table = AuthUser + self.platform = platform def get_admin(self): query_admin = (self.user_table.select( @@ -46,8 +47,14 @@ class Access(object): def get_key(self, admin): host = self.input_container - admin_id = admin['id'] - url = 'http://{}:1500/auth/v4/user/{}/key'.format(host, admin_id) + if self.platform == "vm": + url = 'http://{}:1500/auth/v4/user/{}/key'.format( + host, admin['id'] + ) + if self.platform == "dci": + url = 'http://{}:1500/auth/v3/user/{}/key'.format( + host, admin['email'] + ) headers = {"Internal-Auth": "on", "Accept": "application/json"} req = requests.post(url, headers=headers, data={}) result = req.json() diff --git a/settings.py b/settings.py index 2d981d6..977391b 100644 --- a/settings.py +++ b/settings.py @@ -19,7 +19,7 @@ if DB_PASSWORD is None: DB_PASSWORD = platform_config.get("MysqlRootPassword") if PLATFORM == "dci": - DB_NAME == "auth" + DB_NAME = "auth" database = MySQLDatabase( DB_NAME, **{