Merge ~smoser/cloud-init:bug/1698669-ds-identify-fujitsu-ovf into cloud-init:master

[Scott Moser]

OVF: Extend well-known labels to include OVFENV.

Fujitsu Cloud Service attaches a ovf iso transport with a label
'OVFENV'. This seems to be a reasonable value as a label.

While the for bug 1731868 would likely fix cloud-init on fujitsu
cloud, this change will find it faster.

LP: #1698669

see commit message

[Ryan Harper (raharper)]

You've an unrelated change to HACKING.rst

[Ryan Harper (raharper)]

One more question on the unitest. The change looks good though.

[Scott Moser (smoser)]

bah. thoght i had pushed the HACKING change upstream. I have now.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:e5e0df355907350809812569204bc9f2f05daa36
https://jenkins.ubuntu.com/server/job/cloud-init-ci/736/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/736/rebuild

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

review: Approve

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:2f9487708053ab048b544b5b614e83917e3172f5
https://jenkins.ubuntu.com/server/job/cloud-init-ci/741/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/741/rebuild

review: Approve (continuous-integration)

diff --git a/tests/unittests/test_ds_identify.py b/tests/unittests/test_ds_identify.py
index ad6c5cf..31cc622 100644
--- a/tests/unittests/test_ds_identify.py
+++ b/tests/unittests/test_ds_identify.py
@@ -338,7 +338,7 @@ class TestDsIdentify(CiTestCase):
         self._test_ds_found('OVF-vmware-customization')
 
     def test_ovf_on_vmware_iso_found_by_cdrom_with_matching_fs_label(self):
-        """OVF is identified when iso9660 cdrom  label has ovf-transport."""
+        """OVF is identified by well-known iso9660 labels."""
         ovf_cdrom_by_label = copy.deepcopy(VALID_CFG['OVF'])
         # Unset matching cdrom ovf schema content
         ovf_cdrom_by_label['files']['dev/sr0'] = 'No content match'
@@ -346,10 +346,12 @@ class TestDsIdentify(CiTestCase):
             ovf_cdrom_by_label, rc=RC_NOT_FOUND, policy_dmi="disabled")
 
         # Add recognized labels
-        for valid_fs_label in ['ovf-transport', 'OVF-TRANSPORT']:
+        valid_ovf_labels = ['ovf-transport', 'OVF-TRANSPORT',
+                            "OVFENV", "ovfenv"]
+        for valid_ovf_label in valid_ovf_labels:
             ovf_cdrom_by_label['mocks'][0]['out'] = blkid_out([
                 {'DEVNAME': 'sr0', 'TYPE': 'iso9660',
-                 'LABEL': valid_fs_label}])
+                 'LABEL': valid_ovf_label}])
             self._check_via_dict(
                 ovf_cdrom_by_label, rc=RC_FOUND, dslist=['OVF', DS_NONE])
 
diff --git a/tools/ds-identify b/tools/ds-identify
index 374c3ad..cd26824 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -664,7 +664,9 @@ is_cdrom_ovf() {
     esac
 
     # fast path known 'OVF' labels
-    [ "$label" = "OVF-TRANSPORT" -o "$label" = "ovf-transport" ] && return 0
+    case "$label" in
+        OVF-TRANSPORT|ovf-transport|OVFENV|ovfenv) return 0;;
+    esac
 
     # explicitly skip known labels of other types. rd_rdfe is azure.
     case "$label" in