Skip to content

Commit 2742a80

Browse files
ddsharpeddsharpe
authored
Merge pull request #92 from oracle/Issue#91-Added-ability-to-managed-NMProperties-folder
Added NMProperties JSON alias file and some constants to alias_entrie…
2 parents 12785ff + 79de379 commit 2742a80

File tree

4 files changed

+85
-0
lines changed

4 files changed

+85
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ class AliasEntries(object):
8585
'MailSession': 'MailSession',
8686
'MessagingBridge': 'MessagingBridge',
8787
'MigratableTarget': 'MigratableTarget',
88+
'NMProperties': 'NMProperties',
8889
'Partition': 'Partition',
8990
'PartitionWorkManager': 'PartitionWorkManager',
9091
'PathService': 'PathService',
@@ -114,6 +115,7 @@ class AliasEntries(object):
114115
'Log',
115116
'Machine',
116117
'MigratableTarget',
118+
'NMProperties',
117119
"RestfulManagementServices",
118120
'Security',
119121
'SecurityConfiguration',

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
MULTICAST_PORT = 'MulticastPort'
148148
NEGOTIATE_IDENTITY_ASSERTER = 'NegotiateIdentityAsserter'
149149
NETWORK_ACCESS_POINT = 'NetworkAccessPoint'
150+
NM_PROPERTIES = 'NMProperties'
150151
NM_TYPE = 'NMType'
151152
NODE_MANAGER = 'NodeManager'
152153
NODE_MANAGER_PW_ENCRYPTED = 'NodeManagerPasswordEncrypted'

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

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
{
2+
"copyright": "Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.",
3+
"license": "The Universal Permissive License (UPL), Version 1.0",
4+
"wlst_type": "NMProperties",
5+
"folders": {},
6+
"attributes": {
7+
"AuthenticationEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "AuthenticationEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean"} ],
8+
"CertificateFile": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "CertificateFile", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
9+
"CipherSuites": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "CipherSuites", "wlst_path": "WP001", "value": {"default": "TLS_RSA_EXPORT_WITH_RC4_40_MD5" }, "wlst_type": "string" } ],
10+
"CrashRecoveryEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "CrashRecoveryEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean"} ],
11+
"CustomIdentityAlias": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "CustomIdentityAlias", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
12+
"CustomIdentityKeyStoreFileName": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "CustomIdentityKeyStoreFileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
13+
"CustomIdentityKeyStorePassPhrase": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "CustomIdentityKeyStorePassPhrase", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password" } ],
14+
"CustomIdentityKeyStoreType": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "CustomIdentityKeyStoreType", "wlst_path": "WP001", "value": {"default": "java.security" }, "wlst_type": "string" } ],
15+
"CustomIdentityPrivateKeyPassPhrase": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "CustomIdentityPrivateKeyPassPhrase", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password" } ],
16+
"DomainRegistrationEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "DomainRegistrationEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean"} ],
17+
"DomainsDirRemoteSharingEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "DomainsDirRemoteSharingEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean"} ],
18+
"DomainsFile": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "DomainsFile", "wlst_path": "WP001", "value": {"default": "@@DOMAIN_HOME@@/nodemanager/nodemanager.domains" }, "wlst_type": "string" } ],
19+
"DomainsFileEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "DomainsFileEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean"} ],
20+
"Interface": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "Interface", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
21+
"InterfaceName": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "InterfaceName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
22+
"JavaHome": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "JavaHome", "wlst_path": "WP001", "value": {"default": "@@JAVA_HOME@@" }, "wlst_type": "string" } ],
23+
"JavaStandardTrustKeyStorePassPhrase": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "JavaStandardTrustKeyStorePassPhrase", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password" } ],
24+
"KeyFile": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "KeyFile", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
25+
"KeyPassword": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "KeyPassword", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password" } ],
26+
"KeyStores": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "KeyStores", "wlst_path": "WP001", "value": {"default": "DemoIdentityAndDemoTrust" }, "wlst_type": "string" } ],
27+
"ListenAddress": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "ListenAddress", "wlst_path": "WP001", "value": {"default": "localhost" }, "wlst_type": "string" } ],
28+
"ListenBacklog": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "ListenBacklog", "wlst_path": "WP001", "value": {"default": 50 }, "wlst_type": "integer" } ],
29+
"ListenPort": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "ListenPort", "wlst_path": "WP001", "value": {"default": 5556 }, "wlst_type": "integer" } ],
30+
"LogAppend": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "LogAppend", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean"} ],
31+
"LogCount": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "LogCount", "wlst_path": "WP001", "value": {"default": 1 }, "wlst_type": "integer" } ],
32+
"LogFile": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "LogFile", "wlst_path": "WP001", "value": {"default": "@@DOMAIN_HOME@@/nodemanager/nodemanager.log" }, "wlst_type": "string" } ],
33+
"LogFormatter": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "LogFormatter", "wlst_path": "WP001", "value": {"default": "weblogic.nodemanager.server.LogFormatter" }, "wlst_type": "string" } ],
34+
"LogLevel": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "LogLevel", "wlst_path": "WP001", "value": {"default": "INFO" }, "wlst_type": "string" } ],
35+
"LogLimit": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "LogLimit", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ],
36+
"LogToStderr": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "LogToStderr", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean"} ],
37+
"NativeVersionEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "NativeVersionEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean"} ],
38+
"NetMask": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "NetMask", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
39+
"NodeManagerHome": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "NodeManagerHome", "wlst_path": "WP001", "value": {"default": "@@DOMAIN_HOME@@/nodemanager" }, "wlst_type": "string" } ],
40+
"ProcessDestroyTimeout": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "ProcessDestroyTimeout", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ],
41+
"PropertiesVersion": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "PropertiesVersion", "wlst_path": "WP001", "value": {"default": "12.2.1" }, "wlst_type": "string" } ],
42+
"QuitEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "QuitEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean"} ],
43+
"SecureListener": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "SecureListener", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean"} ],
44+
"StateCheckInterval": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "StateCheckInterval", "wlst_path": "WP001", "value": {"default": 500 }, "wlst_type": "integer" } ],
45+
"UseKSSForDemo": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "UseKSSForDemo", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean"} ],
46+
"WebLogicHome": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "WebLogicHome", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
47+
"coherence.StartScriptEnabled": [ {"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "coherence.StartScriptEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean"} ],
48+
"coherence.StartScriptName": [ {"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "coherence.StartScriptName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
49+
"weblogic.StartScriptEnabled": [ {"version": "[12.1.2,12.1.3)", "wlst_mode": "offline", "wlst_name": "StartScriptEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" },
50+
{"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "weblogic.StartScriptEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],
51+
"weblogic.StartScriptName": [ {"version": "[12.1.2,12.1.3)", "wlst_mode": "offline", "wlst_name": "StartScriptName", "wlst_path": "WP001", "value": {"default": "startWebLogic.cmd" }, "wlst_type": "string" },
52+
{"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "weblogic.StartScriptName", "wlst_path": "WP001", "value": {"default": "startWebLogic.cmd" }, "wlst_type": "string" } ],
53+
"weblogic.StopScriptEnabled": [ {"version": "[12.1.2,12.1.3)", "wlst_mode": "offline", "wlst_name": "StopScriptEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" },
54+
{"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "weblogic.StopScriptEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
55+
"weblogic.StopScriptName": [ {"version": "[12.1.2,12.1.3)", "wlst_mode": "offline", "wlst_name": "StopScriptName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" },
56+
{"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "weblogic.StopScriptName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ]
57+
},
58+
"wlst_attributes_path": "WP001",
59+
"wlst_paths": {
60+
"WP001": "/NMProperties"
61+
}
62+
}
63+

‎core/src/test/python/aliases_test.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,6 +1214,25 @@ def testIssue57Fix(self):
12141214

12151215
return
12161216

1217+
def testIssue91Fix(self):
1218+
location = LocationContext().append_location(FOLDERS.NM_PROPERTIES)
1219+
1220+
expected = 'startWebLogic.cmd'
1221+
default_value = self.aliases.get_model_attribute_default_value(location, 'weblogic.StartScriptName')
1222+
self.assertEqual(default_value, expected)
1223+
1224+
expected = '/'
1225+
wlst_list_path = self.aliases.get_wlst_list_path(location)
1226+
self.assertEqual(wlst_list_path, expected)
1227+
1228+
# All the attributes in FOLDERS.NM_PROPERTIES have 'wlst_mode':'offline", so
1229+
# the default value should be None
1230+
expected = None
1231+
default_value = self.online_aliases.get_model_attribute_default_value(location, 'weblogic.StartScriptName')
1232+
self.assertEqual(default_value, expected)
1233+
1234+
return
1235+
12171236
def testGetModelAttributeName(self):
12181237
location=LocationContext().append_location(FOLDERS.JMS_SYSTEM_RESOURCE)
12191238
token = self.aliases.get_name_token(location)

0 commit comments

Comments
 (0)