File tree Expand file tree Collapse file tree 4 files changed +25
-33
lines changed
Expand file tree Collapse file tree 4 files changed +25
-33
lines changed Original file line number Diff line number Diff line change 11# SPDX-License-Identifier: Apache-2.0
2+
3+ from functools import lru_cache
4+ import keystoneauth1
5+ import openstack
6+
7+
8+ @lru_cache
9+ def get_cloud_connection (profile = "admin" ):
10+ try :
11+ conn = openstack .connect (cloud = profile )
12+ except keystoneauth1 .exceptions .auth_plugins .MissingRequiredOptions :
13+ pass
14+
15+ return conn
16+
17+
18+ @lru_cache
19+ def get_cloud_project (project_id ):
20+ conn = get_cloud_connection ()
21+ return conn .identity .get_project (project_id )
Original file line number Diff line number Diff line change 33import time
44
55from cliff .command import Command
6- import keystoneauth1
76from loguru import logger
87import openstack
98from tabulate import tabulate
109from prompt_toolkit import prompt
1110
12-
13- def get_cloud_connection ():
14- try :
15- conn = openstack .connect (cloud = "admin" )
16- except keystoneauth1 .exceptions .auth_plugins .MissingRequiredOptions :
17- pass
18-
19- return conn
11+ from osism .commands import get_cloud_connection , get_cloud_project
2012
2113
2214class ComputeEnable (Command ):
@@ -303,8 +295,8 @@ def take_action(self, parsed_args):
303295 if project and server .project_id == project :
304296 result .append ([server .id , server .name , server .status ])
305297 elif domain :
306- project = conn . identity . get_project (server .project_id )
307- if project .domain_id == domain :
298+ server_project = get_cloud_project (server .project_id )
299+ if server_project .domain_id == domain :
308300 result .append ([server .id , server .name , server .status ])
309301 else :
310302 result .append ([server .id , server .name , server .status ])
Original file line number Diff line number Diff line change 55
66from cliff .command import Command
77import dateutil
8- import keystoneauth1
98from loguru import logger
10- import openstack
119from tabulate import tabulate
1210from prompt_toolkit import prompt
1311
14-
15- def get_cloud_connection ():
16- try :
17- conn = openstack .connect (cloud = "admin" )
18- except keystoneauth1 .exceptions .auth_plugins .MissingRequiredOptions :
19- pass
20-
21- return conn
12+ from osism .commands import get_cloud_connection
2213
2314
2415class ServerMigrate (Command ):
Original file line number Diff line number Diff line change 44
55from cliff .command import Command
66import dateutil
7- import keystoneauth1
87from loguru import logger
9- import openstack
108import pytz
119from tabulate import tabulate
1210
13- # from prompt_toolkit import prompt
14-
15-
16- def get_cloud_connection ():
17- try :
18- conn = openstack .connect (cloud = "admin" )
19- except keystoneauth1 .exceptions .auth_plugins .MissingRequiredOptions :
20- pass
21-
22- return conn
11+ from osism .commands import get_cloud_connection
2312
2413
2514class VolumeList (Command ):
You can’t perform that action at this time.
0 commit comments