Revert "Server Upgrade: respect --test option in plugins"

This reverts commit c95c4849ae1ecc90ac926b8b7d61e153b42e7699.

7 files changed, 0 insertions, 35 deletions

diff --git a/ipaserver/install/plugins/dns.py b/ipaserver/install/plugins/dns.py
index 2e33982e7..f562978bc 100644
--- a/ipaserver/install/plugins/dns.py
+++ b/ipaserver/install/plugins/dns.py
@@ -60,10 +60,6 @@ class update_dnszones(PostUpdate):
     order=MIDDLE
 
     def execute(self, **options):
-        if not options.get('live_run'):
-            self.log.info("Test mode: skipping 'update_dnszones'")
-            return False, False, ()
-
         ldap = self.obj.backend
         if not dns_container_exists(ldap):
             return (False, False, [])
@@ -163,11 +159,6 @@ class update_master_to_dnsforwardzones(PostUpdate):
     backup_path = u'%s%s' % (backup_dir, backup_filename)
 
     def execute(self, **options):
-        if not options.get('live_run'):
-            self.log.info("Test mode: skipping "
-                          "'update_master_to_dnsforwardzones'")
-            return False, False, ()
-
         ldap = self.obj.backend
         # check LDAP if forwardzones already uses new semantics
         dns_container_dn = DN(api.env.container_dns, api.env.basedn)
diff --git a/ipaserver/install/plugins/fix_replica_agreements.py b/ipaserver/install/plugins/fix_replica_agreements.py
index 597a13314..a5ff4819f 100644
--- a/ipaserver/install/plugins/fix_replica_agreements.py
+++ b/ipaserver/install/plugins/fix_replica_agreements.py
@@ -38,10 +38,6 @@ class update_replica_attribute_lists(PreUpdate):
     order = MIDDLE
 
     def execute(self, **options):
-        if not options.get('live_run'):
-            self.log.info("Test mode: skipping "
-                          "'update_replica_attribute_lists'")
-            return False, False, ()
         # We need an IPAdmin connection to the backend
         self.log.debug("Start replication agreement exclude list update task")
         conn = ipaldap.IPAdmin(api.env.host, ldapi=True, realm=api.env.realm)
diff --git a/ipaserver/install/plugins/update_idranges.py b/ipaserver/install/plugins/update_idranges.py
index cc462ef12..1aa5fa763 100644
--- a/ipaserver/install/plugins/update_idranges.py
+++ b/ipaserver/install/plugins/update_idranges.py
@@ -33,9 +33,6 @@ class update_idrange_type(PostUpdate):
     order = MIDDLE
 
     def execute(self, **options):
-        if not options.get('live_run'):
-            self.log.info("Test mode: skipping 'update_idrange_type'")
-            return False, False, ()
         ldap = self.obj.backend
 
         base_dn = DN(api.env.container_ranges, api.env.basedn)
@@ -124,10 +121,6 @@ class update_idrange_baserid(PostUpdate):
     order = LAST
 
     def execute(self, **options):
-        if not options.get('live_run'):
-            self.log.info("Test mode: skipping 'update_idrange_baserid'")
-            return False, False, ()
-
         ldap = self.obj.backend
 
         base_dn = DN(api.env.container_ranges, api.env.basedn)
diff --git a/ipaserver/install/plugins/update_managed_permissions.py b/ipaserver/install/plugins/update_managed_permissions.py
index 55e106854..430a2919a 100644
--- a/ipaserver/install/plugins/update_managed_permissions.py
+++ b/ipaserver/install/plugins/update_managed_permissions.py
@@ -402,10 +402,6 @@ class update_managed_permissions(PostUpdate):
 
 
     def execute(self, **options):
-        if not options.get('live_run'):
-            self.log.info("Test mode: skipping 'update_managed_permissions'")
-            return False, False, ()
-
         ldap = self.api.Backend[ldap2]
 
         anonymous_read_aci = self.get_anonymous_read_aci(ldap)
diff --git a/ipaserver/install/plugins/update_pacs.py b/ipaserver/install/plugins/update_pacs.py
index 1286d7511..653456bb8 100644
--- a/ipaserver/install/plugins/update_pacs.py
+++ b/ipaserver/install/plugins/update_pacs.py
@@ -31,10 +31,6 @@ class update_pacs(PostUpdate):
     order = MIDDLE
 
     def execute(self, **options):
-        if not options.get('live_run'):
-            self.log.info("Test mode: skipping 'update_pacs'")
-            return False, False, ()
-
         ldap = self.obj.backend
 
         try:
diff --git a/ipaserver/install/plugins/update_referint.py b/ipaserver/install/plugins/update_referint.py
index c6c62b70f..1b7411035 100644
--- a/ipaserver/install/plugins/update_referint.py
+++ b/ipaserver/install/plugins/update_referint.py
@@ -28,9 +28,6 @@ class update_referint(PreUpdate):
                            ('cn', 'plugins'), ('cn', 'config'))
 
     def execute(self, **options):
-        if not options.get('live_run'):
-            self.log.info("Test mode: skipping 'update_referint'")
-            return False, False, ()
 
         root_logger.debug("Upgrading referential integrity plugin configuration")
         ldap = self.obj.backend
diff --git a/ipaserver/install/plugins/update_services.py b/ipaserver/install/plugins/update_services.py
index d213ace62..2122abb10 100644
--- a/ipaserver/install/plugins/update_services.py
+++ b/ipaserver/install/plugins/update_services.py
@@ -33,10 +33,6 @@ class update_service_principalalias(PostUpdate):
     order = MIDDLE
 
     def execute(self, **options):
-        if not options.get('live_run'):
-            self.log.info("Test mode: skipping 'update_service_principalalias'")
-            return False, False, ()
-
         ldap = self.obj.backend
 
         base_dn = DN(api.env.container_service, api.env.basedn)