Skip to content

Commit e7f903d

Browse files
authored
Add name list to messages 05026 and 05029, pass value in k8s validator (#955)
* JIRA WDT-571 - Add name list to messages 05026 and 05029, pass value in k8s validator; checked other calls * Corrected indention
1 parent 60bbab7 commit e7f903d

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

core/src/main/python/wlsdeploy/tool/validate/kubernetes_validator.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ def validate_folder(self, model_folder, schema_folder, schema_path, model_path):
9797
self._validate_simple_type(model_value, property_type, key, model_path)
9898

9999
else:
100-
self._logger.severe("WLSDPLY-05026", key, len(schema_properties), model_path, class_name=self._class_name,
100+
self._logger.severe("WLSDPLY-05026", key, len(schema_properties), model_path,
101+
'%s' % ', '.join(schema_properties), class_name=self._class_name,
101102
method_name=_method_name)
102103

103104
def _validate_multiple_folder(self, model_value, property_map, schema_path, model_path):

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,11 +463,11 @@ WLSDPLY-05022=Model location {0} references variable {1} that is not defined in
463463
WLSDPLY-05023=Value of attribute {0} at model location {1} has an unexpected data type: {2}
464464
WLSDPLY-05024=Attribute {0} in model location {1} references entry {2} that is not found in the archive file {3}
465465
WLSDPLY-05025=Attribute {0} in model location {1} references archive entry {2} but the archive file was not provided
466-
WLSDPLY-05026={0} is not one of the {1} names allowed in model location {2}
466+
WLSDPLY-05026={0} is not one of the {1} names allowed in model location {2}. Valid names are {3}
467467
# The WLSDPLY-05027 resource is used for messages returned from aliases.is_valid_model_folder_name() and aliases.is_valid_model_attribute_name
468468
WLSDPLY-05027={0}
469469
WLSDPLY-05028=Folder instance name {0} is not valid in location {1} of the model
470-
WLSDPLY-05029={0} is not one of the attribute names allowed in model location {1}
470+
WLSDPLY-05029={0} is not one of the attribute names allowed in model location {1}. Valid names are {2}
471471
WLSDPLY-05030=Model location {0} uses variable {1} to represent the name of a model subfolder or attribute. \
472472
Substitution variables can only be used for folder instance names and attribute values.
473473
WLSDPLY-05031=Attribute {0} in model location {1} references a relative file location {2}. This makes the model \

0 commit comments

Comments
 (0)