/ - Diff - Synnefo - Greek Research and Technology Network's projects

Revision 0dee4086

             // custom glance api parser
             parse: function (resp, xhr) {
                 if (_.isArray(resp)) {
                     resp = {'images': {'values': resp }};
+                }
                 return models.GlanceImages.__super__.parse.call(this, resp, xhr);
             },
             _read_image_from_request: function(image, msg, xhr) {
                 var img = {};
                 img['metadata'] = {values:{}};
                 img['metadata'] = {};
                 var headers = snf.util.parseHeaders(xhr.getAllResponseHeaders().toLowerCase());
-...
                     if (key.indexOf("x-image-meta-property") == -1) {
                         img[key.replace("x-image-meta-","").replace(/-/g,"_")] = _.trim(value);
                     } else {
                         img.metadata.values[key.replace('x-image-meta-property-',"").replace(/-/g,"_")] = _.trim(value);
                         img.metadata[key.replace('x-image-meta-property-',"").replace(/-/g,"_")] = _.trim(value);
+                    }
                 })
-...
             parse_meta: function(img) {
                 if (img.properties) {
                     img.metadata = {};
                     img.metadata.values = img.properties;
                     img.metadata = img.properties;
                 } else {
                     if (!img.metadata) {
                         img.metadata = {values:{}};
                         img.metadata = {};
+                    }
+                }
                 // fixes plankton regression (returns lowercase meta keys)
                 if (img.metadata.values.os && !img.metadata.values.OS) {
                     img.metadata.values.OS = img.metadata.values.os;
                 if (img.metadata.os && !img.metadata.OS) {
                     img.metadata.OS = img.metadata.os;
+                }
                 img = models.GlanceImages.__super__.parse_meta.call(this, img);

             path: 'images',
             get_size: function() {
                 return parseInt(this.get('metadata') ? this.get('metadata').values.size : -1)
                 return parseInt(this.get('metadata') ? this.get('metadata').size : -1)
             },
             get_description: function(escape) {
-...
             },
             get_meta: function(key) {
                 if (this.get('metadata') && this.get('metadata').values) {
                     if (!this.get('metadata').values[key]) { return null }
                     return _.escape(this.get('metadata').values[key]);
                 if (this.get('metadata') && this.get('metadata')) {
                     if (!this.get('metadata')[key]) { return null }
                     return _.escape(this.get('metadata')[key]);
                 } else {
                     return null;
+                }
             },
             get_meta_keys: function() {
                 if (this.get('metadata') && this.get('metadata').values) {
                     return _.keys(this.get('metadata').values);
                 if (this.get('metadata') && this.get('metadata')) {
                     return _.keys(this.get('metadata'));
                 } else {
                     return [];
+                }
-...
             },
             get_sort_order: function() {
                 return parseInt(this.get('metadata') ? this.get('metadata').values.sortorder : -1)
                 return parseInt(this.get('metadata') ? this.get('metadata').sortorder : -1)
             },
             get_vm: function() {
-...
             // get image object
             get_image: function(callback) {
                 if (callback == undefined) { callback = function(){} }
                 var image = storage.images.get(this.get('imageRef'));
                 var image = storage.images.get(this.get('image'));
                 if (!image) {
                     storage.images.update_unknown_id(this.get('imageRef'), callback);
                     storage.images.update_unknown_id(this.get('image'), callback);
                     return;
+                }
                 callback(image);
-...
             // get flavor object
             get_flavor: function() {
                 var flv = storage.flavors.get(this.get('flavorRef'));
                 var flv = storage.flavors.get(this.get('flavor'));
                 if (!flv) {
                     storage.flavors.update_unknown_id(this.get('flavorRef'));
                     flv = storage.flavors.get(this.get('flavorRef'));
                     storage.flavors.update_unknown_id(this.get('flavor'));
                     flv = storage.flavors.get(this.get('flavor'));
+                }
                 return flv;
             },
             get_meta: function(key, deflt) {
                 if (this.get('metadata') && this.get('metadata').values) {
                     if (!this.get('metadata').values[key]) { return deflt }
                     return _.escape(this.get('metadata').values[key]);
                 if (this.get('metadata') && this.get('metadata')) {
                     if (!this.get('metadata')[key]) { return deflt }
                     return _.escape(this.get('metadata')[key]);
                 } else {
                     return deflt;
+                }
             },
             get_meta_keys: function() {
                 if (this.get('metadata') && this.get('metadata').values) {
                     return _.keys(this.get('metadata').values);
                 if (this.get('metadata') && this.get('metadata')) {
                     return _.keys(this.get('metadata'));
                 } else {
                     return [];
+                }
-...
             defaults: {'nics':[],'linked_to':[]},
             parse: function (resp, xhr) {
               console.log(resp);
                 // FIXME: depricated global var
                 if (!resp) { return []};
                 var data = _.filter(_.map(resp.networks.values, _.bind(this.parse_net_api_data, this)),
                 var data = _.filter(_.map(resp.networks, _.bind(this.parse_net_api_data, this)),
                                    function(e){ return e });
                 return data;
             },
-...
                 // e.g. {'vm_id':12231, 'index':1}
                 // net.get('linked_to') contains a list of vms the network is
                 // connected to e.g. [1001, 1002]
                 if (data.attachments && data.attachments.values) {
                 if (data.attachments && data.attachments) {
                     data['nics'] = {};
                     data['linked_to'] = [];
                     _.each(data.attachments.values, function(nic_id){
                     _.each(data.attachments, function(nic_id){
                       var vm_id = NIC_REGEX.exec(nic_id)[1];
                       var nic_index = parseInt(NIC_REGEX.exec(nic_id)[2]);
-...
             },
             parse: function (resp, xhr) {
                 var parsed = _.map(resp.images.values, _.bind(this.parse_meta, this));
                 var parsed = _.map(resp.images, _.bind(this.parse_meta, this));
                 parsed = this.fill_owners(parsed);
                 return parsed;
             },
-...
             },
             get_meta_key: function(img, key) {
                 if (img.metadata && img.metadata.values && img.metadata.values[key]) {
                     return _.escape(img.metadata.values[key]);
                 if (img.metadata && img.metadata && img.metadata[key]) {
                     return _.escape(img.metadata[key]);
+                }
                 return undefined;
             },
-...
             },
             parse: function (resp, xhr) {
                 return _.map(resp.flavors.values, function(o) { o.disk_template = o['SNF:disk_template']; return o});
                 return _.map(resp.flavors, function(o) { o.disk_template = o['SNF:disk_template']; return o});
             },
             comparator: function(flv) {
-...
             parse: function (resp, xhr) {
                 var data = resp;
                 if (!resp) { return [] };
                 data = _.filter(_.map(resp.servers.values, _.bind(this.parse_vm_api_data, this)), function(v){return v});
                 data = _.filter(_.map(resp.servers, _.bind(this.parse_vm_api_data, this)), function(v){return v});
                 return data;
             },
-...
                 // OS attribute
                 if (this.has_meta(data)) {
                     data['OS'] = data.metadata.values.OS || snf.config.unknown_os;
                     data['OS'] = data.metadata.OS || snf.config.unknown_os;
+                }
                 if (!data.diagnostics) {
-...
                 data['nics'] = {};
                 data['linked_to'] = [];
                 if (data['attachments'] && data['attachments'].values) {
                     var nics = data['attachments'].values;
                 if (data['attachments'] && data['attachments']) {
                     var nics = data['attachments'];
                     _.each(nics, function(nic) {
                         var net_id = nic.network_id;
                         var index = parseInt(NIC_REGEX.exec(nic.id)[2]);
-...
                 // is in json response, reset it to force
                 // value update
                 if (!data['metadata']) {
                     data['metadata'] = {values:{}};
                     data['metadata'] = {};
+                }
                 return data;
-...
             },
             has_meta: function(vm_data) {
                 return vm_data.metadata && vm_data.metadata.values
                 return vm_data.metadata && vm_data.metadata
             },
             has_addresses: function(vm_data) {
                 return vm_data.metadata && vm_data.metadata.values
                 return vm_data.metadata && vm_data.metadata
             },
             create: function (name, image, flavor, meta, extra, callback) {
-...
+                    }
+                }
                 opts = {name: name, imageRef: image.id, flavorRef: flavor.id,
                 opts = {name: name, image: image.id, flavor: flavor.id,
                         metadata:meta}
                 opts = _.extend(opts, extra);
-...
               // fill missing_ids
               this.each(function(el) {
                 var imgid = el.get("imageRef");
                 var imgid = el.get("image");
                 var existing = synnefo.storage.images.get(imgid);
                 if (!existing && missing_ids.indexOf(imgid) == -1) {
                   missing_ids.push(imgid);

                 }, this);
                 if (synnefo.storage.images.display_extra_metadata) {
                     _.each(image.get('metadata').values, function(value, key) {
                     _.each(image.get('metadata'), function(value, key) {
                         if (!_.contains(meta_keys, key) &&
                             !_.contains(meta_keys, key.toLowerCase()) &&
                             !_.contains(meta_keys, key.toUpperCase()) &&

             update_layout: function() {
                 // api metadata object
                 var meta =  this.vm.get('metadata').values;
                 var meta =  this.vm.get('metadata');
                 var i = 0;
                 var cont = $(this.el).find(".items");

             },
             get_meta: function() {
                 return this.current_vm.get('metadata').values;
                 return this.current_vm.get('metadata');
             },
             get_meta_el: function(key, value) {

Also available in: Unified diff