Fix for top level removal between models (#692)

* Fix for top level removal between models

* Update compare_model_test.py

Author: CarolynRountree

core/src/main/python/compare_model.py

@@ -158,7 +158,6 @@ def recursive_changed_detail(self, key, token, root):
                     last=token.rfind(PATH_TOKEN)
                     token=root
 
-
         # already out of recursive calls, add all entries from current dictionary
         # resources.JDBCSubsystemResources.* (note it may not have the lower level nodes
         added_token=token
@@ -227,7 +226,7 @@ def calculate_changed_model(self):
             # Top level:  e.g. delete all resources, all appDeployments
 
             for s in removed:
-                self.recursive_changed_detail(s,token, s)
+                self.recursive_changed_detail(s, s, s)
                 self._add_results(all_removed, True)
 
         except (KeyError, IndexError), ke:

core/src/test/python/compare_model_test.py

@@ -190,6 +190,60 @@ def testCompareModelInvalidFile(self):
 
         self.assertNotEqual(return_code, 0)
 
+    def testDeleteModelAppDeployments(self):
+        _method_name = 'testCompareModelFull'
+
+        _variables_file = self._resources_dir + '/compare_model_model1.10.properties'
+        _new_model_file = self._resources_dir + '/compare_model_model5.yaml'
+        _old_model_file = self._resources_dir + '/compare_model_model1.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'
+            stdout_result = obj.get_compare_msgs()
+            model_dictionary = FileToPython(yaml_result).parse()
+            yaml_exists = os.path.exists(yaml_result)
+
+            self.assertEqual(yaml_exists, True)
+            self.assertEqual(len(stdout_result), 1)
+
+            self.assertEqual(model_dictionary.has_key('appDeployments'), True)
+            self.assertEqual(model_dictionary['appDeployments'].has_key('Library'), True)
+            self.assertEqual(model_dictionary['appDeployments'].has_key('Application'), True)
+            self.assertEqual(model_dictionary['appDeployments']['Application'].has_key('!myear'), True)
+            self.assertEqual(model_dictionary['appDeployments']['Library'].has_key('!jax-rs#[email protected]'), True)
+            self.assertEqual(model_dictionary['appDeployments']['Library'].has_key('!jsf#[email protected]'), True)
+
+        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()

core/src/test/resources/compare_model_model5.yaml

@@ -0,0 +1,48 @@
+# Copyright (c) 2020, Oracle Corporation and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+domainInfo:
+    AdminUserName: 'weblogic'
+    AdminPassword: 'welcome2'
+    ServerStartMode: 'prod'
+topology:
+    Name: domain1
+    AdminServerName: "admin-server"
+    SecurityConfiguration:
+        NodeManagerUsername : 'weblogic'
+        NodeManagerPasswordEncrypted : 'welcome1'
+    Cluster:
+        "cluster-1":
+            DynamicServers:
+                ServerTemplate:  "cluster-1-template"
+                ServerNamePrefix: "managed-server"
+                DynamicClusterSize: 5
+                MaxDynamicClusterSize: 5
+                CalculatedListenPorts: false
+    Server:
+        "admin-server":
+            ListenPort: 10011
+    ServerTemplate:
+        "cluster-1-template":
+            Cluster: "cluster-1"
+            ListenPort : '5001'
+            ServerStart:
+                    Arguments: ['-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=6006']
+            JTAMigratableTarget:
+                    StrictOwnershipCheck: true
+                    Cluster: "cluster-1"
+resources:
+    WebAppContainer:
+        WAPEnabled: '@@PROP:WAPENABLED@@'
+        FilterDispatchedRequestsEnabled: true
+        AllowAllRoles: true
+        XPoweredByHeaderLevel: NONE
+        ServletAuthenticationFormURL: true
+        ServletReloadCheckSecs: 1
+        ChangeSessionIDOnAuthentication: true
+        AuthCookieEnabled: true
+        WorkContextPropagationEnabled: true
+        ReloginEnabled: true
+        GzipCompression:
+            GzipCompressionContentType: [ text/html, text/xml, text/plain ]
+            GzipCompressionEnabled: true