Update WKO domain resource schema (#770)

* JIRA WDT-488 - Update default API version

* JIRA WDT-488 - Allow hyphenated list in YAML output

* JIRA WDT-488 - Add spec / configuration, including model / domainType and secrets

* JIRA WDT-488 - Read WKO domain resource schema

* JIRA WDT-488 - Verify types and structure of WKO domain resource schema; build a complete model

* JIRA WDT-488 - Rename unit test

* JIRA WDT-488 - Use v8 schema

* JIRA WDT-488 - Add metadata and top-level attributes to schema

* JIRA WDT-488 - Use flag for hyphenated YAML output instead of type classes

* JIRA WDT-488 - Revised validator and extractor to use schema

* JIRA WDT-488 - Added blank lines at end of files

* JIRA WDT-488 - Updated kubernetes validator to log more issues

* JIRA WDT-488 - Add empty property sets for unsupported folders

* JIRA WDT-488 - Use WKO schema for modelHelp in kubernetes section

* JIRA WDT-488 - Remove kubernetes aliases and references

* JIRA WDT-488 - Avoid list attribute check in kubernetes section

* JIRA WDT-488 - Improve checks for unsupported folders

* JIRA WDT-488 - Refactore type checks in WKO schema

* JIRA WDT-488 - Refactor extractor to use type check methods

* JIRA WDT-488 - Refactor kubernetes help to use WKO helper methods

* JIRA WDT-488 - Corrected spelling

Author: rakillen

core/src/main/python/compare_model.py

@@ -36,6 +36,7 @@
 from wlsdeploy.aliases.alias_constants import ALIAS_LIST_TYPES
 from wlsdeploy.aliases.aliases import Aliases
 from wlsdeploy.aliases.location_context import LocationContext
+from wlsdeploy.aliases.model_constants import KUBERNETES
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.exception.expection_types import ExceptionType
@@ -265,6 +266,9 @@ def _parse_change_path(self, path):
         path_tokens = path.split(PATH_TOKEN)
         folder_names = self.aliases.get_model_section_top_level_folder_names(path_tokens[0])
 
+        if path_tokens[0] == KUBERNETES:
+            return None, None
+
         for path_token in path_tokens[1:]:
             attribute_names = self.aliases.get_model_attribute_names(location)
 
@@ -713,11 +717,11 @@ def main():
         sys.exit(exit_code)
     except CompareException, ce:
         cla_helper.clean_up_temp_files()
-        _logger.severe('WLSDPLY-05704', ce.getLocalizedMessage())
+        _logger.severe('WLSDPLY-05704', ce.getLocalizedMessage(), class_name=_class_name, method_name=_method_name)
         System.exit(2)
     except PyWLSTException, pe:
         cla_helper.clean_up_temp_files()
-        _logger.severe('WLSDPLY-05704', pe.getLocalizedMessage())
+        _logger.severe('WLSDPLY-05704', pe.getLocalizedMessage(), class_name=_class_name, method_name=_method_name)
         System.exit(2)
     except:
         exc_type, exc_obj, exc_tb = sys.exc_info()

core/src/main/python/extract_resource.py

@@ -4,7 +4,6 @@
 
 The entry point for the extractDomainResource tool.
 """
-import os
 import sys
 
 from oracle.weblogic.deploy.deploy import DeployException
@@ -66,6 +65,7 @@ def __process_args(args):
     cla_helper.validate_variable_file_exists(_program_name, argument_map)
     cla_helper.process_encryption_args(argument_map)
 
+    argument_map[CommandLineArgUtil.VALIDATION_METHOD] = CommandLineArgUtil.LAX_VALIDATION_METHOD
     model_context = model_context_helper.create_context(_program_name, argument_map)
     model_context.set_ignore_missing_archive_entries(True)
     return model_context

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

@@ -54,14 +54,11 @@
 from wlsdeploy.aliases.model_constants import DOMAIN_INFO_ALIAS
 from wlsdeploy.aliases.model_constants import JOLT_CONNECTION_POOL
 from wlsdeploy.aliases.model_constants import JPA
-from wlsdeploy.aliases.model_constants import KUBERNETES
-from wlsdeploy.aliases.model_constants import KUBERNETES_ALIAS
 from wlsdeploy.aliases.model_constants import ODL_CONFIGURATION
 from wlsdeploy.aliases.model_constants import OHS
 from wlsdeploy.aliases.model_constants import RCU_DB_INFO
 from wlsdeploy.aliases.model_constants import RESOURCE_MANAGER
 from wlsdeploy.aliases.model_constants import RESOURCES
-from wlsdeploy.aliases.model_constants import SERVER_POD
 from wlsdeploy.aliases.model_constants import SYSTEM_COMPONENT
 from wlsdeploy.aliases.model_constants import TOPOLOGY
 from wlsdeploy.aliases.model_constants import WLS_ROLES
@@ -160,25 +157,16 @@ class AliasEntries(object):
         WLS_USER_PASSWORD_CREDENTIAL_MAPPINGS
     ]
 
-    __kubernetes_top_level_folders = [
-        'metadata',
-        'spec'
-    ]
-
     __section_top_folders_map = {
         DOMAIN_INFO: __domain_info_top_level_folders,
         TOPOLOGY: __topology_top_level_folders,
         RESOURCES: __resources_top_level_folders,
-        APP_DEPLOYMENTS: __app_deployments_top_level_folders,
-        KUBERNETES: __kubernetes_top_level_folders
+        APP_DEPLOYMENTS: __app_deployments_top_level_folders
     }
 
     # in rare cases, the alias file name does not match the folder name
     __alternate_alias_file_name_map = {
-        APPLICATION: 'AppDeployment',
-        'metadata': 'Metadata',
-        'spec': 'Spec',
-        'serverPod': 'ServerPod'
+        APPLICATION: 'AppDeployment'
     }
 
     # all the categories that appear at the top of model sections
@@ -187,19 +175,16 @@ class AliasEntries(object):
     __top_model_categories.extend(__resources_top_level_folders)
     __top_model_categories.extend(__app_deployments_top_level_folders)
     __top_model_categories.extend(__domain_info_top_level_folders)
-    __top_model_categories.extend(__kubernetes_top_level_folders)
 
     # all the categories, including section-attribute and contained categories
     __all_model_categories = []
     __all_model_categories.extend(__top_model_categories)
 
     # include contained categories
     __all_model_categories.append(RESOURCE_MANAGER)
-    __all_model_categories.append(SERVER_POD)
 
     # include section attribute categories
     __all_model_categories.append(DOMAIN_INFO_ALIAS)
-    __all_model_categories.append(KUBERNETES_ALIAS)
 
     __domain_name_token = 'DOMAIN'
 
@@ -309,9 +294,6 @@ def get_model_section_attribute_location(self, section_name):
         if section_name == DOMAIN_INFO:
             return LocationContext().append_location(DOMAIN_INFO_ALIAS)
 
-        if section_name == KUBERNETES:
-            return LocationContext().append_location(KUBERNETES_ALIAS)
-
         return None
 
     def get_model_subfolder_names_for_location(self, location):

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

@@ -164,7 +164,6 @@
 JOLT_CONNECTION_POOL = 'JoltConnectionPool'
 KEY = 'Key'
 KUBERNETES = 'kubernetes'
-KUBERNETES_ALIAS = 'Kubernetes'
 LDAP_AUTHENTICATOR = 'LDAPAuthenticator'
 LDAP_X509_IDENTITY_ASSERTER = 'LDAPX509IdentityAsserter'
 LIBRARY = 'Library'
@@ -261,7 +260,6 @@
 SERVER = 'Server'
 SERVER_FAILURE_TRIGGER = 'ServerFailureTrigger'
 SERVER_GROUP_TARGETING_LIMITS = 'ServerGroupTargetingLimits'
-SERVER_POD = 'serverPod'
 SERVER_NAME_PREFIX = 'ServerNamePrefix'
 SERVER_NAME_START_IDX = 'ServerNameStartingIndex'
 SERVER_START = 'ServerStart'