Merge pull request #100 from SivanShl/reuse_group_name

Reuse group name
added command line argument that SmartConnector should use reuse the group by name instead of creating a new group.
--reuse-group-name', default="false"

Author: chkp-ofirs

CheckPointObjects/RuleBaseOptimizer.cs

@@ -15,13 +15,12 @@ You may obtain a copy of the License at
 limitations under the License.
 ********************************************************************/
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 using CommonUtils;
- 
+
 namespace CheckPointObjects
 {
     /// <summary>
@@ -35,13 +34,9 @@ namespace CheckPointObjects
     ///       5.1. both the source and destination columns match
     ///       5.2. both the source and service columns match
     ///       5.3. both the destination and service columns match
-    /// for CiscoASA and FirePower vendors there is an option to optimize by comments -
-    /// two rules can be merged if they have the same comments and in addition they up to the above criteria.
     /// </summary>
     public static class RuleBaseOptimizer
     {
-
-        public static bool IsOptimizeByComments = false;
         public static CheckPoint_Layer Optimize(CheckPoint_Layer originalLayer, string newName)
         {
             CheckPoint_Layer curLayer = originalLayer;
@@ -72,7 +67,7 @@ public static CheckPoint_Layer Optimize(CheckPoint_Layer originalLayer, string n
 
             return newLayer;
         }
-    
+
         private static void AddRule(CheckPoint_Layer layer, CheckPoint_Rule newRule)
         {
             bool match = false;
@@ -95,7 +90,7 @@ private static void AddRule(CheckPoint_Layer layer, CheckPoint_Rule newRule)
             {
                 CheckPoint_Rule rule = newRule.Clone();
                 rule.Layer = layer.Name;
-                rule.Comments = IsOptimizeByComments ? rule.Comments : "";
+                rule.Comments = "";
                 rule.ConversionComments = newRule.ConversionComments;
                 layer.Rules.Add(rule);
             }
@@ -136,7 +131,7 @@ private static CheckPoint_Rule MergeRules(CheckPoint_Rule rule1, CheckPoint_Rule
             mergedRule.Track = rule1.Track;
             mergedRule.SourceNegated = rule1.SourceNegated;
             mergedRule.DestinationNegated = rule1.DestinationNegated;
-            mergedRule.Comments = IsOptimizeByComments ? rule1.Comments : ""; // adding or not adding comments by the user request
+            mergedRule.Comments = "";
             mergedRule.ConversionComments = rule1.ConversionComments + " | " + rule2.ConversionComments;
             mergedRule.ConvertedCommandId = rule1.ConvertedCommandId;
             mergedRule.ConversionIncidentType = ConversionIncidentType.None;
@@ -183,15 +178,9 @@ private static int GetFirstRuleWithSameAction(CheckPoint_Layer layer, CheckPoint
 
             return (matchedRules == 0) ? -1 : (pos + 1);
         }
-        
+
         private static bool IsRuleSimilarToRule(CheckPoint_Rule rule1, CheckPoint_Rule rule2)
         {
-             // Optimizing by comments - checks if comments of the two rules are matched and not empty
-            if (IsOptimizeByComments && rule1.Comments != rule2.Comments || IsOptimizeByComments && string.IsNullOrEmpty(rule1.Comments))
-            {
-                return false;
-            }
-            
             if (rule1.Action != rule2.Action)
             {
                 return false;
@@ -289,7 +278,7 @@ private static string OptimizeConverstionComments(string commentToProcess)
 
 
             }
-            else 
+            else
                 return commentToProcess.Trim();
 
             }

CiscoMigration/CiscoCommands.cs

@@ -19,9 +19,7 @@ limitations under the License.
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using CheckPointObjects;
 using CommonUtils;
-using MigrationBase;
 
 namespace CiscoMigration
 {
@@ -126,7 +124,7 @@ public string FirstWord
         public ConversionIncidentType ConversionIncidentType { get; set; }
         public string ConversionIncidentMessage { get; set; }
         public List<CiscoCommand> Children { get; set; }
-        
+
         public CiscoCommand()
         {
             CiscoId = "";
@@ -2233,11 +2231,11 @@ public override void Parse(CiscoCommand command, CiscoCommand prevCommand, Dicti
 
                 return;
             }
-            
+
             if (prevAclCommand != null && ACLName.Equals(prevAclCommand.ACLName) && !string.IsNullOrEmpty(prevAclCommand.DataForNextElement))
             {
                 Remark = prevAclCommand.DataForNextElement;
-            
+
                 if (CiscoParser.SpreadAclRemarks)
                 {
                     DataForNextElement = Remark;

CiscoMigration/CiscoConverter.cs

@@ -24,7 +24,6 @@ limitations under the License.
 using CheckPointObjects;
 using MigrationBase;
 using System.Globalization;
-using System.Runtime.InteropServices;
 using System.Threading;
 using CiscoMigration.CiscoMigration;
 using static CheckPointObjects.CheckPoint_Rule;
@@ -48,7 +47,7 @@ public class CiscoConverter : VendorConverter
         #region GUI params
 
         public bool SkipUnusedObjects { get; set; } //check if Optimized configuration is requested
-        
+
         #endregion
 
         #region Helper Classes
@@ -5739,7 +5738,7 @@ private void Add_Optimized_Package()
             foreach (CheckPoint_Layer layer in regularPackage.SubPolicies)
             {
                 string optimizedSubPolicyName = layer.Name + "_opt";
-                
+
                 CheckPoint_Layer optimizedLayer = RuleBaseOptimizer.Optimize(layer, optimizedSubPolicyName);
                 foreach (CheckPoint_Rule subSubRule in optimizedLayer.Rules)
                 {

CiscoMigration/CiscoParser.cs

@@ -35,8 +35,6 @@ public class CiscoParser : VendorParser
         //if we are using cisco code for fire power vendor we need set this flag to true value
         public bool isUsingForFirePower { get; set; } = false;
 
-        #region Private Members
-        
         #region Helper Classes
 
         private class Indentation
@@ -53,14 +51,14 @@ public Indentation(int? id, int spaces)
 
         #endregion
 
-
+        #region Private Members
 
         private IList<CiscoCommand> _ciscoCommands = new List<CiscoCommand>();
         private Dictionary<string, CiscoCommand> _ciscoIds = new Dictionary<string, CiscoCommand>();
         private Dictionary<string, string> _ciscoAliases = new Dictionary<string, string>();
 
         public static bool SpreadAclRemarks = false;
-        
+
         #endregion
 
         #region Public Methods

SmartMove/CommandLine.cs

@@ -13,7 +13,6 @@
 using System.Text.RegularExpressions;
 using CommonUtils;
 using System.Threading;
-using CheckPointObjects;
 
 namespace SmartMove
 {
@@ -111,7 +110,6 @@ public bool IsAnalyze
         private bool _isInteractive = true;
 
         private bool _isCiscoSpreadAclRemarks = false;
-        private bool _isOptimizeByComments;
         #endregion
 
         public int DisplayHelp()
@@ -131,7 +129,6 @@ public int DisplayHelp()
             Console.WriteLine("\t" + "-f | --format" + "\t\t" + "format of the output file (JSON[default], TEXT)");
             Console.WriteLine("\t" + "-i | --interactive" + "\t" + @"-i false | -i true [default] Interactive mode provides a better user experience.Disable when automation is required[enabled by default]");
             Console.WriteLine("\t" + "-a | --analyzer" + "\t\t" + @"mode for analyze package");
-            Console.WriteLine("\t" + "-obc | --optimize-by-comments" + "\t" + @"(""-obc false"" | ""-obc true"" [default]) create optimized policy by comment and spread acl remarks - only for CiscoASA, FirePower");
             Console.WriteLine();
             Console.WriteLine("Example:");
             Console.WriteLine("\t" + "SmartMove.exe –s \"D:\\SmartMove\\Content\\config.txt\" –v CiscoASA - t \"D:\\SmartMove\\Content\" –n true -k false -f json -a");
@@ -462,23 +459,6 @@ public CommandLine Parse(string[] args)
                             this.isAnalyze = true;
                             break;
                         }
-                    case "-obc":
-                    case "--optimize-by-comments": // adding flag to optimize by comments option
-                        {
-                            if (args[i] == args.Last())
-                            {
-                                _successCommands = false;
-                                Console.WriteLine("Value for option --optimize-by-comments is not specified! ", MessageTypes.Error);
-                            }
-                            else if (bool.TryParse(args[i + 1].ToLower(), out _isOptimizeByComments))
-                                break;
-                            else
-                            {
-                                _successCommands = false;
-                                Console.WriteLine("Value for option format is not corrected! Allow only 'true' or 'false' ", MessageTypes.Error);
-                            }
-                            break;
-                        }
                 }
             }
             return this;
@@ -553,17 +533,10 @@ public void DoAnalyze(CommandLine commandLine)
             switch (commandLine.Vendor)
             {
                 case "CiscoASA":
-                    CiscoParser.SpreadAclRemarks = _isOptimizeByComments;
-                    RuleBaseOptimizer.IsOptimizeByComments = _isOptimizeByComments;
-                    // verifying that the user or the default option won't reverse the flag to false if asking optimize by comments option
-                    CiscoParser.SpreadAclRemarks = _isOptimizeByComments ? true : _isCiscoSpreadAclRemarks;
+                    CiscoParser.SpreadAclRemarks = _isCiscoSpreadAclRemarks;
                     vendorParser = new CiscoParser();
                     break;
                 case "FirePower":
-                    CiscoParser.SpreadAclRemarks = _isOptimizeByComments;
-                    RuleBaseOptimizer.IsOptimizeByComments = _isOptimizeByComments;
-                    // verifying that the user or the default option won't reverse the flag to false if asking optimize by comments option
-                    CiscoParser.SpreadAclRemarks = _isOptimizeByComments ? true : _isCiscoSpreadAclRemarks;
                     vendorParser = new CiscoParser()
                     {
                         isUsingForFirePower = true
@@ -995,15 +968,10 @@ public void DoMigration(CommandLine commandLine)
             switch (commandLine.Vendor)
             {
                 case "CiscoASA":
-                    CiscoParser.SpreadAclRemarks = _isOptimizeByComments;
-                    RuleBaseOptimizer.IsOptimizeByComments = _isOptimizeByComments;
-                    CiscoParser.SpreadAclRemarks = _isOptimizeByComments ? true : _isCiscoSpreadAclRemarks;
+                    CiscoParser.SpreadAclRemarks = _isCiscoSpreadAclRemarks;
                     vendorParser = new CiscoParser();
                     break;
                 case "FirePower":
-                    CiscoParser.SpreadAclRemarks = _isOptimizeByComments;
-                    RuleBaseOptimizer.IsOptimizeByComments = _isOptimizeByComments;
-                    CiscoParser.SpreadAclRemarks = _isOptimizeByComments ? true : _isCiscoSpreadAclRemarks;
                     vendorParser = new CiscoParser()
                     {
                         isUsingForFirePower = true

SmartMove/MainWindow.xaml

@@ -226,23 +226,16 @@
                             <CheckBox x:Name="SkipUnusedObjects" Grid.Row="13" Content="Do not import unused objects"
                                       IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Path=SkipUnusedObjectsConversion, Mode=TwoWay}"
                                       Margin="0,15,0,0" Background="Transparent" Focusable="False"/>
-                            <CheckBox x:Name="OptimizeByComments" Grid.Row="14" Content="Optimize by comments" 
-                                      IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Path=OptimizeByCommentsConversion, Mode=TwoWay}"
-                                      Margin="0,15,0,0" Background="Transparent" Focusable="False" Checked="OptimizeByComments_Checked" Unchecked="OptimizeByComments_Checked"/>
                             <CheckBox x:Name="CreateServiceGroupsConf" Grid.Row="14" Content="Import service groups"
                                       IsChecked="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Path=CreateServiceGroupsConfiguration, Mode=TwoWay}"
                                       Margin="0,15,0,0" Background="Transparent" Focusable="False" Visibility="Collapsed"/>
                             <Grid Grid.Row="15" Margin="0,30,0,0" Background="Transparent" Focusable="False">
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="8*"/>
-                                    <ColumnDefinition Width="8*"/>
-                                    <ColumnDefinition Width="84*"/>
-                                    <ColumnDefinition Width="401*"/>
+                                    <ColumnDefinition/>
                                 </Grid.ColumnDefinitions>
                                 <Button x:Name="Go" Style="{StaticResource GoButtonControlStyle}" HorizontalAlignment="Right"
-                                        Click="Go_OnClick" Grid.Column="3" Margin="0,0,-0.2,2.4"/>
+                                        Click="Go_OnClick"/>
                             </Grid>
-
                         </Grid>
                     </Grid>
                     <Grid x:Name="OutputPanel" Grid.Row="1" Background="Transparent" Focusable="False" Visibility="Collapsed">