Merge branch 'custom-resource-alias-test' into 'main'

Add custom resource to alias test for online verification See merge request weblogic-cloud/weblogic-deploy-tooling!1742
oracle · Oct 7, 2024 · ae63882 · ae63882
2 parents 457dc82 + 989e8a3
commit ae63882
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/CustomResource.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/CustomResource.json
@@ -32,8 +32,9 @@
         "DescriptorBeanClass":     [ { "version": "[10,)", "wlst_mode": "both",    "wlst_name": "DescriptorBeanClass",     "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
         "ModuleType":              [ { "version": "[10,)", "wlst_mode": "both",    "wlst_name": "ModuleType",              "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
         "Notes":                   [ { "version": "[10,)", "wlst_mode": "both",    "wlst_name": "Notes",                   "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
+        "PartitionName":           [ { "version": "[10,)", "wlst_mode": "online",  "wlst_name": "PartitionName",           "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "get_method": "GET", "access": "IGNORED" } ],
         "ResourceClass":           [ { "version": "[10,)", "wlst_mode": "both",    "wlst_name": "ResourceClass",           "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
-        "SourcePath":              [ { "version": "[10,)", "wlst_mode": "both",    "wlst_name": "SourcePath",              "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": true } ],
+        "SourcePath":              [ { "version": "[10,)", "wlst_mode": "both",    "wlst_name": "SourcePath",              "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": true, "derived_default": "${:true}" } ],
         "Target":                  [ { "version": "[10,)", "wlst_mode": "offline", "wlst_name": "Target",                  "wlst_path": "WP001", "default_value": null, "wlst_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans" },
                                      { "version": "[10,)", "wlst_mode": "online",  "wlst_name": "Targets",                 "wlst_path": "WP002", "default_value": null, "wlst_type": "jarray", "get_method": "GET", "derived_default": true, "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ]
     },

diff --git a/integration-tests/alias-test/generate/src/test/resources/alias-test-archive.zip b/integration-tests/alias-test/generate/src/test/resources/alias-test-archive.zip
diff --git a/integration-tests/alias-test/generate/src/test/resources/alias-test-model.yaml b/integration-tests/alias-test/generate/src/test/resources/alias-test-model.yaml
@@ -1,12 +1,22 @@
 domainInfo:
     AdminUserName: weblogic
     AdminPassword: welcome1
+    domainLibraries:
+        - wlsdeploy/domainLibraries/DemoCustomResource.jar
 topology:
     Name: 'system_test_domain'
     AdminServerName: 'AdminServer'
     Server:
         AdminServer:
             ListenPort: 7001
+resources:
+    # CustomResource has to be created with legitimate class references
+    # to a resource jar in domain/lib (DemoCustomResource.jar above)
+    # for the domain to start cleanly.
+    CustomResource:
+        CustomResource-1:
+            DescriptorBeanClass: 'demo.customresource.DemoBean'
+            ResourceClass: 'demo.customresource.DemoResource'
 appDeployments:
     Library:
         'jstl#[email protected]':

diff --git a/integration-tests/alias-test/verify/src/test/python/aliastest/verify/utils.py b/integration-tests/alias-test/verify/src/test/python/aliastest/verify/utils.py
@@ -81,6 +81,10 @@
         'ModuleType': 'war',
         'SourcePath': 'wlsdeploy/applications/get-listen-address-app.war'
     },
+    '/CustomResource': {
+        'DescriptorBeanClass': 'demo.customresource.DemoBean',
+        'ResourceClass': 'demo.customresource.DemoResource'
+    },
     '/Library': {
         'ModuleType': 'war',
         'SourcePath': 'wlsdeploy/sharedLibraries/jstl-1.2.war'
@@ -92,6 +96,10 @@
         'ModuleType': 'war',
         'SourcePath': 'wlsdeploy/applications/get-listen-address-app.war'
     },
+    '/CustomResource': {
+        'DescriptorBeanClass': 'demo.customresource.DemoBean',
+        'ResourceClass': 'demo.customresource.DemoResource'
+    },
     '/JMSSystemResource/JmsResource/ForeignServer/JNDIProperty': {
         'Key': 'JNDIProperties-\\d{3,5}'
     },