/snf-cyclades-app/synnefo/ui/static/snf/js/neutron.js - Diff - Synnefo - Greek Research and Technology Network's projects

Revision 198b546d snf-cyclades-app/synnefo/ui/static/snf/js/neutron.js

     // Copyright 2014 GRNET S.A. All rights reserved.
     //
     // Redistribution and use in source and binary forms, with or
     // without modification, are permitted provided that the following
     // conditions are met:
     //
     //   1. Redistributions of source code must retain the above
     //      copyright notice, this list of conditions and the following
     //      disclaimer.
     //
     //   2. Redistributions in binary form must reproduce the above
     //      copyright notice, this list of conditions and the following
     //      disclaimer in the documentation and/or other materials
     //      provided with the distribution.
     //
     // THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
     // OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
     // WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
     // PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
     // CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
     // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
     // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
     // USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
     // AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
     // LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
     // ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     // POSSIBILITY OF SUCH DAMAGE.
     //
     // The views and conclusions contained in the software and
     // documentation are those of the authors and should not be
     // interpreted as representing official policies, either expressed
     // or implied, of GRNET S.A.
     //
     ;(function(root){
         // Neutron api models, collections, helpers
-...
         models.Network = models.NetworkModel.extend({
           path: 'networks',
           url: function(options, method) {
             var url = models.Network.__super__.url.call(this, method, options);
             if (options.data && options.data.reassign) {
               return url + '/action';
+            }
             return url;
           },
           parse: function(obj) {
             return obj.network;
           },
-...
             this.actions.reset_pending();
             this.destroy({
               success: _.bind(function() {
                 synnefo.api.trigger("quotas:call", 10);
                 this.set({status: 'REMOVING'});
                 this.set({ext_status: 'REMOVING'});
                 // force status display update
-...
             'subnets': ['subnets', 'subnet', function(model, attr) {
               var subnets = model.get(attr);
               if (subnets && subnets.length) { return subnets[0] }
             }]
             }],
             'tenant_id': ['projects', 'project']
           },
           // call rename api
           rename: function(new_name, cb) {
               var self = this;
               this.sync("update", this, {
                   critical: true,
                   data: {
-...
                   success: _.bind(function(){
                       //this.set({name: new_name});
                       snf.api.trigger("call");
                       self.set({name: new_name});
                   }, this),
                   complete: cb || function() {}
               });
-...
             this.pending_connections++;
             this.update_connecting_status();
             synnefo.storage.ports.create(data, {complete: cb});
+          }
           },
           reassign_to_project: function(project, success, cb) {
             var project_id = project.id ? project.id : project;
             var self = this;
             var _success = function() {
               success();
               self.set({'tenant_id': project_id});
+            }
             synnefo.api.sync('create', this, {
               success: _success,
               complete: cb,
               data: {
                 reassign: {
                   project: project_id
+                }
+              }
             });
           },
         });
         models.CombinedPublicNetwork = models.Network.extend({
-...
           },
           get_floating_ips_network: function() {
             return this.filter(function(n) { return n.get('is_public')})[1]
             return this.filter(function(n) { return n.get('is_public') })[1]
           },
           create_subnet: function(subnet_params, complete, error) {
-...
             });
           },
           create: function (name, type, cidr, dhcp, callback) {
           create: function (project, name, type, cidr, dhcp, callback) {
             var quota = synnefo.storage.quotas;
             var params = {network:{name:name}};
             var subnet_params = {subnet:{network_id:undefined}};
             if (!type) { throw "Network type cannot be empty"; }
             params.network.type = type;
             params.network.project = project.id;
             if (cidr) { subnet_params.subnet.cidr = cidr; }
             if (dhcp) { subnet_params.subnet.dhcp_enabled = dhcp; }
             if (dhcp === false) { subnet_params.subnet.dhcp_enabled = false; }
             var cb = function() {
               synnefo.api.trigger("quotas:call");
               callback && callback();
+            }
-...
                   created_network.destroy({no_skip: true});
                 });
+              }
               quota.get('cyclades.network.private').increase();
               project.quotas.get('cyclades.network.private').increase();
+            }
             return this.api_call(this.path, "create", params, complete, error, success);
+          }
-...
         models.FloatingIP = models.NetworkModel.extend({
           path: 'floatingips',
           url: function(options, method) {
             var url = models.FloatingIP.__super__.url.call(this, method, options);
             if (options.data && options.data.reassign) {
               return url + '/action';
+            }
             return url;
           },
           parse: function(obj) {
             return obj.floatingip;
           },
           storage_attrs: {
             'tenant_id': ['projects', 'project'],
             'port_id': ['ports', 'port'],
             'floating_network_id': ['networks', 'network'],
           },
-...
             }]
           },
           reassign_to_project: function(project, success, cb) {
             var project_id = project.id ? project.id : project;
             var self = this;
             var _success = function() {
               success();
               self.set({'tenant_id': project_id});
+            }
             synnefo.api.sync('create', this, {
               success: _success,
               complete: cb,
               data: {
                 reassign: {
                   project: project_id
+                }
+              }
             });
           },
           do_remove: function(succ, err) { return this.do_destroy(succ, err) },
           do_destroy: function(succ, err) {
             this.actions.reset_pending();
             this.destroy({
               success: _.bind(function() {
                 synnefo.api.trigger("quotas:call", 10);
                 this.set({status: 'REMOVING'});
                 succ && succ();
               }, this),

Also available in: Unified diff