From 287115dded5adda7ac3645500c2d716b3ed18070 Mon Sep 17 00:00:00 2001
From: Shay Nehmad <shay.nehmad@guardicore.com>
Date: Thu, 1 Aug 2019 14:07:05 +0300
Subject: [PATCH] Moved services which are related to the report to a dedicated
 directory

---
 monkey/monkey_island/cc/resources/report.py                     | 2 +-
 monkey/monkey_island/cc/resources/root.py                       | 2 +-
 monkey/monkey_island/cc/services/reporting/__init__.py          | 0
 monkey/monkey_island/cc/services/{ => reporting}/pth_report.py  | 0
 monkey/monkey_island/cc/services/{ => reporting}/report.py      | 2 +-
 .../cc/services/{ => reporting}/test_PTHReportService.py        | 2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 monkey/monkey_island/cc/services/reporting/__init__.py
 rename monkey/monkey_island/cc/services/{ => reporting}/pth_report.py (100%)
 rename monkey/monkey_island/cc/services/{ => reporting}/report.py (99%)
 rename monkey/monkey_island/cc/services/{ => reporting}/test_PTHReportService.py (96%)

diff --git a/monkey/monkey_island/cc/resources/report.py b/monkey/monkey_island/cc/resources/report.py
index 62a014fef..d75f91b0f 100644
--- a/monkey/monkey_island/cc/resources/report.py
+++ b/monkey/monkey_island/cc/resources/report.py
@@ -1,7 +1,7 @@
 import flask_restful
 
 from monkey_island.cc.auth import jwt_required
-from monkey_island.cc.services.report import ReportService
+from monkey_island.cc.services.reporting.report import ReportService
 
 __author__ = "itay.mizeretz"
 
diff --git a/monkey/monkey_island/cc/resources/root.py b/monkey/monkey_island/cc/resources/root.py
index 2af73a45e..e3b3e9854 100644
--- a/monkey/monkey_island/cc/resources/root.py
+++ b/monkey/monkey_island/cc/resources/root.py
@@ -7,7 +7,7 @@ from flask import request, make_response, jsonify
 from monkey_island.cc.auth import jwt_required
 from monkey_island.cc.database import mongo
 from monkey_island.cc.services.node import NodeService
-from monkey_island.cc.services.report import ReportService
+from monkey_island.cc.services.reporting.report import ReportService
 from monkey_island.cc.services.attack.attack_report import AttackReportService
 from monkey_island.cc.utils import local_ip_addresses
 from monkey_island.cc.services.database import Database
diff --git a/monkey/monkey_island/cc/services/reporting/__init__.py b/monkey/monkey_island/cc/services/reporting/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/monkey/monkey_island/cc/services/pth_report.py b/monkey/monkey_island/cc/services/reporting/pth_report.py
similarity index 100%
rename from monkey/monkey_island/cc/services/pth_report.py
rename to monkey/monkey_island/cc/services/reporting/pth_report.py
diff --git a/monkey/monkey_island/cc/services/report.py b/monkey/monkey_island/cc/services/reporting/report.py
similarity index 99%
rename from monkey/monkey_island/cc/services/report.py
rename to monkey/monkey_island/cc/services/reporting/report.py
index 593bbfdaf..1d7ac162d 100644
--- a/monkey/monkey_island/cc/services/report.py
+++ b/monkey/monkey_island/cc/services/reporting/report.py
@@ -16,7 +16,7 @@ from monkey_island.cc.services.config import ConfigService
 from monkey_island.cc.services.edge import EdgeService
 from monkey_island.cc.services.node import NodeService
 from monkey_island.cc.utils import local_ip_addresses, get_subnets
-from pth_report import PTHReportService
+from monkey_island.cc.services.reporting.pth_report import PTHReportService
 from common.network.network_range import NetworkRange
 
 __author__ = "itay.mizeretz"
diff --git a/monkey/monkey_island/cc/services/test_PTHReportService.py b/monkey/monkey_island/cc/services/reporting/test_PTHReportService.py
similarity index 96%
rename from monkey/monkey_island/cc/services/test_PTHReportService.py
rename to monkey/monkey_island/cc/services/reporting/test_PTHReportService.py
index 24e560ff0..f934f50ab 100644
--- a/monkey/monkey_island/cc/services/test_PTHReportService.py
+++ b/monkey/monkey_island/cc/services/reporting/test_PTHReportService.py
@@ -1,7 +1,7 @@
 import uuid
 
 from monkey_island.cc.models import Monkey
-from monkey_island.cc.services.pth_report import PTHReportService
+from monkey_island.cc.services.reporting.pth_report import PTHReportService
 from monkey_island.cc.testing.IslandTestCase import IslandTestCase