Revert "Add flavor in wizard"

This reverts commit 8ba0dd710a.

Change-Id: Ibfd289b3374a30db42476c510c4ad716f7ab96c7

v2/src/app/appDev.js

@@ -23,37 +23,18 @@ compassAppDev.run(function($httpBackend, settings, $http) {
             "display": "OpenStack",
             "os_installer": "cobbler",
             "package_installer": "chef",
-            "flavors": [{
+            "roles": [{
-                "display_name": "allinone",
+                "display_name": "Compute",
-                "id": 1,
+                "name": "os-compute-worker"
-                "name": "allinone",
-                "roles": [{
-                    "display_name": "Compute",
-                    "name": "os-compute-worker"
-                }, {
-                    "display_name": "Controller",
-                    "name": "os-controller"
-                }, {
-                    "display_name": "Network",
-                    "name": "os-network"
-                }, {
-                    "display_name": "Storage",
-                    "name": "os-block-storage-worker"
-                }]
             }, {
-                "display_name": "multiroles",
+                "display_name": "Controller",
-                "id": 2,
+                "name": "os-controller"
-                "name": "multiroles",
+            }, {
-                "roles": [{
+                "display_name": "Network",
-                    "display_name": "Compute",
+                "name": "os-network"
-                    "name": "os-compute-worker"
+            }, {
-                }, {
+                "display_name": "Storage",
-                    "display_name": "Controller",
+                "name": "os-block-storage-worker"
-                    "name": "os-controller"
-                }, {
-                    "display_name": "Network",
-                    "name": "os-network"
-                }]
             }],
             "supported_oses": [{
                 "name": "CentOs",
@@ -68,14 +49,20 @@ compassAppDev.run(function($httpBackend, settings, $http) {
             "display": "Hadoop",
             "os_installer": "cobbler",
             "package_installer": "chef",
+            "roles": [{
+                "display_name": "Compute",
+                "name": "os-compute-worker"
+            }, {
+                "display_name": "Controller",
+                "name": "os-controller"
+            }, {
+                "display_name": "Network",
+                "name": "os-network"
+            }],
             "supported_oses": [{
                 "name": "CentOs",
                 "os_id": 1
-            }, {
+            }]
-                "name": "Ubuntu",
-                "os_id": 2
-            }],
-            "flavors": []
         }];
         return [200, adapters, {}];
     });
@@ -88,37 +75,18 @@ compassAppDev.run(function($httpBackend, settings, $http) {
             "display": "OpenStack",
             "os_installer": "cobbler",
             "package_installer": "chef",
-            "flavors": [{
+            "roles": [{
-                "display_name": "allinone",
+                "display_name": "Compute",
-                "id": 1,
+                "name": "os-compute-worker"
-                "name": "allinone",
-                "roles": [{
-                    "display_name": "Compute",
-                    "name": "os-compute-worker"
-                }, {
-                    "display_name": "Controller",
-                    "name": "os-controller"
-                }, {
-                    "display_name": "Network",
-                    "name": "os-network"
-                }, {
-                    "display_name": "Storage",
-                    "name": "os-block-storage-worker"
-                }]
             }, {
-                "display_name": "multiroles",
+                "display_name": "Controller",
-                "id": 2,
+                "name": "os-controller"
-                "name": "multiroles",
+            }, {
-                "roles": [{
+                "display_name": "Network",
-                    "display_name": "Compute",
+                "name": "os-network"
-                    "name": "os-compute-worker"
+            }, {
-                }, {
+                "display_name": "Storage",
-                    "display_name": "Controller",
+                "name": "os-block-storage-worker"
-                    "name": "os-controller"
-                }, {
-                    "display_name": "Network",
-                    "name": "os-network"
-                }]
             }],
             "supported_oses": [{
                 "name": "CentOs",
@@ -420,22 +388,6 @@ compassAppDev.run(function($httpBackend, settings, $http) {
             "adapter_id": 1,
             "os_id": 1,
             "editable": true,
-            "flavor": {
-                "id": 1,
-                "roles": [{
-                    "display_name": "Compute",
-                    "name": "os-compute-worker"
-                }, {
-                    "display_name": "Controller",
-                    "name": "os-controller"
-                }, {
-                    "display_name": "Network",
-                    "name": "os-network"
-                }, {
-                    "display_name": "Storage",
-                    "name": "os-block-storage-worker"
-                }]
-            },
             "create_by": "user@someemail.com",
             "create_at": "2014-3-25 12:00:00",
             "updated_at": "2014-3-26 13:00:00",
@@ -447,7 +399,6 @@ compassAppDev.run(function($httpBackend, settings, $http) {
         return [201, mockResponse, {}];
     });
 
-
     $httpBackend.whenGET(/\.*\/clusters\/[1-9][0-9]*\/state/).respond(function(method, url, data) {
         console.log(method, url, data);
         var states = ["UNINITIALIZED", "INITIALIZED", "INSTALLING", "SUCCESSFUL", "ERROR"];
@@ -575,23 +526,7 @@ compassAppDev.run(function($httpBackend, settings, $http) {
             "create_by": "user@someemail.com",
             "create_at": "2014-3-25 12:00:00",
             "updated_at": "2014-3-26 13:00:00",
-            "flavor": {
+            " links": [{
-                "id": 1,
-                "roles": [{
-                    "display_name": "Compute",
-                    "name": "os-compute-worker"
-                }, {
-                    "display_name": "Controller",
-                    "name": "os-controller"
-                }, {
-                    "display_name": "Network",
-                    "name": "os-network"
-                }, {
-                    "display_name": "Storage",
-                    "name": "os-block-storage-worker"
-                }]
-            },
-            "links": [{
                 "href": "/clusters/" + id,
                 "rel": "self"
             }, {

v2/src/app/cluster/cluster-create.tpl.html

@@ -31,7 +31,7 @@
                 <div ng-show="createClusterForm.clustername.$error.required" class="help-block col-xs-12 col-sm-reset inline"> Required</div>
             </div>
 
-            <div class="form-group" ng-class="{'has-error':createClusterForm.targetsystem.$error.required&& !createClusterForm.targetsystem.$pristine}">
+            <div class="form-group" ng-class="{'has-error':createClusterForm.targetsystem.$error.required&& !createClusterForm.clustername.$pristine}">
                 <label class="col-xs-12 col-sm-3 col-md-3 control-label no-padding-right">Target System</label>
 
                 <div class="col-xs-12 col-sm-5">
@@ -43,7 +43,7 @@
                 <div class="help-block col-xs-12 col-sm-reset inline"> Required </div>
             </div>
 
-            <div class="form-group" ng-class="{'has-error':createClusterForm.targetsystem.$error.required&& !createClusterForm.targetsystem.$pristine}">
+            <div class="form-group" ng-class="{'has-error':createClusterForm.targetsystem.$error.required&& !createClusterForm.clustername.$pristine}">
                 <label class="col-xs-12 col-sm-3 control-label no-padding-right">OS</label>
 
                 <div class="col-xs-12 col-sm-5">
@@ -54,18 +54,6 @@
                 </div>
                 <div class="help-block col-xs-12 col-sm-reset inline"> Required </div>
             </div>
-
-            <div class="form-group" ng-hide="flavors.length == 0" ng-class="{'has-error':createClusterForm.flavors.$error.required&& !createClusterForm.flavors.$pristine}">
-                <label class="col-xs-12 col-sm-3 control-label no-padding-right">Flavor</label>
-
-                <div class="col-xs-12 col-sm-5">
-                    <select name="os" class="width-100" ng-model="cluster.flavor_id">
-                        <option value=""></option>
-                        <option ng-repeat="flavor in flavors" value="{{flavor.id}}"> {{flavor.display_name}}</option>
-                    </select>
-                </div>
-            </div>
-
         </form>
     </div>
     <div class="modal-footer">

v2/src/app/cluster/cluster.js

@@ -388,7 +388,6 @@ var ModalInstanceCtrl = function($scope, $modalInstance, allAdapters, cluster) {
         angular.forEach($scope.allAdapters, function(adapter) {
             if (adapter.id == $scope.cluster.adapter_id) {
                 $scope.supported_oses = adapter.supported_oses;
-                $scope.flavors = adapter.flavors;
             }
         })
     });

v2/src/app/wizard/wizard.js

@@ -984,7 +984,11 @@ angular.module('compass.wizard', [
 .controller('roleAssignCtrl', function($scope, wizardFactory, dataService, $filter, ngTableParams, sortingService, $q, usSpinnerService) {
     var cluster = wizardFactory.getClusterInfo();
     $scope.servers = wizardFactory.getServers();
-    $scope.roles = cluster.flavor.roles;
+
+    dataService.getAdapter(cluster.adapter_id).success(function(data) {
+        wizardFactory.setAdapter(data);
+        $scope.roles = data.roles;
+    });
 
     dataService.getServerColumns().success(function(data) {
         $scope.server_columns = data.showless;

v2/src/app/wizard/wizard.tpl.html

@@ -39,27 +39,13 @@
                         Prev
                     </button>
                 </div>
-
+                <button ng-click="stepForward()" class="btn btn-success btn-next">
-                <span ng-if="currentStep<steps.length">
-                    <button ng-click="startSpin(); stepForward()" class="btn btn-success btn-next">
-                        Next
-                        <i class="ace-icon fa fa-arrow-right icon-on-right"></i>
-                    </button>
-                </span>
-
-                <span ng-if="currentStep==steps.length">
-                    <button ng-click="deploy()" class="btn btn-success btn-next">
-                        <span>Deploy</span>
-                    </button>
-                </span>
-
-                <!--button ng-click="stepForward()" class="btn btn-success btn-next">
                     <span ng-if="currentStep<steps.length">
                         Next
                         <i class="ace-icon fa fa-arrow-right icon-on-right"></i>
                     </span>
                     <span ng-if="currentStep==steps.length">Deploy</span>
-                </button-->
+                </button>
             </div>
         </div>
 
@@ -81,6 +67,18 @@
                 </div>
             </div>
 
+            <span ng-if="currentStep<steps.length">
+                <button ng-click="startSpin(); stepForward()" class="btn btn-success btn-next">
+                    Next
+                    <i class="ace-icon fa fa-arrow-right icon-on-right"></i>
+                </button>
+            </span>
+
+            <span ng-if="currentStep==steps.length">
+                <button ng-click="deploy()" class="btn btn-success btn-next">
+                    <span>Deploy</span>
+                </button>
+            </span>
         </div>
 
     </div>