From 275dbeccdd2b62b9aa7d9d3b3b44c550c0cde46b Mon Sep 17 00:00:00 2001
From: Mike Salvatore <mike.s.salvatore@gmail.com>
Date: Mon, 2 Aug 2021 07:09:37 -0400
Subject: [PATCH] BB: Move GCP_TEST_MACHINE_LIST to its own file

Allows the GCP_TEST_MACHINE_LIST to be reused by other utility scripts
---
 .../blackbox/gcp_test_machine_list.py         | 22 ++++++++++++++++++
 envs/monkey_zoo/blackbox/test_blackbox.py     | 23 +------------------
 2 files changed, 23 insertions(+), 22 deletions(-)
 create mode 100644 envs/monkey_zoo/blackbox/gcp_test_machine_list.py

diff --git a/envs/monkey_zoo/blackbox/gcp_test_machine_list.py b/envs/monkey_zoo/blackbox/gcp_test_machine_list.py
new file mode 100644
index 000000000..43246ad24
--- /dev/null
+++ b/envs/monkey_zoo/blackbox/gcp_test_machine_list.py
@@ -0,0 +1,22 @@
+GCP_TEST_MACHINE_LIST = [
+    "sshkeys-11",
+    "sshkeys-12",
+    "elastic-4",
+    "elastic-5",
+    "hadoop-2",
+    "hadoop-3",
+    "mssql-16",
+    "mimikatz-14",
+    "mimikatz-15",
+    "struts2-23",
+    "struts2-24",
+    "tunneling-9",
+    "tunneling-10",
+    "tunneling-11",
+    "tunneling-12",
+    "weblogic-18",
+    "weblogic-19",
+    "shellshock-8",
+    "zerologon-25",
+    "drupal-28",
+]
diff --git a/envs/monkey_zoo/blackbox/test_blackbox.py b/envs/monkey_zoo/blackbox/test_blackbox.py
index 26cfa646f..4ac806588 100644
--- a/envs/monkey_zoo/blackbox/test_blackbox.py
+++ b/envs/monkey_zoo/blackbox/test_blackbox.py
@@ -23,6 +23,7 @@ from envs.monkey_zoo.blackbox.config_templates.weblogic import Weblogic
 from envs.monkey_zoo.blackbox.config_templates.wmi_mimikatz import WmiMimikatz
 from envs.monkey_zoo.blackbox.config_templates.wmi_pth import WmiPth
 from envs.monkey_zoo.blackbox.config_templates.zerologon import Zerologon
+from envs.monkey_zoo.blackbox.gcp_test_machine_list import GCP_TEST_MACHINE_LIST
 from envs.monkey_zoo.blackbox.island_client.island_config_parser import IslandConfigParser
 from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIslandClient
 from envs.monkey_zoo.blackbox.log_handlers.test_logs_handler import TestLogsHandler
@@ -43,28 +44,6 @@ from monkey_island.cc.services.mode.mode_enum import IslandModeEnum
 
 DEFAULT_TIMEOUT_SECONDS = 5 * 60
 MACHINE_BOOTUP_WAIT_SECONDS = 30
-GCP_TEST_MACHINE_LIST = [
-    "sshkeys-11",
-    "sshkeys-12",
-    "elastic-4",
-    "elastic-5",
-    "hadoop-2",
-    "hadoop-3",
-    "mssql-16",
-    "mimikatz-14",
-    "mimikatz-15",
-    "struts2-23",
-    "struts2-24",
-    "tunneling-9",
-    "tunneling-10",
-    "tunneling-11",
-    "tunneling-12",
-    "weblogic-18",
-    "weblogic-19",
-    "shellshock-8",
-    "zerologon-25",
-    "drupal-28",
-]
 LOG_DIR_PATH = "./logs"
 logging.basicConfig(level=logging.INFO)
 LOGGER = logging.getLogger(__name__)