Merge lp:~kiril-vladimiroff/cloud-init/cloudsigma-vendordata into lp:~cloud-init-dev/cloud-init/trunk

[Kiril Vladimiroff]

Handle vendor data properly in the CloudSigma Datasource

Fixes Bug #1303986

[Scott Moser (smoser)]

My only comment is 'vendor_data' versus 'vendor-data'.
The other key here is 'cloudinit-user-data' (using '-' rather than '_').

inconsistency seems non-ideal unless theres something i'm missing.

[Kiril Vladimiroff (kiril-vladimiroff)]

Well, all of our keys in the server context are using the `snake_case` convention. Basically the `cloudinit-user-data` was the only exception, based on the fact that it's in the meta fields and these fields are managed entirely by our users (so we can't force conventions there). The vendor_data field is not in the meta, users don't have control over it and I prefer to follow our `snake_case` convention there.

Best case scenario for me would be to change `cloudinit-user-data` to `cloudinit_user_data`, though.

[Joshua Harlow (harlowja)]

Seems all fixed up to me :)

[Kiril Vladimiroff (kiril-vladimiroff)]

> Seems all fixed up to me :)

Great. Then I guess we can move on to merging this :)

[Scott Moser (smoser)]

Hi,
A *long* wait on replying to this, sorry.
Is this still useful ? I surely should have pulled it two years ago, and I can pull it now if it is useful.

[Scott Moser (smoser)]

Oh, and the other thing is that the convention has kind of changed for reading vendor data, you can use
 self.vendordata_raw = sources.convert_vendordata(server_context["vendor_data"])

and it should do the right thing now.

[Scott Moser (smoser)]

Hello,
Thank you for taking the time to contribute to cloud-init. Cloud-init has moved its revision control system to git. As a result, we are marking all bzr merge proposals as 'rejected'. If you would like to re-submit this proposal for review, please do so by following the current HACKING documentation at http://cloudinit.readthedocs.io/en/latest/topics/hacking.html .

Kiril,
Thanks for this and other contributions to cloud-init. Please do resubmit.

Unmerged revisions

972. By Kiril Vladimiroff on 2014-04-08

Add support for vendor-data in the CloudSigma Datasource

=== modified file 'cloudinit/sources/DataSourceCloudSigma.py'
--- cloudinit/sources/DataSourceCloudSigma.py	2014-03-04 17:11:10 +0000
+++ cloudinit/sources/DataSourceCloudSigma.py	2014-04-08 13:49:14 +0000
@@ -66,6 +66,8 @@
         self.userdata_raw = server_meta.get('cloudinit-user-data', "")
         if 'cloudinit-user-data' in base64_fields:
             self.userdata_raw = b64decode(self.userdata_raw)
+        if 'cloudinit' in server_context.get('vendor_data', {}):
+            self.vendordata_raw = server_context["vendor_data"]["cloudinit"]
 
         self.metadata = server_context
         self.ssh_public_key = server_meta['ssh_public_key']

=== modified file 'tests/unittests/test_datasource/test_cloudsigma.py'
--- tests/unittests/test_datasource/test_cloudsigma.py	2014-02-19 08:45:53 +0000
+++ tests/unittests/test_datasource/test_cloudsigma.py	2014-04-08 13:49:14 +0000
@@ -20,7 +20,11 @@
     "smp": 1,
     "tags": ["much server", "very performance"],
     "uuid": "65b2fb23-8c03-4187-a3ba-8b7c919e8890",
-    "vnc_password": "9e84d6cb49e46379"
+    "vnc_password": "9e84d6cb49e46379",
+    "vendor_data": {
+        "location": "zrh",
+        "cloudinit": "#cloud-config\n\n...",
+    }
 }
 
 
@@ -68,3 +72,25 @@
         self.datasource.get_data()
 
         self.assertEqual(self.datasource.userdata_raw, b'hi world\n')
+
+    def test_vendor_data(self):
+        self.assertEqual(self.datasource.vendordata_raw,
+                         SERVER_CONTEXT['vendor_data']['cloudinit'])
+
+    def test_lack_of_vendor_data(self):
+        stripped_context = copy.deepcopy(SERVER_CONTEXT)
+        del stripped_context["vendor_data"]
+        self.datasource = DataSourceCloudSigma.DataSourceCloudSigma("", "", "")
+        self.datasource.cepko = CepkoMock(stripped_context)
+        self.datasource.get_data()
+
+        self.assertIsNone(self.datasource.vendordata_raw)
+
+    def test_lack_of_cloudinit_key_in_vendor_data(self):
+        stripped_context = copy.deepcopy(SERVER_CONTEXT)
+        del stripped_context["vendor_data"]["cloudinit"]
+        self.datasource = DataSourceCloudSigma.DataSourceCloudSigma("", "", "")
+        self.datasource.cepko = CepkoMock(stripped_context)
+        self.datasource.get_data()
+
+        self.assertIsNone(self.datasource.vendordata_raw)