Handle the change of device-type storage - lava-docker - Unnamed repository

Linux Foundation Collaborative Projects

summary refs log tree commit diff stats

diff options

author	Corentin LABBE <clabbe@baylibre.com>	2020-06-01 13:47:53 +0200
committer	Corentin LABBE <clabbe@baylibre.com>	2020-06-01 13:47:53 +0200
commit	9918419127bbace972725ced88984ad2129ae5cb (patch)
tree	d566dac6b4ba30d0d66f0e4cd7ab3a5973812253
parent	e3f6e56904164003d00833b26a3d6486afcd55e1 (diff)

Handle the change of device-type storage

device-types are now in /usr/share/lava-server/device-types/ and so device-type-patch does not work anymore. This patch support both location

-rw-r--r--

lava-master/Dockerfile

3

-rw-r--r--

lava-master/device-types-patch/patch-device-type.sh

14

2 files changed, 15 insertions, 2 deletions

75'>175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197

    var afb = new AFB("api", "mysecret");
    var ws;
    var sndcard="HALNotSelected";
    var evtidx=0;
    var numid=0;

    function syntaxHighlight(json) {
        if (typeof json !== 'string') {
             json = JSON.stringify(json, undefined, 2);
        }
        json = json.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
        return json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g, function (match) {
            var cls = 'number';
            if (/^"/.test(match)) {
                if (/:$/.test(match)) {
                    cls = 'key';
                } else {
                    cls = 'string';
                }
            } else if (/true|false/.test(match)) {
                cls = 'boolean';
            } else if (/null/.test(match)) {
                cls = 'null';
            }
            return '<span class="' + cls + '">' + match + '</span>';
        });
    }

    function getParameterByName(name, url) {
        if (!url) {
          url = window.location.href;
        }
        name = name.replace(/[\[\]]/g, "\\$&");
        var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
            results = regex.exec(url);
        if (!results) return null;
        if (!results[2]) return '';
        return decodeURIComponent(results[2].replace(/\+/g, " "));
    }

    // default soundcard is "PCH"
    var devid=getParameterByName("devid");
    if (!devid) devid="hw:1";

    var haldev=getParameterByName("haldev");
    if (!haldev) haldev="scarlett-usb";

    var sndname=getParameterByName("sndname");
    if (!sndname) sndname="PCH";

    var mode=getParameterByName("mode");
    if (!mode) mode="0";




    function replyok(obj) {
            console.log("replyok:" + JSON.stringify(obj));
            document.getElementById("output").innerHTML = "OK: "+ syntaxHighlight(obj);
    }

    function replyerr(obj) {
            console.log("replyerr:" + JSON.stringify(obj));
            document.getElementById("output").innerHTML = "ERROR: "+ syntaxHighlight(obj);
    }

    function gotevent(obj) {
            console.log("gotevent:" + JSON.stringify(obj));
            document.getElementById("outevt").innerHTML = (evtidx++) +": "+JSON.stringify(obj);
    }

    function send(message) {
            var api = document.getElementById("api").value;
            var verb = document.getElementById("verb").value;
            document.getElementById("question").innerHTML = "subscribe: "+api+"/"+verb + " (" + JSON.stringify(message) +")";
            ws.call(api+"/"+verb, {data:message}).then(replyok, replyerr);
    }


     // On button click from HTML page
    function callbinder(api, verb, query) {
            console.log ("subscribe api="+api+" verb="+verb+" query=" +query);
            var question = urlws +"/" +api +"/" +verb + "?query=" + JSON.stringify(query);
            document.getElementById("question").innerHTML = syntaxHighlight(question);
            ws.call(api+"/"+verb, query).then(replyok, replyerr);
    }


    // Retreive Select value and Text from the binder
    // Note: selection of value/text for a given context is huggly!!!
    function querySelectList (elemid, api, verb, query) {

        console.log("querySelectList elemid=%s api=%s verb=%s query=%s", elemid, api, verb, query);

        var selectobj = document.getElementById(elemid);
        if (!selectobj) {
            return;
        }

        // onlick update selected HAL api
        selectobj.onclick=function(){
           sndcard= this.value;
           console.log ("Default Selection=" + sndcard);
        };

        function gotit (result) {

            // display response as for normal onclick action
            replyok(result);
            var response=result.response;

            // fulfill select with avaliable active HAL
            for (idx=0; idx<response.length; idx++) {
                var opt = document.createElement('option');

                // Alsa LowLevel selection mode
                if (response[idx].name)  opt.text   = response[idx].name;
                if (response[idx].devid) opt.value  = response[idx].devid;

                // HAL selection mode
                if (response[idx].shortname) opt.text  = response[idx].shortname;
                if (response[idx].api) opt.value = response[idx].api;

                selectobj.appendChild(opt);
            }

           sndcard= selectobj.value;
        }

        var question = urlws +"/"+api +"/" +verb + "?query=" + JSON.stringify(query);
        document.getElementById("question").innerHTML = syntaxHighlight(question);

        // request lowlevel ALSA to get API list
        ws.call(api+"/"+verb, query).then(gotit, replyerr);
    }

    function refresh_list (self, api, verb, query) {
        console.log("refresh_list id=%s api=%s verb=%s query=%s", self.id, api, verb, query);

        if (self.value > 0) return;

        // onlick update selected HAL api
        self.onclick=function(){
           numid = parseInt(self.value);
           console.log ("Default numid=%d", numid);
        };

        function gotit (result) {

            // display response as for normal onclick action
            replyok(result);
            var response=result.response;



            // fulfill select with avaliable active HAL
            for (idx=0; idx<response.length; idx++) {
                var opt = document.createElement('option');

                // Alsa LowLevel selection mode
                opt.text   = response[idx].name + ' id=' + response[idx].id;
                opt.value  = response[idx].id;

                self.appendChild(opt);
            }
            self.selectedIndex=2;
            numid = parseInt (self.value);
        }

        var question = urlws +"/"+api +"/" +verb + "?query=" + JSON.stringify(query);
        document.getElementById("question").innerHTML = syntaxHighlight(question);

        // request lowlevel ALSA to get API list
        ws.call(api+"/"+verb, query).then(gotit, replyerr);
    }


    function init(elemid, api, verb, query) {

        function onopen() {
                // check for active HALs
                querySelectList (elemid, api, verb, query);

                document.getElementById("main").style.visibility = "visible";
                document.getElementById("connected").innerHTML = "Binder WS Active";
                document.getElementById("connected").style.background  = "lightgreen";
                ws.onevent("*", gotevent);
        }

        function onabort() {
                document.getElementById("main").style.visibility = "hidden";
                document.getElementById("connected").innerHTML = "Connected Closed";
                document.getElementById("connected").style.background  = "red";

        }
        ws = new afb.ws(onopen, onabort);
    }