openstack
/
fuel-octane
Code Issues Proposed changes

Merge "Change provisioning method to 'image' for 8.0"

This commit is contained in:
Jenkins 2016-04-28 14:30:37 +00:00 committed by Gerrit Code Review
parent c07af0012e 5cbf3f7c2e
commit 52905fee5b
3 changed files with 66 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
octane/commands/upgrade_env.py
View File

@ -43,13 +43,6 @@ def find_deployable_release(operating_system):
operating_system)
def set_cobbler_provision(env_id):
env = environment_obj.Environment(env_id)
settings = env.get_settings_data()
settings["editable"]["provision"]["method"]["value"] = "cobbler"
env.set_settings_data(settings)
def upgrade_env(env_id):
env = environment_obj.Environment(env_id)
target_release = find_deployable_release("Ubuntu")

64
octane/tests/test_env.py
View File

@ -223,3 +223,67 @@ def test_get_service_tenant_id(mocker, node):
env = mock.Mock()
env_util.get_service_tenant_id(env, node)
mock_obj.assert_called_once_with(env, node, "services")
ENV_SETTINGS = {
'editable': {
'public_ssl': {
'horizon': {
'value': None
},
'services': {
'value': None
}
},
'external_ntp': {
'ntp_list': {
'value': None
}
},
'external_dns': {
'dns_list': {
'value': None
}
},
'provision': {
'method': {
'value': None
}
}
}
}
@pytest.mark.parametrize("env_id,master_ip", [(1, '10.0.0.1')])
def test_change_env_settings(mocker, env_id, master_ip):
env = mocker.patch("fuelclient.objects.environment.Environment")
mock_env = env.return_value = mock.Mock()
mock_env.get_attributes.return_value = ENV_SETTINGS
env_util.change_env_settings(env_id, master_ip)
mock_env.update_attributes.assert_called_once_with({
'editable': {
'public_ssl': {
'horizon': {
'value': False
},
'services': {
'value': False
}
},
'external_ntp': {
'ntp_list': {
'value': master_ip
}
},
'external_dns': {
'dns_list': {
'value': master_ip
}
},
'provision': {
'method': {
'value': 'image'
}
}
}
})

3
octane/util/env.py
View File

@ -78,7 +78,8 @@ def change_env_settings(env_id, master_ip=''):
attrs['editable']['public_ssl']['services']['value'] = False
attrs['editable']['external_ntp']['ntp_list']['value'] = master_ip
attrs['editable']['external_dns']['dns_list']['value'] = master_ip
if get_env_provision_method(env) != 'image':
attrs['editable']['provision']['method']['value'] = 'image'
env.update_attributes(attrs)