diff --git a/deploy-board/deploy_board/templates/clusters/cluster-replacements.tmpl b/deploy-board/deploy_board/templates/clusters/cluster-replacements.tmpl index c9a4902845..287082d7ab 100644 --- a/deploy-board/deploy_board/templates/clusters/cluster-replacements.tmpl +++ b/deploy-board/deploy_board/templates/clusters/cluster-replacements.tmpl @@ -40,7 +40,7 @@
- Show Replacement Activities @@ -143,7 +143,7 @@ may need to be refreshed (This suggestion is based on the last time cluster configuration was changed/updated vs. the last time cluster refresh was started and its status. It may be inaccurate - in case where the last configuration change was not related to host/instance configurations. In this case, if the cluster is indeed up to date, refreshing (skip matching) it + in case where the last configuration change was not related to host/instance configurations. In this case, if the cluster is indeed up to date, refreshing (skip matching) it will result in a no-op, and it will complete after few seconds. And the cluster will be up to date.) {% endif %} @@ -183,7 +183,7 @@ else { checkpointPercentagesElement.setCustomValidity(''); } - + const checkpointPercentages = checkpointPercentagesElement.value.split(',').reduce( (acc, p) => acc.concat(+p), []); for (let i = 0; i < checkpointPercentages.length - 1; i++) { @@ -333,13 +333,13 @@ Checkpoint percentages: - +
- +
- +
- + {% csrf_token %} @@ -403,7 +403,7 @@ else { updateClusterAutoRefreshConfigBtnElement.disabled = false } - + {% else %}
@@ -468,13 +468,13 @@ Checkpoint percentages: - +
- +
- +
- + {% csrf_token %} @@ -610,7 +610,7 @@ - + {% endif %} {% endblock %} diff --git a/deploy-board/deploy_board/templates/configs/capacity.html b/deploy-board/deploy_board/templates/configs/capacity.html index 87530297d8..5810f10c2d 100644 --- a/deploy-board/deploy_board/templates/configs/capacity.html +++ b/deploy-board/deploy_board/templates/configs/capacity.html @@ -30,7 +30,7 @@

Capacity

- +
diff --git a/deploy-board/deploy_board/templates/configs/capacity.tmpl b/deploy-board/deploy_board/templates/configs/capacity.tmpl index bf36668277..f58960f8d4 100644 --- a/deploy-board/deploy_board/templates/configs/capacity.tmpl +++ b/deploy-board/deploy_board/templates/configs/capacity.tmpl @@ -66,7 +66,7 @@ var groups = rootVue.$refs.groupsinput.tags; var image = info.basic_cluster_info ? info.basic_cluster_info.base_image_info : null; if(hasCMPCluster && image && image.abstract_name && image.abstract_name.startsWith('cmp_base')) { - var defaultClusterASGGroupName = '{{ cluster_name }}'; + var defaultClusterASGGroupName = '{{ env.envName }}-{{ env.stageName }}'; if(groups.indexOf(defaultClusterASGGroupName) < 0) { groups.push(defaultClusterASGGroupName); } diff --git a/deploy-board/deploy_board/templates/environs/env_landing.html b/deploy-board/deploy_board/templates/environs/env_landing.html index f738901a69..f7012da2f4 100644 --- a/deploy-board/deploy_board/templates/environs/env_landing.html +++ b/deploy-board/deploy_board/templates/environs/env_landing.html @@ -132,7 +132,7 @@

{{title}}

{% if hasGroups %}
- +
{% endif %} {% if hasCluster %} @@ -313,7 +313,7 @@

Resume Confirm

× Info! {{ cluster_refresh_suggestion_for_golden_ami }} Click here for image update history. - Click here to see AMI(s) used by hosts. + Click here to see AMI(s) used by hosts. Click here to replace the cluster. {% endif %} diff --git a/deploy-board/deploy_board/templates/host_side_panel.html b/deploy-board/deploy_board/templates/host_side_panel.html index c9e205c470..5ee86dd8e8 100644 --- a/deploy-board/deploy_board/templates/host_side_panel.html +++ b/deploy-board/deploy_board/templates/host_side_panel.html @@ -55,7 +55,7 @@

Host Termination Confirm

try { result = await $.ajax({ type: 'GET', - url: `/groups/{{ group_name }}/hosts`, + url: `/groups/{{env_name}}-{{stage_name}}/hosts`, dataType: "json", beforeSend: function(xhr, settings) { var csrftoken = getCookie('csrftoken'); @@ -72,7 +72,7 @@

Host Termination Confirm

terminatingHostCount = data; if (terminatingHostCount >= `{{termination_limit}}`) { $('#terminationWarning').show(); - } + } }); } }); diff --git a/deploy-board/deploy_board/webapp/cluster_view.py b/deploy-board/deploy_board/webapp/cluster_view.py index 70d3aa52b4..aaac4b0c06 100644 --- a/deploy-board/deploy_board/webapp/cluster_view.py +++ b/deploy-board/deploy_board/webapp/cluster_view.py @@ -232,7 +232,8 @@ def post(self, request, name, stage): class ClusterConfigurationView(View): def get(self, request, name, stage): - current_cluster = get_current_cluster(request, name, stage) + cluster_name = '{}-{}'.format(name, stage) + current_cluster = clusters_helper.get_cluster(request, cluster_name) host_types = hosttypes_helper.get_by_arch( request, current_cluster['archName']) current_image = baseimages_helper.get_by_id( @@ -305,7 +306,8 @@ def post(self, request, name, stage): cluster_info = json.loads(request.body) log.info("Update Cluster Configuration with {}", cluster_info) - current_cluster = get_current_cluster(request, name, stage, env=env) + cluster_name = '{}-{}'.format(name, stage) + current_cluster = clusters_helper.get_cluster(request, cluster_name) log.info("getting current Cluster Configuration is {}", current_cluster) if 'configs' in current_cluster and 'configs' in cluster_info: for field in TELETRAAN_CLUSTER_READONLY_FIELDS: @@ -334,7 +336,7 @@ def post(self, request, name, stage): log.info("Update Cluster Capacity with data {}".format(request.body)) try: settings = json.loads(request.body) - cluster_name = get_cluster_name(request, name, stage) + cluster_name = '{}-{}'.format(name, stage) log.info("Update cluster {0} with {1}".format( cluster_name, settings)) minSize = int(settings['minsize']) @@ -903,7 +905,7 @@ def clone_cluster(request, src_name, src_stage): dest_name = params.get('new_environment', src_name) dest_stage = params.get('new_stage', src_stage + '_clone') - src_cluster_name = get_cluster_name(request, src_name, src_stage) + src_cluster_name = '{}-{}'.format(src_name, src_stage) dest_cluster_name = '{}-{}'.format(dest_name, dest_stage) # 0. teletraan service get src env buildName @@ -1076,7 +1078,7 @@ def enable_cluster_replacement(request, name, stage): def gen_cluster_replacement_view(request, name, stage): env = environs_helper.get_env_by_stage(request, name, stage) - cluster_name = get_cluster_name(request, name, stage, env=env) + cluster_name = '{}-{}'.format(name, stage) get_cluster_replacement_body = { "clusterName": cluster_name } @@ -1103,7 +1105,7 @@ def gen_cluster_replacement_view(request, name, stage): def gen_auto_cluster_refresh_view(request, name, stage): env = environs_helper.get_env_by_stage(request, name, stage) - cluster_name = get_cluster_name(request, name, stage, env=env) + cluster_name = '{}-{}'.format(name, stage) get_cluster_replacement_body = { "clusterName": cluster_name } @@ -1185,7 +1187,7 @@ def sanitize_slack_email_input(input): def get_cluster_replacement_details(request, name, stage, replacement_id): env = environs_helper.get_env_by_stage(request, name, stage) - cluster_name = get_cluster_name(request, name, stage, env=env) + cluster_name = '{}-{}'.format(name, stage) get_cluster_replacement_details_body = { "clusterName": cluster_name, "replacementIds": [replacement_id] @@ -1427,7 +1429,7 @@ class ClusterHistoriesView(View): def get(self, request, name, stage): env = environs_helper.get_env_by_stage(request, name, stage) - cluster_name = get_cluster_name(request, name, stage, env=env) + cluster_name = '{}-{}'.format(name, stage) page_index = request.GET.get('index') page_size = request.GET.get('size') histories = clusters_helper.get_cluster_replacement_histories( @@ -1454,7 +1456,7 @@ class ClusterBaseImageHistoryView(View): def get(self, request, name, stage): env = environs_helper.get_env_by_stage(request, name, stage) - cluster_name = get_cluster_name(request, name, stage, env=env) + cluster_name = '{}-{}'.format(name, stage) current_cluster = clusters_helper.get_cluster(request, cluster_name) current_image = baseimages_helper.get_by_id(request, current_cluster['baseImageId']) golden_image = baseimages_helper.get_current_golden_image( @@ -1472,23 +1474,3 @@ def get(self, request, name, stage): } return render(request, 'clusters/base_image_history.html', data) - -def get_cluster_name(request, name, stage, env=None): - cluster_name = '{}-{}'.format(name, stage) - current_cluster = clusters_helper.get_cluster(request, cluster_name) - if current_cluster is None: - if env is None: - env = environs_helper.get_env_by_stage(request, name, stage) - cluster_name = env.get("clusterName") - return cluster_name - -def get_current_cluster(request, name, stage, env=None): - cluster_name = '{}-{}'.format(name, stage) - current_cluster = clusters_helper.get_cluster(request, cluster_name) - if current_cluster is None: - if env is None: - env = environs_helper.get_env_by_stage(request, name, stage) - cluster_name = env.get("clusterName") - current_cluster = clusters_helper.get_cluster(request, cluster_name) - return current_cluster - diff --git a/deploy-board/deploy_board/webapp/env_views.py b/deploy-board/deploy_board/webapp/env_views.py index 16984c7703..93cfcc83b8 100644 --- a/deploy-board/deploy_board/webapp/env_views.py +++ b/deploy-board/deploy_board/webapp/env_views.py @@ -38,7 +38,7 @@ from collections import Counter from .helpers import builds_helper, environs_helper, agents_helper, ratings_helper, deploys_helper, \ systems_helper, environ_hosts_helper, clusters_helper, tags_helper, baseimages_helper, schedules_helper, placements_helper, hosttypes_helper, \ - accounts_helper, autoscaling_groups_helper + accounts_helper from .templatetags import utils from .helpers.exceptions import TeletraanException import math @@ -581,7 +581,7 @@ def get(self, request, name, stage=None): def _gen_message_for_refreshing_cluster(request, last_cluster_refresh_status, latest_succeeded_base_image_update_event, env): try: - group_name = get_group_name(request, env.get('envName'), env.get('stageName'), env=env) + group_name = '{}-{}'.format(env["envName"], env["stageName"]) host_ami_dist = requests.post(url = CMDB_API_HOST+"/v2/query", json={ "query": "tags.Autoscaling:{} AND state:running".format(group_name), "fields": "cloud.aws.imageId" @@ -610,9 +610,8 @@ def _gen_message_for_refreshing_cluster(request, last_cluster_refresh_status, la def _getLastClusterRefreshStatus(request, env): try: - cluster_name = get_cluster_name(request, env.get('envName'), env.get('stageName'), env=env) replace_summaries = clusters_helper.get_cluster_replacement_status( - request, data={"clusterName": cluster_name}) + request, data={"clusterName": '{}-{}'.format(env["envName"], env["stageName"])}) if len(replace_summaries["clusterRollingUpdateStatuses"]) == 0: return None @@ -780,7 +779,7 @@ def _gen_deploy_summary(request, deploys, for_env=None): deploy_accounts = [create_legacy_ui_account(account) for account in get_accounts(report)] elif account: deploy_accounts = [account] - + summary = {} summary['deploy'] = deploy summary['env'] = env @@ -1953,21 +1952,3 @@ def override_session(request, name, stage): session_num = request.GET.get('session_num') schedules_helper.override_session(request, name, stage, session_num) return HttpResponse(json.dumps('')) - -def get_cluster_name(request, name, stage, env=None): - cluster_name = '{}-{}'.format(name, stage) - current_cluster = clusters_helper.get_cluster(request, cluster_name) - if current_cluster is None: - if env is None: - env = environs_helper.get_env_by_stage(request, name, stage) - cluster_name = env.get("clusterName") - return cluster_name - -def get_group_name(request, name, stage, env=None): - group_name = '{}-{}'.format(name, stage) - current_group = autoscaling_groups_helper.get_group_info(request, group_name) - if current_group is None: - if env is None: - env = environs_helper.get_env_by_stage(request, name, stage) - group_name = env.get("groupName") - return group_name \ No newline at end of file