diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-01-15 10:23:47 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-01-15 10:23:47 -0500 |
| commit | a61ec07ed02d725a004ec17b4ae5257c89d67987 (patch) | |
| tree | 8008a8901b3d01d0a822358cae4a0dabae39cfda /tests/unittests/test_datasource | |
| parent | 62e9e73e3ed8467fc4d4d95f76ed0443c50f176c (diff) | |
| parent | bd0c29c2f298ad060bba88ddbb4d2d11ab07cafe (diff) | |
| download | vyos-cloud-init-a61ec07ed02d725a004ec17b4ae5257c89d67987.tar.gz vyos-cloud-init-a61ec07ed02d725a004ec17b4ae5257c89d67987.zip | |
Use the GCE short hostname.
Google Compute Engine fqdn hostnames are usually longer than 64 characters.
This causes issues with many tools (often Java based).
Note that per gethostname(2):
POSIX.1-2001 guarantees that "Host names (not including the terminating null
byte) are limed to HOST_NAME_MAX bytes". On Linux, HOST_NAME_MAX is defined
with the value 64.
LP: #1383794
Diffstat (limited to 'tests/unittests/test_datasource')
| -rw-r--r-- | tests/unittests/test_datasource/test_gce.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/unittests/test_datasource/test_gce.py b/tests/unittests/test_datasource/test_gce.py index 89251b0e..06050bb1 100644 --- a/tests/unittests/test_datasource/test_gce.py +++ b/tests/unittests/test_datasource/test_gce.py @@ -99,7 +99,8 @@ class TestDataSourceGCE(test_helpers.HttprettyTestCase): body=_new_request_callback()) self.ds.get_data() - self.assertEqual(GCE_META.get('instance/hostname'), + shostname = GCE_META.get('instance/hostname').split('.')[0] + self.assertEqual(shostname, self.ds.get_hostname()) self.assertEqual(GCE_META.get('instance/id'), @@ -126,8 +127,8 @@ class TestDataSourceGCE(test_helpers.HttprettyTestCase): self.assertEqual(GCE_META_PARTIAL.get('instance/id'), self.ds.get_instance_id()) - self.assertEqual(GCE_META_PARTIAL.get('instance/hostname'), - self.ds.get_hostname()) + shostname = GCE_META_PARTIAL.get('instance/hostname').split('.')[0] + self.assertEqual(shostname, self.ds.get_hostname()) @httpretty.activate def test_metadata_encoding(self): |