diff --git a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py index 61f552ab0..329a5110e 100644 --- a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py +++ b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py @@ -84,7 +84,8 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): @mock.patch('tripleoclient.utils.create_cephx_key', autospec=True) @mock.patch('uuid.uuid1', autospec=True) - def test_tht_scale(self, mock_uuid1, mock_create_cephx_key, + @mock.patch('time.time', autospec=True) + def test_tht_scale(self, mock_time, mock_uuid1, mock_create_cephx_key, mock_check_hypervisor_stats, mock_get_key, mock_create_env, generate_certs_mock, mock_get_templte_contents, mock_process_multiple_env, @@ -106,6 +107,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): mock_create_cephx_key.return_value = "cephx_key" mock_uuid1.return_value = "uuid" + mock_time.return_value = 123456789 mock_generate_overcloud_passwords.return_value = self._get_passwords() @@ -175,6 +177,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): 'SwiftHashSuffix': 'password', 'SwiftPassword': 'password', 'SwiftStorageImage': 'overcloud-full', + 'DeployIdentifier': 123456789, } def _custom_create_params_env(parameters): @@ -239,7 +242,8 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): @mock.patch('tripleoclient.utils.create_cephx_key', autospec=True) @mock.patch('uuid.uuid1', autospec=True) - def test_tht_deploy(self, mock_uuid1, mock_create_cephx_key, + @mock.patch('time.time', autospec=True) + def test_tht_deploy(self, mock_time, mock_uuid1, mock_create_cephx_key, mock_check_hypervisor_stats, mock_get_key, mock_create_env, generate_certs_mock, mock_get_templte_contents, mock_process_multiple_env, @@ -260,6 +264,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): mock_create_cephx_key.return_value = "cephx_key" mock_uuid1.return_value = "uuid" + mock_time.return_value = 123456789 mock_generate_overcloud_passwords.return_value = self._get_passwords() @@ -341,6 +346,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud): 'SwiftHashSuffix': 'password', 'SwiftPassword': 'password', 'SwiftStorageImage': 'overcloud-full', + 'DeployIdentifier': 123456789, } def _custom_create_params_env(parameters): diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py index 5a25c7a1e..494a6c860 100644 --- a/tripleoclient/v1/overcloud_deploy.py +++ b/tripleoclient/v1/overcloud_deploy.py @@ -22,6 +22,7 @@ import re import six import sys import tempfile +import time import uuid from cliff import command @@ -91,6 +92,9 @@ class DeployOvercloud(command.Command): self.log.debug("Generating overcloud passwords") self.set_overcloud_passwords(parameters, args) + timestamp = int(time.time()) + parameters['DeployIdentifier'] = timestamp + param_args = ( ('NeutronPublicInterface', 'neutron_public_interface'), ('NeutronBridgeMappings', 'neutron_bridge_mappings'),