From aae2a3a8de7bf2eb45fc73078661f6db9bf74aa5 Mon Sep 17 00:00:00 2001
From: Itay Mizeretz <itay.mizeretz@guardicore.com>
Date: Tue, 27 Feb 2018 14:05:23 +0200
Subject: [PATCH] rename existing cross_segment_issue to
 island_cross_segment_issue

---
 monkey_island/cc/services/report.py                 | 13 +++++++------
 .../cc/ui/src/components/pages/ReportPage.js        |  6 +++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/monkey_island/cc/services/report.py b/monkey_island/cc/services/report.py
index 250acc17a..4adcf4580 100644
--- a/monkey_island/cc/services/report.py
+++ b/monkey_island/cc/services/report.py
@@ -35,7 +35,7 @@ class ReportService:
         CONFICKER = 5
 
     class WARNINGS_DICT(Enum):
-        CROSS_SEGMENT = 0
+        ISLAND_CROSS_SEGMENT = 0
         TUNNEL = 1
 
     @staticmethod
@@ -253,7 +253,7 @@ class ReportService:
             ]
 
     @staticmethod
-    def get_cross_segment_issues():
+    def get_island_cross_segment_issues():
         issues = []
         island_ips = local_ip_addresses()
         for monkey in mongo.db.monkey.find({'tunnel': {'$exists': False}}, {'tunnel': 1, 'guid': 1, 'hostname': 1}):
@@ -268,7 +268,7 @@ class ReportService:
                     break
             if not found_good_ip:
                 issues.append(
-                    {'type': 'cross_segment', 'machine': monkey['hostname'],
+                    {'type': 'island_cross_segment', 'machine': monkey['hostname'],
                      'networks': [str(subnet) for subnet in monkey_subnets],
                      'server_networks': [str(subnet) for subnet in get_subnets()]}
                 )
@@ -277,7 +277,8 @@ class ReportService:
 
     @staticmethod
     def get_issues():
-        issues = ReportService.get_exploits() + ReportService.get_tunnels() + ReportService.get_cross_segment_issues()
+        issues = ReportService.get_exploits() + ReportService.get_tunnels() \
+                 + ReportService.get_island_cross_segment_issues()
         issues_dict = {}
         for issue in issues:
             machine = issue['machine']
@@ -349,8 +350,8 @@ class ReportService:
 
         for machine in issues:
             for issue in issues[machine]:
-                if issue['type'] == 'cross_segment':
-                    warnings_byte_array[ReportService.WARNINGS_DICT.CROSS_SEGMENT.value] = True
+                if issue['type'] == 'island_cross_segment':
+                    warnings_byte_array[ReportService.WARNINGS_DICT.ISLAND_CROSS_SEGMENT.value] = True
                 elif issue['type'] == 'tunnel':
                     warnings_byte_array[ReportService.WARNINGS_DICT.TUNNEL.value] = True
 
diff --git a/monkey_island/cc/ui/src/components/pages/ReportPage.js b/monkey_island/cc/ui/src/components/pages/ReportPage.js
index 56c2c3881..5c77f9c46 100644
--- a/monkey_island/cc/ui/src/components/pages/ReportPage.js
+++ b/monkey_island/cc/ui/src/components/pages/ReportPage.js
@@ -26,7 +26,7 @@ class ReportPageComponent extends AuthComponent {
 
   Warning =
     {
-      CROSS_SEGMENT: 0,
+      ISLAND_CROSS_SEGMENT: 0,
       TUNNEL: 1
     };
 
@@ -333,7 +333,7 @@ class ReportPageComponent extends AuthComponent {
               <div>
                 The Monkey uncovered the following possible set of issues:
                 <ul>
-                  {this.state.report.overview.warnings[this.Warning.CROSS_SEGMENT] ?
+                  {this.state.report.overview.warnings[this.Warning.ISLAND_CROSS_SEGMENT] ?
                     <li>Weak segmentation - Machines from different segments are able to
                       communicate.</li> : null}
                   {this.state.report.overview.warnings[this.Warning.TUNNEL] ?
@@ -664,7 +664,7 @@ class ReportPageComponent extends AuthComponent {
       case 'conficker':
         data = this.generateConfickerIssue(issue);
         break;
-      case 'cross_segment':
+      case 'island_cross_segment':
         data = this.generateCrossSegmentIssue(issue);
         break;
       case 'tunnel':