diff options
| author | Daniel Watkins <oddbloke@ubuntu.com> | 2020-01-16 13:30:12 -0500 |
|---|---|---|
| committer | Ryan Harper <ryan.harper@canonical.com> | 2020-01-16 12:30:12 -0600 |
| commit | 651e24066ba4b9464c7843553f60d17a459cf06e (patch) | |
| tree | b4bae771e62bf725b7d568efb9741f2be88a915c /tests/cloud_tests | |
| parent | 259d9c501472315e539701f00095743390eb89e5 (diff) | |
| download | vyos-cloud-init-651e24066ba4b9464c7843553f60d17a459cf06e.tar.gz vyos-cloud-init-651e24066ba4b9464c7843553f60d17a459cf06e.zip | |
util: rename get_architecture to get_dpkg_architecture (#173)
This makes it clearer that we should only use this in code paths that
will definitely have dpkg available to them.
- Rename get_architecture -> get_dpkg_architecture
- Add docstring to get_dpkg_architecture
Diffstat (limited to 'tests/cloud_tests')
| -rw-r--r-- | tests/cloud_tests/config.py | 2 | ||||
| -rw-r--r-- | tests/cloud_tests/platforms/nocloudkvm/platform.py | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tests/cloud_tests/config.py b/tests/cloud_tests/config.py index 8bd569fd..06536edc 100644 --- a/tests/cloud_tests/config.py +++ b/tests/cloud_tests/config.py @@ -114,7 +114,7 @@ def load_os_config(platform_name, os_name, require_enabled=False, feature_conf = main_conf['features'] feature_groups = conf.get('feature_groups', []) overrides = merge_config(get(conf, 'features'), feature_overrides) - conf['arch'] = c_util.get_architecture() + conf['arch'] = c_util.get_dpkg_architecture() conf['features'] = merge_feature_groups( feature_conf, feature_groups, overrides) diff --git a/tests/cloud_tests/platforms/nocloudkvm/platform.py b/tests/cloud_tests/platforms/nocloudkvm/platform.py index 85933463..2d1480f5 100644 --- a/tests/cloud_tests/platforms/nocloudkvm/platform.py +++ b/tests/cloud_tests/platforms/nocloudkvm/platform.py @@ -29,9 +29,13 @@ class NoCloudKVMPlatform(Platform): """ (url, path) = s_util.path_from_mirror_url(img_conf['mirror_url'], None) - filter = filters.get_filters(['arch=%s' % c_util.get_architecture(), - 'release=%s' % img_conf['release'], - 'ftype=disk1.img']) + filter = filters.get_filters( + [ + 'arch=%s' % c_util.get_dpkg_architecture(), + 'release=%s' % img_conf['release'], + 'ftype=disk1.img', + ] + ) mirror_config = {'filters': filter, 'keep_items': False, 'max_items': 1, |