JIRA WDT-540 - Omit empty sections in VZ resource files; corrected prepareModel log message (#700)

Author: rakillen

core/src/main/python/prepare_model.py

@@ -513,17 +513,17 @@ def main():
         tool_exit.end(model_context, exit_code)
     except CompareException, ce:
         cla_helper.clean_up_temp_files()
-        __logger.severe('WLSDPLY-05704', ce.getLocalizedMessage())
+        __logger.severe('WLSDPLY-05801', ce.getLocalizedMessage())
         tool_exit.end(model_context, 2)
     except PyWLSTException, pe:
         cla_helper.clean_up_temp_files()
-        __logger.severe('WLSDPLY-05704', pe.getLocalizedMessage())
+        __logger.severe('WLSDPLY-05801', pe.getLocalizedMessage())
         tool_exit.end(model_context, 2)
     except:
         exc_type, exc_obj, exc_tb = sys.exc_info()
         eeString = traceback.format_exception(exc_type, exc_obj, exc_tb)
         cla_helper.clean_up_temp_files()
-        __logger.severe('WLSDPLY-05704', eeString)
+        __logger.severe('WLSDPLY-05801', eeString)
         tool_exit.end(model_context, 2)
 
 def format_message(key, *args):

core/src/main/python/wlsdeploy/tool/util/targets/vz_config_helper.py

@@ -36,6 +36,8 @@
 DOMAIN_PREFIX = 'domainPrefix'
 DOMAIN_UID = 'domainUid'
 DS_URL = 'url'
+HAS_CLUSTERS = 'hasClusters'
+HAS_DATABASES = 'hasDatabases'
 REPLICAS = 'replicas'
 WEBLOGIC_CREDENTIALS_SECRET = 'webLogicCredentialsSecret'
 
@@ -122,6 +124,7 @@ def _build_template_hash(model, aliases):
         clusters.append(cluster_hash)
 
     template_hash[CLUSTERS] = clusters
+    template_hash[HAS_CLUSTERS] = len(clusters) != 0
 
     # databases
 
@@ -155,5 +158,6 @@ def _build_template_hash(model, aliases):
         databases.append(database_hash)
 
     template_hash[DATABASES] = databases
+    template_hash[HAS_DATABASES] = len(databases) != 0
 
     return template_hash

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

@@ -471,6 +471,9 @@ WLSDPLY-05709=Fatal compare model error {0}
 WLSDPLY-05710=The models are identical
 WLSDPLY-05711=The model differences and output is written to the directory {0}
 
+# prepare_model.py
+WLSDPLY-05801=Error in prepare model {0}
+
 ###############################################################################
 #   Message number 06000 - 07999 Discover                                     #
 ###############################################################################

core/src/main/resources/oracle/weblogic/deploy/targets/vz/binding.yaml

@@ -17,7 +17,9 @@ spec:
   ingressBindings:
     - name: "{{{domainPrefix}}}-ingress"
       dnsName: "todo.vz.oracledx.com"
+{{#hasDatabases}}
   databaseBindings:
+{{/hasDatabases}}
 {{#databases}}
     - name: "{{{databasePrefix}}}-db"
       url: "{{{url}}}"

core/src/main/resources/oracle/weblogic/deploy/targets/vz/model.yaml

@@ -17,7 +17,9 @@ spec:
           - name: ocir
         logHomeEnabled: false
         logHome: {{{domainHome}}}/logs
+{{#hasClusters}}
         clusters:
+{{/hasClusters}}
 {{#clusters}}
           - clusterName: {{{clusterName}}}
             replicas: {{{replicas}}}
@@ -34,7 +36,9 @@ spec:
               match:
                 - uri:
                     prefix: "/todo"
+{{#hasDatabases}}
         - database:
+{{/hasDatabases}}
 {{#databases}}
             - target: {{{databasePrefix}}}-db
               datasourceName: {{{datasourceName}}}