add more compare tool test (#787)

* add more compare tool test

* Fixed global variables causing failure in unit test

* refactor globals out

* add more tests - to be enable after the single level property compare failure fix is ready

Author: jshum2479

core/src/main/python/compare_model.py

@@ -70,12 +70,6 @@
     CommandLineArgUtil.VARIABLE_FILE_SWITCH
 ]
 
-all_changes = []
-all_added = []
-all_removed = []
-compare_msgs = sets.Set()
-
-
 def __process_args(args):
     """
     Process the command-line arguments.
@@ -94,7 +88,7 @@ def __process_args(args):
 
 class ModelDiffer:
 
-    def __init__(self, current_dict, past_dict, aliases):
+    def __init__(self, current_dict, past_dict, aliases, all_changes, all_added, all_removed, compare_msgs):
         self.aliases = aliases
         self.final_changed_model = PyOrderedDict()
         self.current_dict = current_dict
@@ -108,6 +102,11 @@ def __init__(self, current_dict, past_dict, aliases):
             for item in self.past_dict.keys():
                 self.set_past.add(item)
         self.intersect = self.set_current.intersection(self.set_past)
+        self.all_changes = all_changes
+        self.all_added = all_added
+        self.all_removed = all_removed
+        self.compare_msgs = compare_msgs
+
 
     def added(self):
         return self.set_current - self.intersect
@@ -144,7 +143,8 @@ def recursive_changed_detail(self, key, token, root):
         """
         debug("DEBUG: Entering recursive_changed_detail key=%s token=%s root=%s", key, token, root)
 
-        a = ModelDiffer(self.current_dict[key], self.past_dict[key], self.aliases)
+        a = ModelDiffer(self.current_dict[key], self.past_dict[key], self.aliases, self.all_changes, self.all_added,
+                        self.all_removed, self.compare_msgs)
         diff = a.changed()
         added = a.added()
         removed = a.removed()
@@ -164,7 +164,7 @@ def recursive_changed_detail(self, key, token, root):
                     last = token.rfind(PATH_TOKEN)
                     token = root
                 else:
-                    all_changes.append(token)
+                    self.all_changes.append(token)
                     last = token.rfind(PATH_TOKEN)
                     token = root
 
@@ -176,14 +176,14 @@ def recursive_changed_detail(self, key, token, root):
             for item in added:
                 token = saved_token
                 debug('DEBUG: recursive added token %s item %s ', token, item)
-                all_added.append(token + PATH_TOKEN + item)
+                self.all_added.append(token + PATH_TOKEN + item)
 
         # We don't really care about this, just put something here is enough
         if len(removed) > 0:
             for item in removed:
                 token = saved_token
                 debug('DEBUG: removed %s', item)
-                all_removed.append(token + PATH_TOKEN + item)
+                self.all_removed.append(token + PATH_TOKEN + item)
         debug('DEBUG: Exiting recursive_changed_detail')
 
     def is_dict(self, key):
@@ -220,24 +220,24 @@ def calculate_changed_model(self):
             #
             for s in changed:
                 self.recursive_changed_detail(s, s, s)
-                self._add_results(all_changes)
-                self._add_results(all_added)
-                self._add_results(all_removed, True)
+                self._add_results(self.all_changes)
+                self._add_results(self.all_added)
+                self._add_results(self.all_removed, True)
 
             for s in added:
                 self.recursive_changed_detail(s, s, s)
-                self._add_results(all_changes)
-                self._add_results(all_added)
+                self._add_results(self.all_changes)
+                self._add_results(self.all_added)
 
             # Clean up previous delete first
-            for x in all_removed:
-                all_removed.remove(x)
+            for x in self.all_removed:
+                self.all_removed.remove(x)
 
             # Top level:  e.g. delete all resources, all appDeployments
 
             for s in removed:
                 self.recursive_changed_detail(s, s, s)
-                self._add_results(all_removed, True)
+                self._add_results(self.all_removed, True)
 
         except (KeyError, IndexError), ke:
             _logger.severe('WLSDPLY-05709', str(ke)),
@@ -317,7 +317,7 @@ def _add_results(self, change_paths, is_delete=False):
 
             if is_delete and not is_folder_path:
                 # Skip adding if it is a delete of an attribute
