Merge lp:~mvo/ubuntu-system-image/server-azure-device into lp:ubuntu-system-image/server

[Michael Vogt]

This makes cdimage-device-raw more generic by supporting a device_name
so that we can support a different device tarfile for azure

[lp:~mvo/ubuntu-system-image/server-azure-device]

254. By Michael Vogt on 2014-11-18

device_name is azure_amd64

255. By Michael Vogt on 2014-11-18

fix rootfs lookup

256. By Michael Vogt on 2014-11-18

pep8 fix

257. By Michael Vogt on 2014-11-18

fix test coverage

=== modified file 'lib/systemimage/generators.py'
--- lib/systemimage/generators.py	2014-11-14 10:16:22 +0000
+++ lib/systemimage/generators.py	2014-11-18 23:15:56 +0000
@@ -368,7 +368,7 @@
     arch = "armhf"
     if environment['device_name'] in ("generic_x86", "generic_i386"):
         arch = "i386"
-    elif environment['device_name'] in ("generic_amd64",):
+    elif environment['device_name'] in ("generic_amd64", "azure_amd64"):
         arch = "amd64"
 
     # Check that the directory exists
@@ -703,6 +703,8 @@
         arch = "i386"
     elif environment['device_name'] in ("generic_amd64",):
         arch = "amd64"
+    elif environment['device_name'] == "azure_amd64":
+        arch = "amd64.azure"
 
     # Check that the directory exists
     if not os.path.exists(cdimage_path):
@@ -715,10 +717,11 @@
             continue
 
         # Check for the custom tarball
-        raw_device_path = os.path.join(cdimage_path, version,
-                                       "%s-preinstalled-%s-%s.device.tar.gz" %
-                                       (series, options.get("product", "core"),
-                                        arch))
+        raw_device_path = os.path.join(
+            cdimage_path, version,
+            "%s-preinstalled-%s-%s.device.tar.gz" %
+            (series, options.get("product", "core"),
+             arch))
         if not os.path.exists(raw_device_path):
             continue
 
@@ -783,6 +786,7 @@
         metadata['series'] = series
         metadata['raw_device_path'] = raw_device_path
         metadata['raw_device_checksum'] = raw_device_hash
+        metadata['device'] = environment.get('device_name', 'none')
 
         with open(path.replace(".tar.xz", ".json"), "w+") as fd:
             fd.write("%s\n" % json.dumps(metadata, sort_keys=True,
 
=== modified file 'tests/test_generators.py'
--- tests/test_generators.py	2014-11-14 14:59:34 +0000
+++ tests/test_generators.py	2014-11-18 23:15:56 +0000
@@ -363,7 +363,8 @@
         for device_arch, cdimage_arch in (
                 ("generic_x86", "i386"),
                 ("generic_i386", "i386"),
-                ("generic_amd64", "amd64")):
+                ("generic_amd64", "amd64"),
+                ("azure_amd64", "amd64.azure")):
             environment['device_name'] = device_arch
 
             for filename in (