loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Commit for testing

Browse source
This commit is contained in:
Loic GUEGAN 2016-05-04 19:38:09 +02:00
parent f819bc0c90
commit 0266c16ffc
4 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/js/controllers/home/home.js
View file

@ -32,8 +32,8 @@ mainApp.controller('homeCtrl', ['$scope', 'Compute', '$rootScope', 'Loading', 'I
});
$scope.raiseShowMachineCreationEvent = function (){
$rootScope.$broadcast("showMachineCreationEvent");
$scope.raiseShowMachineCreationEvent = function () {
$rootScope.$broadcast("showMachineCreationEvent", Compute.getData().axioms);
};
// Function to call from view to display the details of a machine

11
client/js/controllers/home/machineCreation.js
View file

@ -9,8 +9,17 @@ mainApp.controller('machineCreationCtrl', ['$scope', 'Compute', '$rootScope', '$
$scope.name = "loic"
// When we need to show details of machine
$scope.$on('showMachineCreationEvent', function (eventName) {
$scope.$on('showMachineCreationEvent', function (eventName, axioms) {
$scope.axioms=axioms;
$('#machineCreationModal').modal({backdrop: false, keyboard: true});
});
$scope.createMachine=function(){
machine={}
machine.name="loicTest"
machine.flavorId=1
machine.imageId="fd1ea580-a83e-4dc8-833c-96ce2b6f1358"
Compute.createMachine(function(){console.log("done")}, machine)
};
}]);

16
client/js/services/Compute.js
View file

@ -105,6 +105,21 @@ mainApp.factory('Compute', ['$http', 'Identity', function ($http, Identity) {
});
};
var createMachine = function (callback, machine) {
// Send listServers request
var result = $http.post('../server/index.php',
$.param({"token": Identity.getToken(), "task": "compute", "action": "createServer", 'name':machine.name, "imageId":machine.imageId,"flavorId":machine.flavorId}));
// Wait and handle the response
result.then(function (response) {
callback();
console.log(response.data.Error)
}, function (response) {
console.log("error")
callback();
});
};
/**
* Retrieve all data
@ -134,6 +149,7 @@ mainApp.factory('Compute', ['$http', 'Identity', function ($http, Identity) {
return {
pullMachines: pullMachines,
pullData: pullData,
createMachine:createMachine,
getData: getData
};

25
client/partials/home/machineCreation.html
View file

@ -13,24 +13,12 @@
<form class="form-horizontal" role="form">
<div class="form-group">
<label class="control-label col-sm-2" for="email">Name</label>
<div class="col-sm-10">
<p class="form-control-static">{{ name}}</p>
<label class="control-label col-sm-2">Name</label>
<div class="col-sm-20">
<input type="text" value="" />
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="pwd">State</label>
<div class="col-sm-10">
<span ng-if="machine.status == 'ACTIVE'">Online</span>
<span ng-if="machine.status !== 'ACTIVE'">Offline</span>
&nbsp;
<button class="btn btn-danger" ng-if="machine.status == 'ACTIVE'" ng-click="toggleMachineState()">Turn Off</button>
<button class="btn btn-success" ng-if="machine.status !== 'ACTIVE'" ng-click="toggleMachineState()">Turn On</button>
&nbsp;<img src="images/spin/32x32/Preloader_1.gif" ng-if="machineIsStarting"></span>
</div>
</div>
<fieldset class="form-group">
<label class="control-label col-sm-2">RAM</label>
<select class="col-sm-20" id="ramSelected">
@ -52,17 +40,12 @@
<option ng-repeat="image in axioms.images" ng-selected="machine.imageId == Object.keys(image)">{{ image.name}}</option>
</select>
</fieldset>
</form>
</div>
<div class="modal-footer">
<a href="#" data-dismiss="modal" class="btn btn-primary">Apply</a>
<a href="#" data-dismiss="modal" ng-click="createMachine()" class="btn btn-primary">Create</a>
<a href="#" data-dismiss="modal" class="btn btn-default">Cancel</a>
</div>
</div>