Skip to content

Chef Import #1096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 3, 2017
Merged

Chef Import #1096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d02e209
Changes for chef import
srikanthv02 Jan 3, 2017
87e81f9
Resolvig merge conflicts with dev
srikanthv02 Jan 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/cat3/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
<script src="src/partials/sections/dashboard/analytics/controller/costCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/capacityCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/discoverySyncResultCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/discoveryTagMappingCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/usageCtrl.js"></script>

Expand Down
39 changes: 35 additions & 4 deletions client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,9 @@
];
$scope.instanceType= 'managedInstances';
} else if($rootScope.organNewEnt.instanceType === 'Assigned'){

$scope.colArray=['platformId','privateIpAddress','os','state'];

disResrc.gridOptionInstances.columnDefs=[
{name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false,
enableCellEdit: false,enableFiltering: true},
Expand Down Expand Up @@ -334,7 +336,7 @@
};
disResrc.init();

}]).controller('instanceManageCtrl',['$scope','$rootScope','items','$modalInstance','genericServices',function ($scope,$rootScope,items,$modalInstance,genericServices) {
}]).controller('instanceManageCtrl',['$scope','$rootScope','items','$modalInstance','genericServices','$modal',function ($scope,$rootScope,items,$modalInstance,genericServices,$modal) {
$scope.items=items;
var fltrObj=$rootScope.filterNewEnt;
var reqBody = {};
Expand Down Expand Up @@ -365,6 +367,8 @@
}
};
$scope.ok = function() {
$scope.importSpinner = true;
$scope.importSync = true;
reqBody.orgId = $scope.IMGNewEnt.org.orgid;
reqBody.bgId = $scope.IMGNewEnt.buss.rowid;
reqBody.projectId = $scope.IMGNewEnt.proj.rowId;
Expand All @@ -387,9 +391,36 @@
data:reqBody
}
genericServices.promisePost(params).then(function (response) {
if(response.data){
toastr.success('Successfully Imported.','Update');
$modalInstance.dismiss(response.data);

if(response.taskId){
$modalInstance.dismiss(response.taskId);
$scope.importSpinner = false;
$scope.importSync = false;
$modal.open({
animation: true,
templateUrl: 'src/partials/sections/dashboard/analytics/view/discoverySyncResult.html',
controller: 'discoverySyncResultCtrl',
backdrop: 'static',
keyboard: false,
resolve: {
items: function() {
return {
taskId:response.taskId,
nodeIds:reqBody.instanceIds
};
}
}
}).result.then(function(response) {
}, function() {
console.log("Dismiss at " + new Date());
});
}
},function(response){
$scope.isStartStopInstanceLoading = false;
if(response.data.message){
$scope.authMsg = response.data.message;
}else{
$scope.authMsg = response.data;
}
});
};
Expand Down
43 changes: 43 additions & 0 deletions client/cat3/src/partials/sections/dashboard/analytics/controller/discoverySyncResultCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
(function (angular) {
"use strict";
angular.module('dashboard.analytics')
.controller('discoverySyncResultCtrl', ['$scope','$rootScope', '$state', 'items','analyticsServices', 'genericServices','toastr','$modalInstance','$timeout', function ($scope, $rootScope, $state, items,analyticsServices,genSevs,toastr,$modalInstance,$timeout){
$scope.cancel = function() {
$modalInstance.dismiss('cancel');
};
$scope.isInstanceImporting = true;
$scope.pollTaskStatus = function(timestamp) {
$timeout(function () {
var params={
url:'/taskstatus/' + items.taskId + '/status?timestamp=' + timestamp
};
$scope.progressValue = 0;
genSevs.promiseGet(params).then(function (data) {
if (!data.completed) {
if (data.statusList && data.statusList.length) {
$scope.progressValue = data.statusList.length;
for (var i = 0; i < data.statusList.length; i++) {
$scope.statusMessage = data.statusList[i].status.message;
$scope.isInstanceImporting = false;
}
$scope.pollTaskStatus(data.statusList[data.statusList.length - 1].timestamp);
} else {
$scope.pollTaskStatus(timestamp);
}
} else {
if (data.statusList && data.statusList.length) {
$scope.progressValue = data.statusList.length;
for (var i = 0; i < data.statusList.length; i++) {
$scope.statusMessage = data.statusList[i].status.message;
$scope.isInstanceImporting = false;
}
}
$scope.progressValue = items.nodeIds.length;
$scope.instanceLength = items.nodeIds.length;
}
});
},1000);
};
$scope.pollTaskStatus(0);
}])
})(angular);
14 changes: 14 additions & 0 deletions client/cat3/src/partials/sections/dashboard/analytics/view/discoverySyncResult.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<div class="modal-header">
<span class="close" ng-click="cancel()">×</span>
<h4 class="modal-title">
Importing Instance
</h4>
</div>
<div class="modal-body">
<loading size="large" name="isInstanceImporting" type="block" align="center"></loading>
<div ng-show="isInstanceImporting"></div>
<div ng-show="!isInstanceImporting">{{statusMessage}}</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal" ng-click="cancel()">Close</button>
</div>
13 changes: 8 additions & 5 deletions client/cat3/src/partials/sections/dashboard/analytics/view/instanceManage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h4 class="modal-title"><i class="fa fa-upload"></i> Import Instance</h4>
<loading size="small" name="isLoadingServer" type="inline" class="ng-scope" style="display: none;"><span class="catloader inline ng-scope small"><i class="fa fa-spinner fa-spin black"></i></span></loading>
<select ng-model="IMGNewEnt.serverTypeInd" class="form-control ng-pristine ng-untouched ng-invalid ng-invalid-required" required="">
<option value="">Choose Server</option>
<option ng-repeat="serverOption in configOptions" value="{{serverOption._id}}" class="ng-binding ng-scope">{{serverOption.configname}}{{serverOption.puppetservername}}</option>
<option ng-repeat="serverOption in configOptions" value="{{serverOption.rowid}}" class="ng-binding ng-scope">{{serverOption.configname}}{{serverOption.puppetservername}}</option>
</select>
</div>
</div>
Expand All @@ -79,7 +79,7 @@ <h4 class="modal-title"><i class="fa fa-upload"></i> Import Instance</h4>
<label for="">Password :<span class="red">*</span> <!-- ngIf: depNewApp.errorMsg.server -->
</label>
<div class="input-groups">
<input ng-model="IMGNewEnt.password" type="text" name="coBlueprintName" class="form-control" required >
<input ng-model="IMGNewEnt.password" type="password" name="coBlueprintName" class="form-control" required >
</div>
</div>
<div class="col-lg-6 col-md-6 margintop15" ng-if="IMGNewEnt.passType === 'pemFile' ">
Expand All @@ -97,9 +97,12 @@ <h4 class="modal-title"><i class="fa fa-upload"></i> Import Instance</h4>
<button type="button" class="btn cat-btn-cancel" ng-click="cancel()">
<i class="fa fa-times black"></i> Cancel
</button>
<button type="button" class="btn cat-btn-update" ng-disabled="instMG.$invalid" ng-click="ok()">
<i class="fa fa-check white"></i> Ok
<button type="button" class="btn cat-btn-update" ng-disabled="instMG.$invalid || importSync" ng-click="ok()">
<i class="fa fa-check white"></i> Sync
</button>
<span ng-show="importSpinner">
<i class="fa fa-spinner fa-pulse fa-fw black"></i>
</span>
</div>
</div>
</form>
</form>