diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-12 17:05:04 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-12 17:05:04 -0400 |
| commit | bf1728902bd3e81e00aa9786a5b1c67e4f30a659 (patch) | |
| tree | 857c914003fda2ec5223425a31b646cbafd9907b /tests/unittests/test_datasource/test_openstack.py | |
| parent | e28ba310872846e0bc60595aed353c17b760fdcb (diff) | |
| parent | bc2c3267549b9067c017a34e22bbee18890aec06 (diff) | |
| download | vyos-cloud-init-bf1728902bd3e81e00aa9786a5b1c67e4f30a659.tar.gz vyos-cloud-init-bf1728902bd3e81e00aa9786a5b1c67e4f30a659.zip | |
Merge branch 'master' into ubuntu/devel
Diffstat (limited to 'tests/unittests/test_datasource/test_openstack.py')
| -rw-r--r-- | tests/unittests/test_datasource/test_openstack.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/unittests/test_datasource/test_openstack.py b/tests/unittests/test_datasource/test_openstack.py index 5c8592c5..97b99a18 100644 --- a/tests/unittests/test_datasource/test_openstack.py +++ b/tests/unittests/test_datasource/test_openstack.py @@ -27,6 +27,7 @@ from six import StringIO from cloudinit import helpers from cloudinit import settings +from cloudinit.sources import convert_vendordata from cloudinit.sources import DataSourceOpenStack as ds from cloudinit.sources.helpers import openstack from cloudinit import util @@ -318,7 +319,7 @@ class TestOpenStackDataSource(test_helpers.HttprettyTestCase): class TestVendorDataLoading(test_helpers.TestCase): def cvj(self, data): - return openstack.convert_vendordata_json(data) + return convert_vendordata(data) def test_vd_load_none(self): # non-existant vendor-data should return none |