p34709852
/
monkey
forked from p15670423/monkey
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Improved readability of gcp_machine_handlers.py

This commit is contained in:
VakarisZ 2021-05-12 10:41:52 +03:00
parent e76d53a2a8
commit c45de9dae7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
envs/monkey_zoo/blackbox/utils/gcp_machine_handlers.py
View File

@ -6,13 +6,12 @@ LOGGER = logging.getLogger(__name__)
class GCPHandler(object): class GCPHandler(object):
# gcloud commands
AUTHENTICATION_COMMAND = "gcloud auth activate-service-account --key-file=%s" AUTHENTICATION_COMMAND = "gcloud auth activate-service-account --key-file=%s"
SET_PROPERTY_PROJECT = "gcloud config set project %s" SET_PROPERTY_PROJECT = "gcloud config set project %s"
MACHINE_STARTING_COMMAND = "gcloud compute instances start %s --zone=%s" MACHINE_STARTING_COMMAND = "gcloud compute instances start %s --zone=%s"
MACHINE_STOPPING_COMMAND = "gcloud compute instances stop %s --zone=%s" MACHINE_STOPPING_COMMAND = "gcloud compute instances stop %s --zone=%s"
# Default configuration parameters # Key path location relative to this file
DEFAULT_RELATIVE_KEY_PATH = "../../gcp_keys/gcp_key.json" DEFAULT_RELATIVE_KEY_PATH = "../../gcp_keys/gcp_key.json"
DEFAULT_ZONE = "europe-west3-a" DEFAULT_ZONE = "europe-west3-a"
DEFAULT_PROJECT = "guardicore-22050661" DEFAULT_PROJECT = "guardicore-22050661"
@ -25,10 +24,10 @@ class GCPHandler(object):
): ):
self.zone = zone self.zone = zone
abs_key_path = GCPHandler.get_absolute_key_path(relative_key_path) abs_key_path = GCPHandler.get_absolute_key_path(relative_key_path)
# pass the key file to gcp
subprocess.call(GCPHandler.get_auth_command(abs_key_path), shell=True) # noqa: DUO116 subprocess.call(GCPHandler.get_auth_command(abs_key_path), shell=True) # noqa: DUO116
LOGGER.info("GCP Handler passed key") LOGGER.info("GCP Handler passed key")
# set project
subprocess.call(GCPHandler.get_set_project_command(project_id), shell=True) # noqa: DUO116 subprocess.call(GCPHandler.get_set_project_command(project_id), shell=True) # noqa: DUO116
LOGGER.info("GCP Handler set project") LOGGER.info("GCP Handler set project")
LOGGER.info("GCP Handler initialized successfully") LOGGER.info("GCP Handler initialized successfully")
@ -37,11 +36,12 @@ class GCPHandler(object):
def get_absolute_key_path(relative_key_path: str) -> str: def get_absolute_key_path(relative_key_path: str) -> str:
file_dir = os.path.dirname(os.path.realpath(__file__)) file_dir = os.path.dirname(os.path.realpath(__file__))
absolute_key_path = os.path.join(file_dir, relative_key_path) absolute_key_path = os.path.join(file_dir, relative_key_path)
if not os.path.isfile(absolute_key_path): if not os.path.isfile(absolute_key_path):
raise FileNotFoundError( raise FileNotFoundError(
"GCP key not found. " "Add a service key to envs/monkey_zoo/gcp_keys/gcp_key.json" "GCP key not found. " "Add a service key to envs/monkey_zoo/gcp_keys/gcp_key.json"
) )
return os.path.join(file_dir, relative_key_path) return os.path.normpath(absolute_key_path)
def start_machines(self, machine_list): def start_machines(self, machine_list):
""" """