Merge "Fix node delete for unprovision confirmation" into stable/wallaby

tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py

@@ -273,7 +273,8 @@ class TestDeleteNode(fakes.TestDeleteNode):
                         }],
                         'name': 'Controller'
                     }],
-                    'prompt': False
+                    'prompt': False,
+                    'manage_network_ports': True
                 },
             )
         ])

tripleoclient/v1/overcloud_node.py

@@ -97,7 +97,12 @@ class DeleteNode(command.Command):
                 }
             )
             with open(unprovision_confirm) as f:
-                nodes = json.load(f)
+                to_unprovision = json.load(f)
+                if isinstance(to_unprovision, dict):
+                    nodes = to_unprovision.get(
+                        'instances') + to_unprovision.get('pre_provisioned')
+                else:
+                    nodes = to_unprovision
         if not nodes:
             print('No nodes to unprovision')
             return None, None
@@ -192,6 +197,7 @@ class DeleteNode(command.Command):
                         "stack_name": parsed_args.stack,
                         "baremetal_deployment": roles,
                         "prompt": False,
+                        "manage_network_ports": True,
                     }
                 )