-                compare_msgs.add(('WLSDPLY-05701', change_path))
+                self.compare_msgs.add(('WLSDPLY-05701', change_path))
                 continue
 
             # splitted is a tuple containing the next token, and a delimited string of remaining tokens
@@ -468,6 +468,11 @@ def __init__(self, current_dict, past_dict, model_context, output_dir=None):
         self.past_dict_file = past_dict
         self.output_dir = output_dir
         self.model_context = model_context
+        # For recursive calls
+        self.all_changes = []
+        self.all_added = []
+        self.all_removed = []
+        self.compare_msgs = sets.Set()
 
     def get_dictionary(self, file):
         """
@@ -563,7 +568,8 @@ def compare(self):
             _logger.throwing(ex, class_name=_class_name, method_name=_method_name)
             return VALIDATION_FAIL
 
-        obj = ModelDiffer(current_dict, past_dict, aliases)
+        obj = ModelDiffer(current_dict, past_dict, aliases, self.all_changes, self.all_added,
+              self.all_removed, self.compare_msgs)
         obj.calculate_changed_model()
         net_diff = obj.get_final_changed_model()
 
@@ -615,7 +621,7 @@ def get_compare_msgs(self):
         Return any warning or info messages.
         :return: Set of warning or info messages
         """
-        return compare_msgs
+        return self.compare_msgs
 
 
 def debug(format_string, *arguments):
@@ -675,15 +681,15 @@ def main():
             fos = None
             writer = None
             file_name = None
-            if len(compare_msgs) > 0:
+            if len(obj.get_compare_msgs()) > 0:
                 try:
                     file_name = _outputdir + '/compare_model_stdout'
                     fos = JFileOutputStream(file_name, False)
                     writer = JPrintWriter(fos, True)
                     writer.println(BLANK_LINE)
                     writer.println(BLANK_LINE)
                     index = 1
-                    for line in compare_msgs:
+                    for line in obj.get_compare_msgs():
                         msg_key = line[0]
                         msg_value = line[1]
                         writer.println("%s. %s" % (index, format_message(msg_key,msg_value.replace(PATH_TOKEN, "-->"))))
@@ -699,11 +705,11 @@ def main():
                     _logger.severe('WLSDPLY-05708', file_name, ioe.getLocalizedMessage(),
                                    error=ioe, class_name=_class_name, method_name=_method_name)
         else:
-            if len(compare_msgs) > 0:
+            if len(obj.get_compare_msgs()) > 0:
                 print BLANK_LINE
                 print BLANK_LINE
                 index = 1
-                for line in compare_msgs:
+                for line in obj.get_compare_msgs():
                     msg_key = line[0]
                     msg_value = line[1]
                     print "%s. %s" % (index, format_message(msg_key,msg_value.replace(PATH_TOKEN, "-->")))

core/src/test/python/compare_model_test.py

@@ -224,7 +224,7 @@ def testDeleteModelAppDeployments(self):
             yaml_exists = os.path.exists(yaml_result)
 
             self.assertEqual(yaml_exists, True)
-            self.assertEqual(len(stdout_result), 1)
+            self.assertEqual(len(stdout_result), 0)
 
             self.assertEqual(model_dictionary.has_key('appDeployments'), True)
             self.assertEqual(model_dictionary['appDeployments'].has_key('Library'), True)
@@ -244,6 +244,187 @@ def testDeleteModelAppDeployments(self):
 
         self.assertEqual(return_code, 0)
 
