Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2266)

Unified Diff: appengine/swarming/elements/res/imp/botlist/bot-list-shared.html

Issue 2269643002: Extract shared filters and aliasing code (Closed) Base URL: https://chromium.googlesource.com/external/github.com/luci/luci-py@master
Patch Set: Documentation Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: appengine/swarming/elements/res/imp/botlist/bot-list-shared.html
diff --git a/appengine/swarming/elements/res/imp/botlist/bot-list-shared.html b/appengine/swarming/elements/res/imp/botlist/bot-list-shared.html
index 5a4bb89cc0a718e30ecb8f4b82f470f0850f5097..fecd6c5b2632580150edb377686b1966a52c4e37 100644
--- a/appengine/swarming/elements/res/imp/botlist/bot-list-shared.html
+++ b/appengine/swarming/elements/res/imp/botlist/bot-list-shared.html
@@ -13,20 +13,6 @@
<link rel="import" href="/res/imp/common/swarming-app.html">
<script>
(function(){
- var ANDROID_ALIASES = {
- "bullhead": "Nexus 5X",
- "flo": "Nexus 7 (2013)",
- "flounder": "Nexus 9",
- "foster": "NVIDIA Shield",
- "fugu": "Nexus Player",
- "grouper": "Nexus 7 (2012)",
- "hammerhead": "Nexus 5",
- "m0": "Galaxy S3",
- "mako": "Nexus 4",
- "manta": "Nexus 10",
- "shamu": "Nexus 6",
- "sprout": "Android One",
- };
// Taken from http://developer.android.com/reference/android/os/BatteryManager.html
var BATTERY_HEALTH_UNKNOWN = 1;
var BATTERY_HEALTH_GOOD = 2;
@@ -36,48 +22,11 @@
var AVAILABLE = "available";
var UNKNOWN = "unknown";
- var GPU_ALIASES = {
- "1002": "AMD",
- "1002:6779": "AMD Radeon HD 6450/7450/8450",
- "1002:6821": "AMD Radeon HD 8870M",
- "1002:683d": "AMD Radeon HD 7770/8760",
- "1002:9830": "AMD Radeon HD 8400",
- "102b": "Matrox",
- "102b:0522": "Matrox MGA G200e",
- "102b:0532": "Matrox MGA G200eW",
- "102b:0534": "Matrox G200eR2",
- "10de": "NVIDIA",
- "10de:08a4": "NVIDIA GeForce 320M",
- "10de:08aa": "NVIDIA GeForce 320M",
- "10de:0fe9": "NVIDIA GeForce GT 750M Mac Edition",
- "10de:104a": "NVIDIA GeForce GT 610",
- "10de:11c0": "NVIDIA GeForce GTX 660",
- "10de:1244": "NVIDIA GeForce GTX 550 Ti",
- "10de:1401": "NVIDIA GeForce GTX 960",
- "8086": "Intel",
- "8086:0412": "Intel Haswell Integrated",
- "8086:041a": "Intel Xeon Integrated",
- "8086:0a2e": "Intel Haswell Integrated",
- "8086:0d26": "Intel Crystal Well Integrated",
- "8086:22b1": "Intel Braswell Integrated",
- }
-
- // For consistency, all aliases are displayed like:
- // Nexus 5X (bullhead)
- // This regex matches a string like "ALIAS (ORIG)", with ORIG as group 1.
- var ALIAS_REGEXP = /.+ \((.*)\)/;
-
// This behavior wraps up all the shared bot-list functionality by
// extending SwarmingBehaviors.SwarmingBehavior
SwarmingBehaviors.BotListBehavior = [SwarmingBehaviors.SwarmingBehavior, {
properties: {
- DIMENSIONS_WITH_ALIASES: {
- type: Array,
- value: function(){
- return ["device_type", "gpu"];
- },
- },
BOT_PROPERTIES: {
type: Array,
value: function() {
@@ -88,15 +37,6 @@
},
},
- _androidAlias: function(dt) {
- return ANDROID_ALIASES[dt] || UNKNOWN;
- },
-
- // _applyAlias is the consistent way to modify a string to show its alias.
- _applyAlias: function(orig, alias) {
- return alias +" ("+orig+")";
- },
-
// _attribute looks first in dimension and then in state for the
// specified attribute. This will always return an array. If there is
// no matching attribute, ["unknown"] will be returned.
@@ -140,10 +80,6 @@
return undefined;
},
- _gpuAlias: function(gpu) {
- return GPU_ALIASES[gpu] || UNKNOWN;
- },
-
// _state returns the requested attribute from a bot's state.
// For consistency with _dimension, if the attribute is not an array,
// it is put as the only element in an array.
@@ -165,15 +101,6 @@
return "idle";
},
- // _unalias will return the base dimension/state with its alias removed
- // if it had one. This is handy for sorting and filtering.
- _unalias: function(str) {
- var match = ALIAS_REGEXP.exec(str);
- if (match) {
- return match[1];
- }
- return str;
- },
}];
})()
</script>

Powered by Google App Engine
This is Rietveld 408576698