Merge pull request #1040 from oracle/issue_1039_virtual_host_discovery

Issue 1039 virtual host discovery

Author: robertpatrick

core/src/main/python/wlsdeploy/aliases/model_constants.py

@@ -299,6 +299,7 @@
 UPDATE_MODE = 'UpdateMode'
 USER = 'User'
 USER_ATTRIBUTES = 'UserAttribute'
+VIRTUAL_HOST = 'VirtualHost'
 VIRTUAL_TARGET = 'VirtualTarget'
 VIRTUAL_USER_AUTHENTICATOR = 'VirtualUserAuthenticator'
 WATCH = 'Watch'

core/src/main/python/wlsdeploy/tool/discover/topology_discoverer.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates.
+Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 from java.io import File
@@ -102,6 +102,9 @@ def discover(self):
         model_folder_name, folder_result = self._get_reliable_delivery_policies()
         discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
 
+        model_folder_name, folder_result = self._get_virtual_hosts()
+        discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
+
         model_folder_name, folder_result = self._get_xml_entity_caches()
         discoverer.add_to_model_if_not_empty(self._dictionary, model_folder_name, folder_result)
 
@@ -471,6 +474,31 @@ def _get_reliable_delivery_policies(self):
         _logger.exiting(class_name=_class_name, method_name=_method_name, result=model_top_folder_name)
         return model_top_folder_name, result
 
+    def _get_virtual_hosts(self):
+        """
+        Discover the virtual hosts that are present in the domain.
+        :return: model name for the folder: dictionary containing the discovered virtual hosts
+        """
+        _method_name = '_get_virtual_hosts'
+        _logger.entering(class_name=_class_name, method_name=_method_name)
+        model_top_folder_name = model_constants.VIRTUAL_HOST
+        result = OrderedDict()
+        location = LocationContext(self._base_location)
+        location.append_location(model_top_folder_name)
+        vhosts = self._find_names_in_folder(location)
+        if vhosts is not None:
+            _logger.info('WLSDPLY-06647', len(vhosts), class_name=_class_name, method_name=_method_name)
+            name_token = self._aliases.get_name_token(location)
+            for vhost in vhosts:
+                _logger.info('WLSDPLY-06648', vhost, class_name=_class_name, method_name=_method_name)
+                location.add_name_token(name_token, vhost)
+                result[vhost] = OrderedDict()
+                self._populate_model_parameters(result[vhost], location)
+                location.remove_name_token(name_token)
+
+        _logger.exiting(class_name=_class_name, method_name=_method_name, result=model_top_folder_name)
+        return model_top_folder_name, result
+
     def _get_xml_entity_caches(self):
         """
         Discover the XML entity caches that are used by the servers in the domain.

core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/VirtualHost.json

@@ -1,5 +1,5 @@
 {
-    "copyright": "Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.",
+    "copyright": "Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.",
     "license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
     "wlst_type": "VirtualHost${:s}",
     "child_folders_type": "multiple",
@@ -68,7 +68,7 @@
         "UriPath":                             [ {"version": "[12.2.1,)",           "wlst_mode": "both",    "wlst_name": "UriPath",                             "wlst_path": "WP001", "value": {"default": "None"  }, "wlst_type": "string",          "get_method": "${LSA:GET}" } ],
         "UseHeaderEncoding":                   [ {"version": "[10,)",               "wlst_mode": "both",    "wlst_name": "UseHeaderEncoding",                   "wlst_path": "WP001", "value": {"default": false   }, "wlst_type": "boolean"          } ],
         "UseHighestCompatibleHTTPVersion":     [ {"version": "[10,)",               "wlst_mode": "both",    "wlst_name": "UseHighestCompatibleHTTPVersion",     "wlst_path": "WP001", "value": {"default": true    }, "wlst_type": "boolean"          } ],
-        "VirtualHostName":                     [ {"version": "[10,)",               "wlst_mode": "both",    "wlst_name": "VirtualHostName${:s}",                "wlst_path": "WP001", "value": {"default": "None"  }, "wlst_type": "delimited_string", "get_method": "LSA" } ],
+        "VirtualHostName":                     [ {"version": "[10,)",               "wlst_mode": "both",    "wlst_name": "VirtualHostName${:s}",                "wlst_path": "WP001", "value": {"default": "None"  }, "wlst_type": "${delimited_string:list}", "get_method": "${LSA:GET}" } ],
         "WAPEnabled":                          [ {"version": "[10,)",               "wlst_mode": "both",    "wlst_name": "WAPEnabled",                          "wlst_path": "WP001", "value": {"default": false   }, "wlst_type": "boolean"          } ],
         "WebDeployment":                       [ {"version": "[10,)",               "wlst_mode": "offline", "wlst_name": "WebDeployment",                       "wlst_path": "WP001", "value": {"default": "None"  }, "wlst_type": "delimited_string", "get_method": "LSA" } ],
         "WorkManagerForRemoteSessionFetching": [ {"version": "[10,)",               "wlst_mode": "both",    "wlst_name": "WorkManagerForRemoteSessionFetching", "wlst_path": "WP001", "value": {"default": "None"  }, "wlst_type": "string",          "get_method": "${LSA:GET}" } ],

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -783,7 +783,7 @@ WLSDPLY-06629=Adding Log Filter {0}
 WLSDPLY-06630=Discovering {0} Reliable Delivery Policies
 WLSDPLY-06631=Adding Reliable Delivery Policy {0}
 WLSDPLY-06632=Discovering {0} XML Entity Caches
-WLSDPLY-06633=Adding XML Entity Cache{0}
+WLSDPLY-06633=Adding XML Entity Cache {0}
 WLSDPLY-06634=Discovering {0} XML Registries
 WLSDPLY-06635=Adding XML Registry {0}
 WLSDPLY-06636=Adding keystore file {0} for node manager to archive file
@@ -799,6 +799,8 @@ WLSDPLY-06642=Custom Keystore file {0} at location {1} is a kss type which is no
 WLSDPLY-06644=Adding Domain {0}
 WLSDPLY-06645=Machine is not present in domain. Remove SecurityConfiguration NodeManagerPasswordEncrypted default
 WLSDPLY-06646=Machine is present in domain so will not remove SecurityConfiguration NodeManagerPasswordEncrypted default
+WLSDPLY-06647=Discovering {0} Virtual Hosts
+WLSDPLY-06648=Adding Virtual Host {0}
 
 
 # multi_tenant_discoverer.py, multi_tenant_resources_dsi