Merge branch 'wdt-797' into 'main'

Force online discover to force disconnect to avoid hanging

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

Author: robertpatrick

core/src/main/python/discover.py

@@ -440,7 +440,9 @@ def __disconnect_domain(helper):
 
     if __wlst_mode == WlstModes.ONLINE:
         try:
-            helper.disconnect()
+            # Force disconnect in case the domain is in dev mode and the user
+            # has opened the Console, which automatically acquires an edit lock.
+            helper.disconnect('true')
         except PyWLSTException, wlst_ex:
             ex = exception_helper.create_discover_exception('WLSDPLY-06006',
                                                             wlst_ex.getLocalizedMessage(), error=wlst_ex)

core/src/main/python/wlsdeploy/tool/util/wlst_helper.py

@@ -829,16 +829,17 @@ def connect(self, username, password, url, timeout):
 
         self.__logger.exiting(class_name=self.__class_name, method_name=_method_name)
 
-    def disconnect(self):
+    def disconnect(self, force='false'):
         """
         Disconnects WLST from the current connected WebLogic Server instance.
+        :param: whether to force disconnect (value must be a string)
         :raises: Exception for the specified tool type: if a WLST error occurs
         """
         _method_name = 'disconnect'
-        self.__logger.entering(class_name=self.__class_name, method_name=_method_name)
+        self.__logger.entering(force, class_name=self.__class_name, method_name=_method_name)
 
         try:
-            self.__load_global('disconnect')()
+            self.__load_global('disconnect')(force)
         except self.__load_global('WLSTException'), e:
             pwe = exception_helper.create_exception(self.__exception_type, 'WLSDPLY-00048',
                                                     _format_exception(e), error=e)