Cluster short name changes

Tendrl-bug-id: Tendrl#656
a2batic · Apr 13, 2018 · fc2355a · fc2355a
1 parent 00d1d18
commit fc2355a
Show file tree

Hide file tree

Showing 24 changed files with 169 additions and 119 deletions.
diff --git a/src/commons/stores/cluster-store.js b/src/commons/stores/cluster-store.js
@@ -98,12 +98,16 @@
          * @desc store for import cluster
          * @memberOf clusterStore
          */
-        store.importCluster = function(clusterId, enableProfiling) {
+        store.importCluster = function(clusterId, enableProfiling, clusterName) {
             var requestData = {
                     "Cluster.volume_profiling_flag": enableProfiling === "leaveAsIs" ? "leave-as-is" : enableProfiling
                 },
                 deferred;
 
+            if (clusterName) {
+                requestData["Cluster.short_name"] = clusterName;
+            }
+
             deferred = $q.defer();
             clusterFactory.importCluster(requestData, clusterId)
                 .then(function(data) {
@@ -211,7 +215,7 @@
             temp.integrationId = cluster.integration_id;
             temp.sdsVersion = cluster.sds_version;
             temp.sdsName = cluster.sds_name;
-            temp.name = cluster.cluster_id;
+            temp.name = (cluster.short_name && cluster.short_name !== "None") ? cluster.short_name : cluster.integration_id;
             temp.clusterId = cluster.cluster_id;
             temp.currentTask = cluster.current_job;
             temp.jobType = JSON.parse(cluster.current_job).job_name;

diff --git a/src/modules/base/header/header.html b/src/modules/base/header/header.html
@@ -12,7 +12,7 @@
         <select id="repeatSelect" ng-model="$root.selectedClusterOption" class="cluster-options btn btn-default dropdown-toggle filterSelect" ng-change="header.goToClusterPage()" uib-tooltip-html="header.getClusterName($root.selectedClusterOption)" tooltip-placement="auto bottom">
             <option value="" disabled ng-selected="!$root.selectedClusterOption">Select a cluster...</option>
             <option value="allClusters" ng-selected="$root.selectedClusterOption === 'allClusters'">All Clusters</option>
-            <option ng-repeat="cluster in $root.clusterData" value="{{cluster.clusterId}}" ng-selected="$root.selectedClusterOption === '{{cluster.clusterId}}'" ng-show="cluster.managed === 'Yes' && cluster.jobType !== 'UnmanageCluster'">{{cluster.clusterId}}</option>
+            <option ng-repeat="cluster in $root.clusterData" value="{{cluster.clusterId}}" ng-selected="$root.selectedClusterOption === '{{cluster.clusterId}}'" ng-show="cluster.managed === 'Yes' && cluster.jobType !== 'UnmanageCluster'">{{cluster.name}}</option>
             <!-- To filter managed clusters :  | filter: {is_managed: 'yes'}-->
         </select>
     </div>

diff --git a/src/modules/bricks/host-bricks/host-bricks.js b/src/modules/bricks/host-bricks/host-bricks.js
@@ -89,6 +89,7 @@
         function init() {
             vm.clusterId = $stateParams.clusterId;
             vm.hostId = $stateParams.hostId;
+            vm.clusterName = clusterStore.getClusterDetails(vm.clusterId).name;
 
             if ($rootScope.clusterData) {
                 brickStore.getHostBrickList(vm.clusterId, vm.hostId)
@@ -153,7 +154,7 @@
                 hostName = brick.brickPath.split(":")[0].replace(/\./gi, "_");
 
             brickName = brickName.replace(/\//gi, "|");
-            utils.redirectToGrafana("bricks", { clusterId: vm.clusterId, hostName: hostName, brickName: brickName, volumeName: brick.volName });
+            utils.redirectToGrafana("bricks", { clusterId: vm.clusterName, hostName: hostName, brickName: brickName, volumeName: brick.volName });
         }
 
         function _performAction(action, item) {

diff --git a/src/modules/bricks/volume-bricks/volume-bricks.js b/src/modules/bricks/volume-bricks/volume-bricks.js
@@ -92,6 +92,7 @@
         function init() {
             vm.clusterId = $stateParams.clusterId;
             vm.volumeId = $stateParams.volumeId;
+            vm.clusterName = clusterStore.getClusterDetails(vm.clusterId).name;
 
             if ($rootScope.clusterData && volumeStore.volumeList.length) {
                 clusterStore.getCluster(vm.clusterId)
@@ -275,7 +276,7 @@
                 hostName = brick.fqdn.replace(/\./gi, "_");
 
             brickName = brickName.replace(/\//gi, "|");
-            utils.redirectToGrafana("bricks", { clusterId: vm.clusterId, hostName: hostName, brickName: brickName, volumeName: volumeStore.getVolumeObject(vm.volumeId).name });
+            utils.redirectToGrafana("bricks", { clusterId: vm.clusterName, hostName: hostName, brickName: brickName, volumeName: volumeStore.getVolumeObject(vm.volumeId).name });
         }
 
         function _matchesFilter(item, filter) {

diff --git a/src/modules/clusters/cluster-list/cluster-list.js b/src/modules/clusters/cluster-list/cluster-list.js
@@ -170,7 +170,7 @@
         }
 
         function redirectToGrafana(cluster) {
-            utils.redirectToGrafana("glance", { clusterId: cluster.clusterId });
+            utils.redirectToGrafana("glance", { clusterId: cluster.name });
         }
 
         /**

diff --git a/src/modules/clusters/expand-cluster/expand-cluster.html b/src/modules/clusters/expand-cluster/expand-cluster.html
@@ -3,7 +3,7 @@
         <custom-modal-header title="vm.modalHeader.title" close="vm.modalHeader.close"></custom-modal-header>
         <div class="modal-body">
             <div class="col-md-12 desc">
-                {{vm.clusterId}} will be expanded by importing the new hosts listed below. Further actions will not be allowed on this cluster until expansion is complete.
+                {{vm.clusterName}} will be expanded by importing the new hosts listed below. Further actions will not be allowed on this cluster until expansion is complete.
             </div>
             <div class="toolbar-pf row">
                 <div class="form-group toolbar-pf-filter col-sm-6">

diff --git a/src/modules/clusters/expand-cluster/expand-cluster.js b/src/modules/clusters/expand-cluster/expand-cluster.js
@@ -13,6 +13,7 @@
 
         vm.disableExpand = false;
         vm.clusterId = selectedCluster.clusterId;
+        vm.clusterName = selectedCluster.name;
         vm.hostList = [];
         vm.filteredHostList = [];
         vm.filters = [];
@@ -22,7 +23,7 @@
         vm.confirmModal = confirmModal;
 
         vm.modalHeader = {
-            "title": "Expand " + selectedCluster.clusterId,
+            "title": "Expand " + vm.clusterName,
             "close": vm.closeModal
         };
 

diff --git a/src/modules/clusters/host-list-modal/host-list-modal.js b/src/modules/clusters/host-list-modal/host-list-modal.js
@@ -19,7 +19,7 @@
         vm.filters = [];
 
         vm.modalHeader = {
-            "title": "Hosts on " + vm.clusterId,
+            "title": "Hosts on " + cluster.name,
             "close": vm.closeModal
         };
 

diff --git a/src/modules/clusters/import-cluster/import-cluster.html b/src/modules/clusters/import-cluster/import-cluster.html
@@ -9,8 +9,21 @@
             <span class="pficon pficon-warning-triangle-o"></span>
             Import cluster previously failed with <a ng-click="vm.openImportErrorModal(vm.taskId)" class="alert-link">{{vm.taskId}}</a>. Be sure that all the issues have been corrected and the cluster has been unmanaged before proceeding.
         </div>
+        <div class="alert alert-danger" ng-show="vm.errorMsg.length > 0">
+            <span class="pficon pficon-error-circle-o"></span>
+            <label ng-bind="vm.errorMsg"></label>
+        </div>
         <h1 class="bold-text">Import Cluster</h1>
         <div class="container-fluid">
+            <div class="row cluster-name">
+                <label class="col-sm-2 col-md-1" for="clusterName">Cluster Name</label>
+                <div class="col-sm-4 col-md-3">
+                    <div class="row">
+                    <input class="col-md-12 col-sm-12" type="text" name="clusterName" ng-model="vm.clusterName"/>
+                    </div>
+                    <div class="row name-validation-msg">Only alphanumeric and underscore characters are allowed.</div>
+                </div>
+            </div>
             <div class="row">
                 <h3 class="col-sm-12">Review the hosts for the <span class="bold-text">{{vm.cluster.name}}</span> and click Import to monitor this cluster.</h3>
             </div>

diff --git a/src/modules/clusters/import-cluster/import-cluster.js b/src/modules/clusters/import-cluster/import-cluster.js
@@ -19,7 +19,9 @@
 
         var vm = this;
 
+        vm.clusterNamePattern = /^[a-zA-Z0-9][A-Za-z0-9_]*$/i;
         vm.filtersText = "";
+        vm.clusterName = "";
         vm.enableProfiling = "enable";
         vm.taskInitiated = false;
         vm.importIcon = false;
@@ -120,6 +122,55 @@
             wizardDoneListener = $rootScope.$on("modal.done", closeWizard);
         }
 
+        /**
+         * @name importCluster
+         * @desc Perform import cluster
+         * @memberOf importClusterController
+         */
+        function importCluster() {
+            var clusterName;
+
+            if (vm.clusterName) {
+                clusterName = vm.clusterName.match(vm.clusterNamePattern);
+            }
+
+            if (clusterName !== null) {
+                clusterStore.importCluster(vm.clusterId, vm.enableProfiling, vm.clusterName)
+                .then(function(data) {
+                    vm.importIcon = true;
+                    vm.taskInitiated = true;
+                    vm.jobId = data.job_id;
+                }).catch(function(e){
+                    vm.importIcon = false;
+                    vm.taskInitiated = false;
+                    Notifications.message("danger", "", "Failed to initaite import.");
+                });
+            } else {
+                vm.errorMsg = "Please enter a valid cluster name. Only alphanumeric and underscore characters are allowed."
+            }
+
+        }
+
+        /**
+         * @name importCancel
+         * @desc Cancels import cluster
+         * @memberOf importClusterController
+         */
+        function importCancel() {
+            $state.go("clusters");
+        }
+
+        /**
+         * @name viewTaskProgress
+         * @desc redirect user to task detail page
+         * @memberOf importClusterController
+         */
+        function viewTaskProgress() {
+
+            if (vm.clusterId) {
+                $state.go("global-task-detail", { clusterId: vm.clusterId, taskId: vm.jobId });
+            }
+        }
 
         function _setImportDetail() {
             vm.clusterObj = clusterStore.getClusterDetails(vm.clusterId);
@@ -184,45 +235,6 @@
             });
             _applyFilters(filters);
         }
-
-        /**
-         * @name importCluster
-         * @desc Perform import cluster
-         * @memberOf importClusterController
-         */
-        function importCluster() {
-            clusterStore.importCluster(vm.clusterId, vm.enableProfiling)
-                .then(function(data) {
-                    vm.importIcon = true;
-                    vm.taskInitiated = true;
-                    vm.jobId = data.job_id;
-                }).catch(function(e){
-                    vm.importIcon = false;
-                    vm.taskInitiated = false;
-                    Notifications.message("danger", "", "Failed to initaite import.");
-                });
-        }
-
-        /**
-         * @name importCancel
-         * @desc Cancels import cluster
-         * @memberOf importClusterController
-         */
-        function importCancel() {
-            $state.go("clusters");
-        }
-
-        /**
-         * @name viewTaskProgress
-         * @desc redirect user to task detail page
-         * @memberOf importClusterController
-         */
-        function viewTaskProgress() {
-            if (vm.clusterId) {
-                $state.go("global-task-detail", { clusterId: vm.clusterId, taskId: vm.jobId });
-            }
-        }
-
     }
 
-})();
+})();
diff --git a/src/modules/clusters/import-cluster/import-cluster.scss b/src/modules/clusters/import-cluster/import-cluster.scss
@@ -12,6 +12,19 @@
         margin: 20px 0;
     }
 
+    .cluster-name {
+        font-size: 14px;
+
+        label {
+            font-weight: normal;
+        }
+
+        .name-validation-msg {
+            font-size: 10px;
+            font-style: italic;
+        }
+    }
+
     .alert a {
         cursor: pointer;
     }
@@ -29,7 +42,6 @@
     }
 
     .volume-profile {
-        margin-top: 10px;
         font-size: 14px;
 
         input[type=checkbox],

diff --git a/src/modules/clusters/unmanage-cluster/unmanage-confirm/unmanage-confirm.html b/src/modules/clusters/unmanage-cluster/unmanage-confirm/unmanage-confirm.html
@@ -6,7 +6,7 @@
                 <i class="pficon pficon pficon-warning-triangle-o"></i> 
             </div>
             <div class="col-md-10 desc">
-                Upon completion of this action, <strong>{{vm.clusterId}}</strong> will no longer be managed and must be imported again to initiate management and perform further monitoring. <br> <br>After clicking Unmanage, a task will be submitted to perform this action. This task cannot be undone, proceed with care.
+                Upon completion of this action, <strong>{{vm.clusterName}}</strong> will no longer be managed and must be imported again to initiate management and perform further monitoring. <br> <br>After clicking Unmanage, a task will be submitted to perform this action. This task cannot be undone, proceed with care.
             </div>
         </div>
         <custom-modal-footer modal-footer="vm.modalFooter"></custom-modal-footer>

diff --git a/src/modules/clusters/unmanage-cluster/unmanage-confirm/unmanage-confirm.js b/src/modules/clusters/unmanage-cluster/unmanage-confirm/unmanage-confirm.js
@@ -17,6 +17,7 @@
         vm.closeModal = closeModal;
         vm.confirmModal = confirmModal;
         vm.clusterId = selectedCluster.clusterId;
+        vm.clusterName = selectedCluster.name;
 
         vm.modalHeader = {
             "title": "Unmanage Cluster",
@@ -54,7 +55,7 @@
             $rootScope.$emit("modal.done", "close");
         }
 
-        function openProgressModal(clusterId, jobId) {
+        function openProgressModal(selectedCluster, jobId) {
             var wizardDoneListener,
                 modalInstance,
                 closeWizard;
@@ -69,7 +70,7 @@
                 resolve: {
                     progressCluster: function() {
                         return {
-                            clusterId: clusterId,
+                            cluster: selectedCluster,
                             jobId: jobId
                         };
                     }
@@ -100,7 +101,7 @@
                 .then(function(data) {
                     vm.initiateUnmanage = false;
                     jobId = data.job_id;
-                    openProgressModal(vm.clusterId, jobId);
+                    openProgressModal(selectedCluster, jobId);
                     selectedCluster.disableUnmanage = true;
                 }).catch(function(error) {
                     Notifications.message("danger", "", "Failed to initiate unmanage");

diff --git a/src/modules/clusters/unmanage-cluster/unmanage-progress/unmanage-progress.html b/src/modules/clusters/unmanage-cluster/unmanage-progress/unmanage-progress.html
@@ -6,7 +6,7 @@
                 <i class="pficon pficon pficon-ok"></i> 
             </div>
             <div class="col-md-10 desc">
-                Unmanage Cluster task Submitted An Unmanage Cluster task has been submitted to unmanage <strong>{{vm.clusterId}}</strong>. You will be notified when processing is complete.
+                Unmanage Cluster task Submitted An Unmanage Cluster task has been submitted to unmanage <strong>{{vm.clusterName}}</strong>. You will be notified when processing is complete.
             </div>
         </div>
         <custom-modal-footer modal-footer="vm.modalFooter"></custom-modal-footer>

diff --git a/src/modules/clusters/unmanage-cluster/unmanage-progress/unmanage-progress.js b/src/modules/clusters/unmanage-cluster/unmanage-progress/unmanage-progress.js
@@ -13,7 +13,8 @@
         vm.cancelModal = cancelModal;
         vm.closeModal = closeModal;
         vm.confirmModal = confirmModal;
-        vm.clusterId = progressCluster.clusterId;
+        vm.clusterId = progressCluster.cluster.clusterId;
+        vm.clusterName = progressCluster.cluster.name;
         vm.jobId = progressCluster.jobId;
 
         vm.modalHeader = {

diff --git a/src/modules/hosts/host-detail/host-detail.js b/src/modules/hosts/host-detail/host-detail.js
@@ -39,7 +39,7 @@
                 _makeTabList();
                 vm.isDataLoading = false;
                 vm.clusterObj = clusterStore.getClusterDetails(vm.clusterId);
-                vm.clusterName = vm.clusterObj.clusterId || "NA";
+                vm.clusterName = vm.clusterObj.name || "NA";
                 vm.clusterStatus = vm.clusterObj.status;
                 if (!nodeStore.nodeList.length) {
                     nodeStore.getNodeList(vm.clusterId)
@@ -63,7 +63,7 @@
                         _makeTabList();
                         vm.isDataLoading = false;
                         vm.clusterObj = clusterStore.getClusterDetails(vm.clusterId);
-                        vm.clusterName = vm.clusterObj.clusterId || "NA";
+                        vm.clusterName = vm.clusterObj.name || "NA";
                         vm.clusterStatus = vm.clusterObj.status;
                         if (!nodeStore.nodeList.length) {
                             nodeStore.getNodeList(vm.clusterId)

diff --git a/src/modules/hosts/host-list/host-list.js b/src/modules/hosts/host-list/host-list.js
@@ -110,13 +110,6 @@
             }, 1000 * config.nodeRefreshIntervalTime, 1);
         }
 
-        function redirectToGrafana(host, $event) {
-            utils.redirectToGrafana("hosts", $event, {
-                clusterId: host.integrationId,
-                hostName: host.name.split(".").join("_")
-            });
-        }
-
         /*Cancelling interval when scope is destroy*/
         $scope.$on("$destroy", function() {
             $interval.cancel(hostListTimer);
@@ -163,7 +156,7 @@
 
         function redirectToGrafana(host) {
             utils.redirectToGrafana("hosts", {
-                clusterId: host.integrationId,
+                clusterId: host.clusterName,
                 hostName: host.name.split(".").join("_")
             });
         }

diff --git a/src/modules/tasks/global-task-detail/global-task-detail.html b/src/modules/tasks/global-task-detail/global-task-detail.html
@@ -1,6 +1,5 @@
 <div ng-if="clusterData === null && !isAPINotFoundError" class="spinner spinner-lg"></div>
 <div ng-if="clusterData !== null" class="tendrl-global-task-detail-view-container container-fluid">
-
     <ul class="breadcrumb custom-breadcrumb" ng-if="!glbTaskDetailCntrl.isDataLoading && glbTaskDetailCntrl.taskDetail">
         <li><a ui-sref="clusters">All Clusters</a></li>
         <li>
@@ -24,7 +23,7 @@
         <div class="form-group required">
             <label class="col-sm-3 col-md-1 detail-label">Status:</label>
             <label class="col-sm-4 col-md-1 status-value"><i ng-class="{'pficon pficon-ok status-icon': (glbTaskDetailCntrl.taskDetail.status === 'finished')}"></i>{{glbTaskDetailCntrl.taskDetail.status === 'finished' ? "Completed": glbTaskDetailCntrl.taskDetail.status}}</label>
-            <label class="col-sm-4 col-md-2" ng-show="(glbTaskDetailCntrl.taskDetail.flow === 'ImportCluster') && (glbTaskDetailCntrl.taskDetail.status === 'finished') &&(!$root.selectedClusterOption)"><a href="" ng-click="glbTaskDetailCntrl.goToClusterDetail()">View cluster details</a></label>
+            <label class="col-sm-4 col-md-2" ng-show="(glbTaskDetailCntrl.taskDetail.flow === 'ImportCluster') && (glbTaskDetailCntrl.taskDetail.status === 'finished') &&(!$root.selectedClusterOption)"><span class="spinner spinner-xs spinner-inline" ng-show="glbTaskDetailCntrl.showLoadingIcon"></span> <a href="" ng-click="glbTaskDetailCntrl.goToClusterDetail()">View cluster details</a></label>
         </div>
     </form>
     <center ng-if="!glbTaskDetailCntrl.taskDetail && !glbTaskDetailCntrl.isDataLoading">