Merge "Fix node group name when deleting a node"

tripleo_common/scale.py

@@ -74,8 +74,8 @@ class ScaleManager(object):
             # of nova server)
             role_resource = next(x for x in resources if
                                  x.physical_resource_id == stack_id)
-            # Get the role name which is the resource_type in Heat.
-            role = role_resource.resource_type
+            # get the role name which is parent resource name in Heat
+            role = role_resource.parent_resource
             resources_by_role[role].append(role_resource)
 
         resources_by_role = dict(resources_by_role)

tripleo_common/tests/test_scale.py

@@ -57,7 +57,8 @@ class ScaleManagerTest(base.TestCase):
                                 'stacks/overcloud/124'}],
                 logical_resource_id='node0',
                 physical_resource_id='123',
-                resource_type='Compute',
+                resource_type='OS::TripleO::Compute',
+                parent_resource='Compute',
                 resource_name='node0',
             )
         ]