x/compass-web
Code Issues Proposed changes

Merge "mockData&review updated"

Browse Source
This commit is contained in:
Jenkins 2015-02-27 23:07:04 +00:00 committed by Gerrit Code Review
commit 1e078e788c
4 changed files with 84 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
v2/src/app/appDev.js
View File

@ -664,6 +664,10 @@ compassAppDev.run(function($httpBackend, settings, $http) {
"create_by": "user@someemail.com", "create_by": "user@someemail.com",
"create_at": "2014-4-25 12:00:00", "create_at": "2014-4-25 12:00:00",
"updated_at": "2014-2-27 20:00:00", "updated_at": "2014-2-27 20:00:00",
"flavor":{
"display_name": "Multi-node Cluster with HA",
"name": "HA-multinodes"
},
"links": [{ "links": [{
"href": "/clusters/2", "href": "/clusters/2",
"rel": "self" "rel": "self"
@ -683,12 +687,14 @@ compassAppDev.run(function($httpBackend, settings, $http) {
"id": parseInt(id), "id": parseInt(id),
"name": "Cluster" + id, "name": "Cluster" + id,
"adapter_id": 6, // 6: ceph_openstack_icehouse, 5: openstack_icehouse, 4: ceph(chef), 2: os_only "adapter_id": 6, // 6: ceph_openstack_icehouse, 5: openstack_icehouse, 4: ceph(chef), 2: os_only
"adapter_name": "openstack_icehouse",
"os_id": 1, "os_id": 1,
"editable": true, "editable": true,
"create_by": "user@someemail.com", "create_by": "user@someemail.com",
"create_at": "2014-3-25 12:00:00", "create_at": "2014-3-25 12:00:00",
"updated_at": "2014-3-26 13:00:00", "updated_at": "2014-3-26 13:00:00",
"flavor": { "flavor": {
"name": "HA-multinodes",
"roles": [{ "roles": [{
"display_name": "Compute", "display_name": "Compute",
"name": "os-compute-worker" "name": "os-compute-worker"

3
v2/src/app/wizard/package_config.tpl.html
View File

@ -257,7 +257,8 @@
<span class="text-danger">*</span> <span class="text-danger">*</span>
</label> </label>
<div class="col-sm-8"> <div class="col-sm-8">
<select ng-init="neutron_config.openvswitch.tenant_network_type='gre'" ng-model="neutron_config.openvswitch.tenant_network_type" name="tenant" class="col-xs-10 col-sm-5"> <!-- ng-init="neutron_config.openvswitch.tenant_network_type='gre'" -->
<select ng-model="neutron_config.openvswitch.tenant_network_type" name="tenant" class="col-xs-10 col-sm-5">
<option value="gre" ng-selected="neutron_config.openvswitch.tenant_network_type == 'gre'">gre</option> <option value="gre" ng-selected="neutron_config.openvswitch.tenant_network_type == 'gre'">gre</option>
<option value="vlan" ng-selected="neutron_config.openvswitch.tenant_network_type == 'vlan'">vlan</option> <option value="vlan" ng-selected="neutron_config.openvswitch.tenant_network_type == 'vlan'">vlan</option>
</select> </select>

50
v2/src/app/wizard/review.tpl.html
View File

@ -232,6 +232,7 @@
</table> </table>
<br> <br>
<br> <br>
<span ng-if="currentAdapterName == 'ceph_openstack_icehouse' || currentAdapterName == 'ceph_firefly'">
<div class="widget-header widget-header-flat review-targetconfig"> <div class="widget-header widget-header-flat review-targetconfig">
<h5 class="widget-title white" ng-click="returnStep('security')"> <h5 class="widget-title white" ng-click="returnStep('security')">
Target System Configurations - cephConfig Target System Configurations - cephConfig
@ -251,6 +252,53 @@
</table> </table>
<br> <br>
<br> <br>
</span>
<span ng-if="currentAdapterName == 'ceph_openstack_icehouse' || currentAdapterName == 'openstack_icehouse'">
<div class="widget-header widget-header-flat review-targetconfig">
<h5 class="widget-title white" ng-click="returnStep('security')">
Target System Configurations - NeutronConfig
</h5>
</div>
<table class="table table-striped table-border-grey">
<tbody>
<tr>
<td>tenent_network_type</td>
<td>{{neutronConfig.openvswitch.tenant_network_type}}</td>
</tr>
<tr ng-if="neutronConfig.openvswitch.tenant_network_type=='gre'" ng-repeat="(key, value) in neutronConfig.openvswitch.tunnel_id_ranges">
<td>tunnel_id_ranges_{{key}}</td>
<td>{{value}}</td>
</tr>
<tr ng-if="neutronConfig.openvswitch.tenant_network_type=='vlan'" ng-repeat="(key, value) in neutronConfig.openvswitch.network_vlan_ranges">
<td>network_vlan_ranges_{{key}}</td>
<td>{{value}}</td>
</tr>
<tr ng-if="neutronConfig.openvswitch.tenant_network_type=='vlan'" ng-repeat="(key, value) in neutronConfig.openvswitch.bridge_mappings">
<td>bridge_mappins_{{key}}</td>
<td>{{value}}</td>
</tr>
</tbody>
</table>
<br>
<br>
</span>
<span ng-if="currentFlavor == 'HA-multinodes'">
<div class="widget-header widget-header-flat review-targetconfig">
<h5 class="widget-title white" ng-click="returnStep('security')">
Target System Configurations - High Availability Config
</h5>
</div>
<table class="table table-striped table-border-grey">
<tbody>
<tr>
<td>VIP</td>
<td>{{haConfig.ha_proxy.vip}}</td>
</tr>
</tbody>
</table>
<br>
<br>
</span>
<div class="widget-header widget-header-flat review-targetconfig"> <div class="widget-header widget-header-flat review-targetconfig">
<h5 class="widget-title white" ng-click="returnStep('security')"> <h5 class="widget-title white" ng-click="returnStep('security')">
Target System Configurations - console_credentials Target System Configurations - console_credentials
@ -309,4 +357,4 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>

35
v2/src/app/wizard/wizard.js
View File

@ -11,6 +11,14 @@ define(['uiRouter', 'angularTable', 'angularDragDrop', 'angularTouch', 'ngSpinne
'ngAnimate' 'ngAnimate'
]); ]);
function isEmpty(obj) {
for (var prop in obj) {
if (obj.hasOwnProperty(prop))
return false;
}
return true;
}
wizardModule.config(function config($stateProvider) { wizardModule.config(function config($stateProvider) {
$stateProvider $stateProvider
.state('wizard', { .state('wizard', {
@ -72,6 +80,20 @@ define(['uiRouter', 'angularTable', 'angularDragDrop', 'angularTouch', 'ngSpinne
$scope.currentAdapterName = $scope.cluster.adapter_name; $scope.currentAdapterName = $scope.cluster.adapter_name;
$scope.currentFlavor = $scope.cluster.flavor.name; $scope.currentFlavor = $scope.cluster.flavor.name;
// angular.forEach($scope.adapters, function(adapter) {
// if (adapter.id == $scope.cluster.adapter_id) {
// // console.log("hi");
// // console.log(adapter);
// // console.log($scope.cluster.adapter_name);
// $scope.currentAdapterName = adapter.name;
// // if(adapter.flavors!=null)
// $scope.currentFlavor = adapter.flavors.name;
// }
// });
// $scope.currentAdapterName = $scope.cluster.adapter_name;
// $scope.currentFlavor = $scope.cluster.flavor.name;
// get pre-config data for wizard and set wizard steps based on different adapters // get pre-config data for wizard and set wizard steps based on different adapters
var oldConfig = clusterConfigData; var oldConfig = clusterConfigData;
@ -1269,6 +1291,7 @@ define(['uiRouter', 'angularTable', 'angularDragDrop', 'angularTouch', 'ngSpinne
if (!$scope.neutron_config["openvswitch"]) { if (!$scope.neutron_config["openvswitch"]) {
$scope.neutron_config["openvswitch"] = {}; $scope.neutron_config["openvswitch"] = {};
$scope.neutron_config["openvswitch"]["tenant_network_type"] = ["gre"];
$scope.neutron_config["openvswitch"]["tunnel_id_ranges"] = [""]; $scope.neutron_config["openvswitch"]["tunnel_id_ranges"] = [""];
$scope.neutron_config["openvswitch"]["network_vlan_ranges"] = [""]; $scope.neutron_config["openvswitch"]["network_vlan_ranges"] = [""];
$scope.neutron_config["openvswitch"]["bridge_mappings"] = [""]; $scope.neutron_config["openvswitch"]["bridge_mappings"] = [""];
@ -1290,9 +1313,6 @@ define(['uiRouter', 'angularTable', 'angularDragDrop', 'angularTouch', 'ngSpinne
"osd_devices": {} "osd_devices": {}
};*/ };*/
$scope.cephConfig = wizardFactory.getCephConfig(); $scope.cephConfig = wizardFactory.getCephConfig();
// $scope.$watch(function() { // $scope.$watch(function() {
// return wizardFactory.getCommitState() // return wizardFactory.getCommitState()
// }, function(newCommitState, oldCommitState) { // }, function(newCommitState, oldCommitState) {
@ -1303,12 +1323,7 @@ define(['uiRouter', 'angularTable', 'angularDragDrop', 'angularTouch', 'ngSpinne
// } // }
// } // }
// }); // });
$scope.form = {}; $scope.form = {};
$scope.commit = function(sendRequest) { $scope.commit = function(sendRequest) {
if (!sendRequest) { if (!sendRequest) {
var commitState = { var commitState = {
@ -1336,6 +1351,7 @@ define(['uiRouter', 'angularTable', 'angularDragDrop', 'angularTouch', 'ngSpinne
} }
if ($scope.currentAdapterName == "openstack_icehouse" && $scope.currentFlavor == "HA-multinodes") { if ($scope.currentAdapterName == "openstack_icehouse" && $scope.currentFlavor == "HA-multinodes") {
// if ($scope.currentAdapterName == "openstack_icehouse"){
targetSysConfigData["package_config"]["ha_proxy"] = {}; targetSysConfigData["package_config"]["ha_proxy"] = {};
targetSysConfigData["package_config"]["ha_proxy"]["vip"] = $scope.ha_config.ha_proxy.vip; targetSysConfigData["package_config"]["ha_proxy"]["vip"] = $scope.ha_config.ha_proxy.vip;
@ -1780,7 +1796,10 @@ define(['uiRouter', 'angularTable', 'angularDragDrop', 'angularTouch', 'ngSpinne
$scope.service_credentials = wizardFactory.getServiceCredentials(); $scope.service_credentials = wizardFactory.getServiceCredentials();
$scope.console_credentials = wizardFactory.getConsoleCredentials(); $scope.console_credentials = wizardFactory.getConsoleCredentials();
$scope.global_config = wizardFactory.getGeneralConfig(); $scope.global_config = wizardFactory.getGeneralConfig();
$scope.cephConfig = wizardFactory.getCephConfig(); $scope.cephConfig = wizardFactory.getCephConfig();
$scope.neutronConfig = wizardFactory.getNeutronConfig();
$scope.haConfig = wizardFactory.getHighAvailabilityConfig();
dataService.getServerColumns().success(function(data) { dataService.getServerColumns().success(function(data) {
$scope.server_columns = data.review; $scope.server_columns = data.review;