Merge "Add warning to deprecated plugins"

This commit is contained in:
Jenkins 2016-08-23 20:48:06 +00:00 committed by Gerrit Code Review
commit 4f95b5fe82
5 changed files with 47 additions and 4 deletions

View File

@ -118,11 +118,16 @@ class GeneralConfigAction(workflows.Action):
def get_help_text(self):
extra = dict()
plugin, hadoop_version = whelpers\
plugin_name, hadoop_version = whelpers\
.get_plugin_and_hadoop_version(self.request)
extra["plugin_name"] = plugin
extra["plugin_name"] = plugin_name
extra["hadoop_version"] = hadoop_version
plugin = saharaclient.plugin_get_version_details(
self.request, plugin_name, hadoop_version)
extra["deprecated"] = whelpers.is_version_of_plugin_deprecated(
plugin, hadoop_version)
return super(GeneralConfigAction, self).get_help_text(extra)
def clean(self):

View File

@ -232,10 +232,14 @@ class GeneralConfigAction(workflows.Action):
def get_help_text(self):
extra = dict()
plugin, hadoop_version = (
plugin_name, hadoop_version = (
workflow_helpers.get_plugin_and_hadoop_version(self.request))
extra["plugin_name"] = plugin
extra["plugin_name"] = plugin_name
extra["hadoop_version"] = hadoop_version
plugin = saharaclient.plugin_get_version_details(
self.request, plugin_name, hadoop_version)
extra["deprecated"] = workflow_helpers.is_version_of_plugin_deprecated(
plugin, hadoop_version)
return super(GeneralConfigAction, self).get_help_text(extra)
class Meta(object):

View File

@ -8,6 +8,18 @@
<b>{% blocktrans %}Version{% endblocktrans %}</b>: {{ hadoop_version }}
<br />
</p>
{% if deprecated %}
<div class="bs-component">
<div class="alert alert-dismissable alert-warning">
<button type="button" class="close" data-dismiss="alert">×</button>
<h4 translate=""><span class="ng-scope">Warning!</span></h4>
<p> {% blocktrans %} Version {% endblocktrans %}: <b>{{ hadoop_version }}</b>
{% blocktrans %} of plugin {% endblocktrans %} <b>{{ plugin_name }} </b>
{% blocktrans %} is now deprecated. {% endblocktrans %}
</p>
</div>
</div>
{% endif %}
<p>
{% blocktrans %}The Cluster Template object should specify Node Group Templates that will be used to build a Cluster.
You can add Node Groups using Node Group Templates on a &quot;Node Groups&quot; tab.{% endblocktrans %}

View File

@ -7,6 +7,18 @@
<br />
<b>{% blocktrans %}Version{% endblocktrans %}</b>: {{ hadoop_version }}
<br />
{% if deprecated %}
<div class="bs-component">
<div class="alert alert-dismissable alert-warning">
<button type="button" class="close" data-dismiss="alert">×</button>
<h4 translate=""><span class="ng-scope">Warning!</span></h4>
<p> {% blocktrans %} Version {% endblocktrans %}: <b>{{ hadoop_version }}</b>
{% blocktrans %} of plugin {% endblocktrans %} <b>{{ plugin_name }} </b>
{% blocktrans %} is now deprecated. {% endblocktrans %}
</p>
</div>
</div>
{% endif %}
</p>
<p>
{% blocktrans %}The Node Group Template object specifies the processes

View File

@ -450,3 +450,13 @@ def get_pretty_enabled_versions(plugin):
if len(versions) == 0:
versions = [_("No enabled versions")]
return versions
def is_version_of_plugin_deprecated(plugin, version):
lbs = plugin.version_labels
for iter_version, data in six.iteritems(lbs):
if iter_version == version:
if data.get('deprecated', {'status': False}).get('status', False):
return True
else:
return False