Merge branch 'jira-wdt-912-nm-properties' into 'main'

Update NM properties before first WLST updateDomain call for offline

See merge request weblogic-cloud/weblogic-deploy-tooling!1719

Author: robertpatrick

core/src/main/python/update.py

@@ -191,6 +191,7 @@ def __update_online(model_deployer, model, model_context, aliases):
         topology_updater.set_server_groups()
 
         topology_updater.clear_placeholder_targeting(jdbc_names)
+        topology_updater.update_nm_properties()  # alias will skip for online, but log the omission
         topology_updater.update()
         model_deployer.deploy_resources()
         model_deployer.distribute_database_wallets_online()
@@ -243,6 +244,9 @@ def __update_offline(model_deployer, model, model_context, aliases):
         rcu_helper = RCUHelper(model, None, model_context, aliases, exception_type=ExceptionType.DEPLOY)
         rcu_helper.update_rcu_password()
 
+    # this needs to be before first updateDomain for NativeVersionEnabled=true to update correctly
+    topology_updater.update_nm_properties()
+
     __update_offline_domain()
 
     topology_updater.set_server_groups()

core/src/main/python/wlsdeploy/tool/deploy/topology_updater.py

@@ -10,6 +10,7 @@
 from wlsdeploy.aliases.model_constants import FRONTEND_HOST
 from wlsdeploy.aliases.model_constants import MACHINE
 from wlsdeploy.aliases.model_constants import MIGRATABLE_TARGET
+from wlsdeploy.aliases.model_constants import NM_PROPERTIES
 from wlsdeploy.aliases.model_constants import SECURITY
 from wlsdeploy.aliases.model_constants import SECURITY_CONFIGURATION
 from wlsdeploy.aliases.model_constants import SERVER
@@ -114,6 +115,9 @@ def update(self):
         # /Security cannot be updated on existing domain
         folder_list.remove(SECURITY)
 
+        # /NMProperties were handled before first updateDomain
+        folder_list.remove(NM_PROPERTIES)
+
         self._security_provider_creator.create_security_configuration(location)
         folder_list.remove(SECURITY_CONFIGURATION)
 
@@ -187,6 +191,16 @@ def update_machines_clusters_and_servers(self, delete_now=True):
     def clear_placeholder_targeting(self, jdbc_names):
         self.topology_helper.clear_jdbc_placeholder_targeting(jdbc_names)
 
+    def update_nm_properties(self):
+        """
+        The NMProperties section has to be done before the first WLST updateDomain() call in offline WLST.
+        If it is done after, NativeVersionEnabled=true will not update correctly.
+        """
+        domain_token = deployer_utils.get_domain_token(self.aliases)
+        location = LocationContext()
+        location.add_name_token(domain_token, self.model_context.get_domain_name())
+        self._process_section(self._topology, [], NM_PROPERTIES, location)
+
     def warn_set_server_groups(self):
         # For issue in setServerGroups in online mode (new configured clusters and stand-alone managed servers
         # will not have extension template resources targeted)