Properties in names and manipulation of dict (#494)

Author: CarolynRountree

core/src/main/python/wlsdeploy/tool/create/creator.py

@@ -69,7 +69,7 @@ def _create_named_mbeans(self, type_name, model_nodes, base_location, log_create
         create_path = self.alias_helper.get_wlst_create_path(location)
         list_path = self.alias_helper.get_wlst_list_path(location)
         existing_folder_names = self._get_existing_folders(list_path)
-        for model_name in model_nodes:
+        for model_name in model_nodes.keys():
             name = self.wlst_helper.get_quoted_name_for_wlst(model_name)
             if deployer_utils.is_delete_name(name):
                 deployer_utils.delete_named_element(location, name, existing_folder_names, self.alias_helper)

core/src/main/python/wlsdeploy/tool/util/topology_helper.py

@@ -43,7 +43,7 @@ def check_coherence_cluster_references(self, type_name, model_nodes):
         :raises: BundleAwareException of the specified type: if an error occurs
         """
         if type_name in self._coherence_cluster_elements:
-            for name in model_nodes:
+            for name in model_nodes.keys():
                 child_nodes = dictionary_utils.get_dictionary_element(model_nodes, name)
                 resource_name = dictionary_utils.get_element(child_nodes, COHERENCE_CLUSTER_SYSTEM_RESOURCE)
                 if resource_name is not None:
@@ -112,7 +112,7 @@ def create_placeholder_named_elements(self, location, model_type, model_nodes):
             existing_names = deployer_utils.get_existing_object_list(resource_location, self.alias_helper)
 
             name_nodes = dictionary_utils.get_dictionary_element(model_nodes, model_type)
-            for name in name_nodes:
+            for name in name_nodes.keys():
                 if deployer_utils.is_delete_name(name):
                     # don't create placeholder for delete names
                     continue

core/src/main/python/wlsdeploy/util/variables.py

@@ -167,7 +167,7 @@ def _process_node(nodes, variables, model_context):
 
         if isinstance(value, dict):
             _process_node(value, variables, model_context)
-        elif type(value) is str:
+        elif type(value) in [str, unicode]:
             nodes[key] = _substitute(value, variables, model_context)