Merge pull request #526 from swaschkut/main

UTIL type=service-merger - class ServiceGroup | bugfix to not delete ServiceGroup members during merge

CHANGELOG.txt

@@ -1,6 +1,14 @@
 CHANGELOG
 
-2.0.32
+2.0.33
+UTILS:
+
+BUGFIX:
+
+GENERAL:
+
+
+2.0.32 (20220318)
 UTILS:
 * UTIL type=rule | rework 'filter=(service port.counter)' is now 'filter=(service.port.count >,<,=,! COUNT)')
 * UTIL type=rule | extend actions=exportToExcel with service Counter
@@ -25,6 +33,7 @@ BUGFIX:
 * UTIL type=device actions=display-shadowrule | bugfix for nat rules
 * UTIL type=rule actions=exporttoExcel:FILE.html,ResolveScheduleSummary | bugfix to  display all type of schedule
 * class Rule.php methode zonecalculation - bugfix for NAT to
+* UTIL type=service-merger - class ServiceGroup | bugfix to not delete ServiceGroup members during merge, if this member is available in same name and value at upperlevel
 
 GENERAL:
 

lib/misc-classes/PH.php

@@ -153,7 +153,7 @@ function __construct($argv, $argc)
 
     private static $library_version_major = 2;
     private static $library_version_sub = 0;
-    private static $library_version_bugfix = 32;
+    private static $library_version_bugfix = 33;
 
     //BASIC AUTH PAN-OS 7.1
     public static $softwareupdate_key = "658d787f293e631196dac9fb29490f1cc1bb3827";

lib/object-classes/ServiceGroup.php

@@ -316,16 +316,21 @@ public function replaceReferencedObject($old, $new)
 
         if( $pos !== FALSE )
         {
+            while( $pos !== FALSE )
+            {
+                unset($this->members[$pos]);
+                $pos = array_search($old, $this->members, TRUE);
+            }
+
             if( $new !== null && !$this->has( $new->name() ) )
             {
-                $this->addMember($new, FALSE);
-                if( $old->name() == $new->name() )
-                    $this->removeMember($old, FALSE);
-                else
-                    $this->removeMember($old);
+                $this->members[] = $new;
+                $new->addReference($this);
             }
-            else
-                $this->removeMember($old);
+            $old->removeReference($this);
+
+            if( $new === null || $new->name() != $old->name() )
+                $this->rewriteXML();
 
             return TRUE;
         }