825977 - don't hard-code hardware vendor and model

Status: RESOLVED FIXED

(Testing Graveyard :: Mozpool, defect)

Description

[Dustin J. Mitchell [:dustin] (he/him)]

The vendor and model are available in inventory, so we don't need to hard-code defaults.

Comment 1

[Dustin J. Mitchell [:dustin] (he/him)]

Attachment: bug825977.patch

Comment 2

[Mark Côté [:mcote]]

Comment on attachment 697128 [details] [diff] [review]
bug825977.patch

Review of attachment 697128 [details] [diff] [review]:
-----------------------------------------------------------------

Looks good, just a couple changes to continue our march toward consistent styling. :)

::: runtests.py
@@ +76,4 @@
>          add_device("device1", server="server1", relayinfo="relay-1:bank1:relay1")
>  
>      def testInsertHardwareType(self):
> +        add_hardware_type("samsung", "galaxy_s2")

Ah yes, this makes more sense.

@@ +184,5 @@
> +        conn = sql.get_conn()
> +        data.update_device(1, dict(fqdn='device1.fqdn', imaging_server='server9', mac_address='aabbccddeeff',
> +            hardware_type='samsung', hardware_model='galaxy'))
> +        res = conn.execute(model.devices.select())
> +        self.assertEquals([ dict(r) for r in res.fetchall() ], [

No space after [ nor before ].

@@ +639,4 @@
>          if want_relay_info:
>              relay_info = 'relay%d' % ((hash(fqdn) / 1000) % 10)
>              kv.append(dict(key='system.relay.0', value=relay_info))
> +        server_model = { 'model' : server_model_model, 'vendor' : server_model_vendor }

No space after {, before :, nor before }.

Comment 3

[Dustin J. Mitchell [:dustin] (he/him)]

Oops, I merged this instead of bug 825922.  I'll fix the syntax in a followup commit.