diff --git a/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py b/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py index d336e7599..68e9e34cf 100644 --- a/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py +++ b/tripleoclient/tests/v1/overcloud_node/test_overcloud_node.py @@ -908,7 +908,7 @@ class TestExtractProvisionedNode(test_utils.TestCommand): 'count': 1, 'hostname_format': '%stackname%-novacompute-%index%', 'defaults': { - 'network_config': {'network_deployment_actions': ['CREATE'], + 'network_config': {'network_config_update': False, 'physical_bridge_name': 'br-ex', 'public_interface_name': 'nic1', 'template': 'templates/compute.j2'}, @@ -927,7 +927,7 @@ class TestExtractProvisionedNode(test_utils.TestCommand): 'hostname_format': '%stackname%-controller-%index%', 'defaults': { 'network_config': {'default_route_network': ['External'], - 'network_deployment_actions': ['CREATE'], + 'network_config_update': False, 'networks_skip_config': ['Tenant'], 'physical_bridge_name': 'br-ex', 'public_interface_name': 'nic1', diff --git a/tripleoclient/v1/overcloud_node.py b/tripleoclient/v1/overcloud_node.py index 255661583..ebc0c19a7 100644 --- a/tripleoclient/v1/overcloud_node.py +++ b/tripleoclient/v1/overcloud_node.py @@ -579,15 +579,14 @@ class ExtractProvisionedNode(command.Command): role_name + 'NetworkConfigTemplate') if parameters.get(role_name + 'NetworkDeploymentActions'): - net_conf['network_deployment_actions'] = parameters.get( + network_deployment_actions = parameters.get( role_name + 'NetworkDeploymentActions') else: - net_conf['network_deployment_actions'] = parameters.get( + network_deployment_actions = parameters.get( 'NetworkDeploymentActions', ['CREATE']) - if isinstance(net_conf['network_deployment_actions'], str): - net_conf['network_deployment_actions'] = net_conf[ - 'network_deployment_actions'].split(',') + net_conf['network_config_update'] = ( + 'UPDATE' in network_deployment_actions) # The NetConfigDataLookup parameter is of type: json, but when # not set it returns as string '{}'