Skip to content

Commit 9481916

Browse files
committed
Merge branch 'jira-wdt-915-generate' into 'main'
Tokenize SNMPAgentDeployment default value for alias test See merge request weblogic-cloud/weblogic-deploy-tooling!1740
2 parents d55a8a4 + 7262e13 commit 9481916

File tree

1 file changed

+4
-2
lines changed
  • integration-tests/alias-test/generate/src/test/python/aliastest/generate

1 file changed

+4
-2
lines changed

integration-tests/alias-test/generate/src/test/python/aliastest/generate/generator_wlst.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
'WarnOnUsernamePasswords'.lower()
4343
]
4444

45-
# PrefixName and UriPrefix are not file system paths, but needs tokenizing for cases like /VirtualTarget-12153
45+
# PrefixName, UriPrefix, EngineId are not file system paths, but need tokenizing for cases like /VirtualTarget-12153
4646
PATH_ATTRIBUTE_NAME_ENDINGS = ['File', 'Directory', 'FileName', 'Home', 'DirectoryName', 'Path', 'Dir', 'Root',
47-
'PrefixName', 'UriPrefix']
47+
'PrefixName', 'UriPrefix', 'EngineId']
4848
PATH_ATTRIBUTE_NAME_EXCEPTIONS = [
4949
'AcceptContextPathInGetRealPath',
5050
'BasePath',
@@ -68,6 +68,7 @@
6868
JMS_SERVER_NAME_PATTERN = r'JMSServer[s]?-\d{3,5}'
6969
PARTITION_NAME_PATTERN = r'Partition[s]?-\d{3,5}'
7070
RESOURCE_GROUP_TEMPLATE_PATTERN = r'ResourceGroupTemplate[s]?-\d{3,5}'
71+
SNMP_AGENT_DEPLOYMENT_PATTERN = r'SNMPAgentDeployment[s]?-\d{3,5}'
7172
VIRTUAL_TARGET_NAME_PATTERN = r'VirtualTarget[s]?-\d{3,5}'
7273

7374
DOMAIN_HOME_TOKEN = '@@DOMAIN_HOME@@'
@@ -618,6 +619,7 @@ def tokenize_path_value(model_context, attribute_name, attribute_value):
618619
result = re.sub(SERVER_TEMPLATE_NAME_PATTERN, '%SERVERTEMPLATE%', result)
619620
result = re.sub(PARTITION_NAME_PATTERN, '%PARTITION%', result)
620621
result = re.sub(RESOURCE_GROUP_TEMPLATE_PATTERN, '%RESOURCEGROUPTEMPLATE%', result)
622+
result = re.sub(SNMP_AGENT_DEPLOYMENT_PATTERN, '%SNMPAGENTDEPLOYMENT%', result)
621623
result = re.sub(VIRTUAL_TARGET_NAME_PATTERN, '%VIRTUALTARGET%', result)
622624
else:
623625
__logger.warning('Attribute {0} value {1} is not a string', attribute_name, attribute_value,

0 commit comments

Comments
 (0)