School server registration works differently on XO

[sascha_silbe]

The school server URL is hardcoded if running on an XO, but derived from the jabber server setting on other hardware. From src/jarabe/desktop/schoolserver.py:

REGISTER_URL = 'http://schoolserver:8080/'

[...]

def register_laptop(url=REGISTER_URL):

    profile = get_profile()
    client = gconf.client_get_default()

    if have_ofw_tree():
        sn = read_ofw('mfg-data/SN')
        uuid_ = read_ofw('mfg-data/U#')
        sn = sn or 'SHF00000000'
        uuid_ = uuid_ or '00000000-0000-0000-0000-000000000000'
    else:
        sn = generate_serial_number()
        uuid_ = str(uuid.uuid1())
        setting_name = '/desktop/sugar/collaboration/jabber_server'
        jabber_server = client.get_string(setting_name)
        store_identifiers(sn, uuid_, jabber_server)
        url = 'http://' + jabber_server + ':8080/'

We shouldn't make assumptions on the use case based on the hardware.

[bernie]

I think we should use the ' http://' + jabber_server + ':8080/' method in both cases, and make jabber_server default to 'schoolserver' when empty or unset.

[timClicks]

untested fix

[tomeu]

Removing from the queue until feedback in the mailing list is addressed.

[FGrose]

Mailing list reference link:  http://lists.sugarlabs.org/archive/sugar-devel/2010-July/025265.html

[tomeu]

Pushed as  http://git.sugarlabs.org/projects/sugar/repos/mainline/commits/c2bb047

[martin.langhoff]

Thanks for looking into this! I disagree with the fix, however.

The patch is bogus -- there was bogus logic in the non-XO codepath, and this patch promotes the bogosity to all the cases.

Here is how I believe this comes to happen: when we are on a non-XO, we want to generate synthetic SN/UUID pars, and to store them permanently, so we always use the same SN/UUID in the future, even if the registration fails. There is _no_ reason to try save a jabber server, other than perhaps making store_identifiers() happy.

The old code has several problems

• On non-XO, it always creates an SN/UUID pair
• On non-XO, it saves a bogus jabber server before even trying to register

I am attaching an untested, draft patch trying to explain what I mean. I am a bit confused by SN/UUID being kept in something other than gconf. Should we consolidate these values into gconf?

[sascha_silbe]

Replying to martin.langhoff:

I am attaching an untested, draft patch trying to explain what I mean. I am a bit confused by SN/UUID being kept in something other than gconf. Should we consolidate these values into gconf?

Saving in gconf sounds good to me. Can you change your patch accordingly and post it to sugar-devel (see  Code Review), please?