+    def testCompareModelFull2(self):
+        _method_name = 'testCompareModelFull2'
+        # This test for
+        # 1. Changing weblogic password
+        # 2. Changing RCU password
+        # 3. Deleting an application
+
+        _variables_file = self._resources_dir + '/compare_model_model1.10.properties'
+        _new_model_file = self._resources_dir + '/compare_model_model7.yaml'
+        _old_model_file = self._resources_dir + '/compare_model_model6.yaml'
+        _temp_dir = os.path.join(tempfile.gettempdir(), _method_name)
+
+        if os.path.exists(_temp_dir):
+            shutil.rmtree(_temp_dir)
+
+        os.mkdir(_temp_dir)
+
+        mw_home = os.environ['MW_HOME']
+        args_map = {
+            '-oracle_home': mw_home,
+            '-variable_file': _variables_file,
+            '-output_dir' : _temp_dir,
+            '-domain_type' : 'WLS',
+            '-trailing_arguments': [ _new_model_file, _old_model_file ]
+        }
+
+        try:
+            model_context = ModelContext('CompareModelTestCase', args_map)
+            obj = ModelFileDiffer(_new_model_file, _old_model_file, model_context, _temp_dir)
+            return_code = obj.compare()
+            self.assertEqual(return_code, 0)
+
+            yaml_result = _temp_dir + os.sep + 'diffed_model.yaml'
+            json_result = _temp_dir + os.sep + 'diffed_model.json'
+            stdout_result = obj.get_compare_msgs()
+            model_dictionary = FileToPython(yaml_result).parse()
+            yaml_exists = os.path.exists(yaml_result)
+            json_exists = os.path.exists(json_result)
+
+            self.assertEqual(yaml_exists, True)
+            self.assertEqual(json_exists, True)
+            self.assertEqual(len(stdout_result), 0)
+
+            self.assertEqual(model_dictionary.has_key('domainInfo'), True)
+            self.assertEqual(model_dictionary['domainInfo'].has_key('AdminPassword'), True)
+            self.assertEqual(model_dictionary['domainInfo']['AdminPassword'], 'welcome2')
+            self.assertEqual(model_dictionary['domainInfo'].has_key('AdminUser'), False)
+            self.assertEqual(model_dictionary['domainInfo'].has_key('RCUDbInfo'), True)
+            self.assertEqual(model_dictionary['domainInfo']['RCUDbInfo'].has_key('rcu_admin_password'), True)
+            self.assertEqual(len(model_dictionary['domainInfo']['RCUDbInfo']), 1)
+            self.assertEqual(len(model_dictionary['domainInfo']), 2)
+            self.assertEqual(model_dictionary.has_key('appDeployments'), True)
+            self.assertEqual(model_dictionary['appDeployments'].has_key('Application'), True)
+            self.assertEqual(model_dictionary['appDeployments']['Application'].has_key('!yourear'), True)
+            self.assertEqual(len(model_dictionary['appDeployments']['Application']), 1)
+
+
+        except (CompareException, PyWLSTException), te:
+            return_code = 2
+            self._logger.severe('WLSDPLY-05709',
+                                te.getLocalizedMessage(), error=te,
+                                class_name=self._program_name, method_name=_method_name)
+
+        if os.path.exists(_temp_dir):
+            shutil.rmtree(_temp_dir)
+
+        self.assertEqual(return_code, 0)
+
+    def _testCompareModelFull3(self):
+        _method_name = 'testCompareModelFull3'
+        # This test for
+        # 1. Changing MailSessionProperty
+        # 2. Changing ODL HandlerDefaults
+        # 3. Changing ODL Handler property
+        # 4. Changing ODL Logger attributes
+
+        _variables_file = self._resources_dir + '/compare_model_model1.10.properties'
+        _new_model_file = self._resources_dir + '/compare_model_model7.yaml'
+        _old_model_file = self._resources_dir + '/compare_model_model6.yaml'
+        _temp_dir = os.path.join(tempfile.gettempdir(), _method_name)
+
+        if os.path.exists(_temp_dir):
+            shutil.rmtree(_temp_dir)
+
+        os.mkdir(_temp_dir)
+
+        mw_home = os.environ['MW_HOME']
+        args_map = {
+            '-oracle_home': mw_home,
+            '-variable_file': _variables_file,
+            '-output_dir' : _temp_dir,
+            '-domain_type' : 'WLS',
+            '-trailing_arguments': [ _new_model_file, _old_model_file ]
+        }
+
+        try:
+            model_context = ModelContext('CompareModelTestCase', args_map)
+            obj = ModelFileDiffer(_new_model_file, _old_model_file, model_context, _temp_dir)
+            return_code = obj.compare()
+            self.assertEqual(return_code, 0)
+
+            yaml_result = _temp_dir + os.sep + 'diffed_model.yaml'
+            json_result = _temp_dir + os.sep + 'diffed_model.json'
+            stdout_result = obj.get_compare_msgs()
+            model_dictionary = FileToPython(yaml_result).parse()
+            yaml_exists = os.path.exists(yaml_result)
+            json_exists = os.path.exists(json_result)
+
+            self.assertEqual(yaml_exists, True)
+            self.assertEqual(json_exists, True)
+            self.assertEqual(len(stdout_result), 0)
+
+            self.assertEqual(model_dictionary.has_key('resources'), True)
+            self.assertEqual(model_dictionary['resources'].has_key('MailSession'), True)
+            self.assertEqual(model_dictionary['resources']['MailSession'].has_key('MyMailSession'), True)
+            self.assertEqual(model_dictionary['resources']['MailSession']['MyMailSession'].has_key('mail.imap.port'),
+                             True)
+            self.assertEqual(model_dictionary['resources']['MailSession']['MyMailSession']['mail.imap.port'], 993)
+            self.assertEqual(len(model_dictionary['resources']['MailSession']['MyMailSession']['mail.imap.port']), 1)
+
+            self.assertEqual(model_dictionary['resources'].has_key('ODLConfiguration'), True)
+            self.assertEqual(model_dictionary['resources']['ODLConfiguration'].has_key('config'), True)
+            self.assertEqual(model_dictionary['resources']['ODLConfiguration']['config'].has_key('HandlerDefaults'),
+                             True)
+            self.assertEqual(
+                model_dictionary['resources']['ODLConfiguration']['config']['HandlerDefaults'].has_key('maxFileSize'),
+                             True)
+            self.assertEqual(
+                model_dictionary['resources']['ODLConfiguration']['config']['HandlerDefaults']['maxFileSize'],
+                14857620)
+
+            self.assertEqual(model_dictionary['resources']['ODLConfiguration']['config'].has_key('Handler'),
+                             True)
+            self.assertEqual(
+                model_dictionary['resources']['ODLConfiguration']['config']['Handler'].has_key('odl-handler'),
+                True)
+            self.assertEqual(
+                model_dictionary['resources']['ODLConfiguration']['config']['Handler']['odl-handler']
+                    .has_key('Properties'), True)
+            self.assertEqual(
+                model_dictionary['resources']['ODLConfiguration']['config']['Handler']['odl-handler']['Properties']
+                .has_key('maxFileSize'), True)
+            self.assertEqual(
+                model_dictionary['resources']['ODLConfiguration']['config']['Handler']['odl-handler']
+                ['Properties']['maxFileSize'], 14857620)
+
+
+            self.assertEqual(model_dictionary['resources']['ODLConfiguration']['config'].has_key('Logger'),
+                             True)
+            self.assertEqual(
+                model_dictionary['resources']['ODLConfiguration']['config']['Logger']
+                    .has_key('oracle.communications.ordermanagement.automation.plugin.AutomationPluginManager'),
+                    True)
+            self.assertEqual(
+                model_dictionary['resources']['ODLConfiguration']['config']['Logger']
+                ['oracle.communications.ordermanagement.automation.plugin.AutomationPluginManager']
+                    .has_key('Level'), True)
+            self.assertEqual(
+                model_dictionary['resources']['ODLConfiguration']['config']['Logger']
+                ['oracle.communications.ordermanagement.automation.plugin.AutomationPluginManager']['Level'],
+                'TRACE:16')
+            self.assertEqual(
+                len(model_dictionary['resources']['ODLConfiguration']['config']), 3)
+
+            self.assertEqual(
+                len(model_dictionary['resources']['ODLConfiguration']['config']['Logger']), 1)
+
+            self.assertEqual(
+                len(model_dictionary['resources']['ODLConfiguration']['config']['HandlerDefaults']), 1)
+
+        except (CompareException, PyWLSTException), te:
+            return_code = 2
+            self._logger.severe('WLSDPLY-05709',
+                                te.getLocalizedMessage(), error=te,
+                                class_name=self._program_name, method_name=_method_name)
+
+        if os.path.exists(_temp_dir):
+            shutil.rmtree(_temp_dir)
+
+        self.assertEqual(return_code, 0)
+
 
 if __name__ == '__main__':
     unittest.main()