From 9fadb0784540ffd054c07a0edbe9b130d0efc902 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 6 Mar 2012 11:58:19 -0500 Subject: tests/unittests/test_util.py: fix pylint error --- tests/unittests/test_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py index d8da8bc9..ca96bc60 100644 --- a/tests/unittests/test_util.py +++ b/tests/unittests/test_util.py @@ -28,7 +28,7 @@ class TestMergeDict(TestCase): def test_merge_does_not_override(self): """Test that candidate doesn't override source.""" source = {"key1": "value1", "key2": "value2"} - candidate = {"key2": "value2", "key2": "NEW VALUE"} + candidate = {"key1": "value2", "key2": "NEW VALUE"} result = mergedict(source, candidate) self.assertEqual(source, result) -- cgit v1.2.3 From f0a6ec70d13ea771efee86b2544346731cd79991 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 6 Mar 2012 11:58:52 -0500 Subject: Add initial DataSourceMaaS. Tests at this point seem to indicate that seed-dir would work. --- cloudinit/DataSourceMaaS.py | 308 +++++++++++++++++++++++++++ tests/unittests/test_datasource/test_maas.py | 112 ++++++++++ 2 files changed, 420 insertions(+) create mode 100644 cloudinit/DataSourceMaaS.py create mode 100644 tests/unittests/test_datasource/test_maas.py (limited to 'tests') diff --git a/cloudinit/DataSourceMaaS.py b/cloudinit/DataSourceMaaS.py new file mode 100644 index 00000000..2bc1f71f --- /dev/null +++ b/cloudinit/DataSourceMaaS.py @@ -0,0 +1,308 @@ +# vi: ts=4 expandtab +# +# Copyright (C) 2009-2010 Canonical Ltd. +# Copyright (C) 2012 Hewlett-Packard Development Company, L.P. +# +# Author: Scott Moser +# Author: Juerg Hafliger +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3, as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import cloudinit.DataSource as DataSource + +from cloudinit import seeddir as base_seeddir +from cloudinit import log +import cloudinit.util as util +import errno +import oauth.oauth as oauth +import os.path +import socket +import urllib2 +import time + + +class DataSourceMaaS(DataSource.DataSource): + """ + DataSourceMaaS reads instance information from MaaS. + Given a config metadata_url, and oauth tokens, it expects to find + files under the root named: + instance-id + user-data + hostname + """ + seeddir = base_seeddir + '/maas' + baseurl = None + + def __str__(self): + return("DataSourceMaaS[%s]" % self.baseurl) + + def get_data(self): + mcfg = self.ds_cfg + + try: + (userdata, metadata) = read_maas_seed_dir(self.seeddir) + self.userdata_raw = userdata + self.metadata = metadata + self.baseurl = self.seeddir + return True + except MaasSeedDirNone: + pass + except MaasSeedDirMalformed as exc: + log.warn("%s was malformed: %s\n" % (self.seeddir, exc)) + raise + + try: + # if there is no metadata_url, then we're not configured + url = mcfg.get('metadata_url', None) + if url == None: + return False + + if not self.wait_for_metadata_service(url): + return False + + self.baseurl = url + + (userdata, metadata) = read_maas_seed_url(self.baseurl, + self.md_headers) + return True + except Exception: + util.logexc(log) + return False + + def md_headers(self, url): + mcfg = self.ds_cfg + + # if we are missing token_key, token_secret or consumer_key + # then just do non-authed requests + for required in ('token_key', 'token_secret', 'consumer_key'): + if required not in mcfg: + return({}) + + consumer_secret = mcfg.get('consumer_secret', "") + + return(oauth_headers(url=url, consumer_key=mcfg['consumer_key'], + token_key=mcfg['token_key'], token_secret=mcfg['token_secret'], + consumer_secret=consumer_secret)) + + def wait_for_metadata_service(self, url): + mcfg = self.ds_cfg + + max_wait = 120 + try: + max_wait = int(mcfg.get("max_wait", max_wait)) + except Exception: + util.logexc(log) + log.warn("Failed to get max wait. using %s" % max_wait) + + if max_wait == 0: + return False + + timeout = 50 + try: + timeout = int(mcfg.get("timeout", timeout)) + except Exception: + util.logexc(log) + log.warn("Failed to get timeout, using %s" % timeout) + + starttime = time.time() + check_url = "%s/instance-id" % url + url = wait_for_metadata_service(urls=[check_url], max_wait=max_wait, + timeout=timeout, status_cb=log.warn, + headers_cb=self.md_headers) + + if url: + log.debug("Using metadata source: '%s'" % url) + else: + log.critical("giving up on md after %i seconds\n" % + int(time.time() - starttime)) + + return (bool(url)) + + +def wait_for_metadata_service(urls, max_wait=None, timeout=None, + status_cb=None, headers_cb=None): + """ + urls: a list of urls to try + max_wait: roughly the maximum time to wait before giving up + The max time is *actually* len(urls)*timeout as each url will + be tried once and given the timeout provided. + timeout: the timeout provided to urllib2.urlopen + status_cb: call method with string message when a url is not available + + the idea of this routine is to wait for the EC2 metdata service to + come up. On both Eucalyptus and EC2 we have seen the case where + the instance hit the MD before the MD service was up. EC2 seems + to have permenantely fixed this, though. + + In openstack, the metadata service might be painfully slow, and + unable to avoid hitting a timeout of even up to 10 seconds or more + (LP: #894279) for a simple GET. + + Offset those needs with the need to not hang forever (and block boot) + on a system where cloud-init is configured to look for EC2 Metadata + service but is not going to find one. It is possible that the instance + data host (169.254.169.254) may be firewalled off Entirely for a sytem, + meaning that the connection will block forever unless a timeout is set. + """ + starttime = time.time() + + sleeptime = 1 + + def nullstatus_cb(msg): + return + + if status_cb == None: + status_cb = nullstatus_cb + + def timeup(max_wait, starttime): + return((max_wait <= 0 or max_wait == None) or + (time.time() - starttime > max_wait)) + + loop_n = 0 + while True: + sleeptime = int(loop_n / 5) + 1 + for url in urls: + now = time.time() + if loop_n != 0: + if timeup(max_wait, starttime): + break + if timeout and (now + timeout > (starttime + max_wait)): + # shorten timeout to not run way over max_time + timeout = int((starttime + max_wait) - now) + + reason = "" + try: + if headers_cb != None: + headers = headers_cb(url) + else: + headers = {} + + req = urllib2.Request(url, data=None, headers=headers) + resp = urllib2.urlopen(req, timeout=timeout) + if resp.read() != "": + return url + reason = "empty data [%s]" % resp.getcode() + except urllib2.HTTPError as e: + reason = "http error [%s]" % e.code + except urllib2.URLError as e: + reason = "url error [%s]" % e.reason + except socket.timeout as e: + reason = "socket timeout [%s]" % e + except Exception as e: + reason = "unexpected error [%s]" % e + + if log: + status_cb("'%s' failed [%s/%ss]: %s" % + (url, int(time.time() - starttime), max_wait, + reason)) + + if timeup(max_wait, starttime): + break + + loop_n = loop_n + 1 + time.sleep(sleeptime) + + return False + + +def read_maas_seed_dir(seed_d): + """ + Return user-data and metadata for a maas seed dir in seed_d. + Expected format of seed_d are the following files: + * instance-id + * hostname + * user-data + """ + md_required = set(('hostname', 'instance-id')) + files = md_required.union(set(('userdata',))) + userdata = None + md = {} + + if not os.path.isdir(seed_d): + raise MaasSeedDirNone("%s: not a directory") + + for fname in files: + try: + with open(os.path.join(seed_d, fname)) as fp: + if fname == 'userdata': + userdata = fp.read() + else: + md[fname] = fp.read() + fp.close() + except IOError as e: + if e.errno != errno.ENOENT: + raise + + if userdata == None and len(md) == 0: + raise MaasSeedDirNone("%s: no data files found" % seed_d) + + if userdata == None: + raise MaasSeedDirMalformed("%s: missing userdata" % seed_d) + + missing = md_required - set(md.keys()) + if len(missing): + raise MaasSeedDirMalformed("%s: missing files %s" % + (seed_d, str(missing))) + + return(userdata, md) + + +def read_maas_seed_url(seed_url, header_cb=None): + """ + Read the maas datasource at seed_url. + header_cb is a method that should return a headers dictionary that will + be given to urllib2.Request() + + Expected format of seed_url is are the following files: + * /instance-id + * /hostname + * /user-data + """ + userdata = "" + metadata = {'instance-id': 'i-maas-url', 'hostname': 'maas-url-hostname'} + + return(userdata, metadata) + + +def oauth_headers(url, consumer_key, token_key, token_secret, consumer_secret): + consumer = oauth.OAuthConsumer(consumer_key, consumer_secret) + token = oauth.OAuthToken(token_key, token_secret) + params = { + 'oauth_version': "1.0", + 'oauth_nonce': oauth.generate_nonce(), + 'oauth_timestamp': int(time.time()), + 'oauth_token': token.key, + 'oauth_consumer_key': consumer.key, + } + req = oauth.OAuthRequest(http_url=url, parameters=params) + req.sign_request(oauth.OAuthSignatureMethod_PLAINTEXT(), + consumer, token) + return(req.to_header()) + + +class MaasSeedDirNone(Exception): + pass + + +class MaasSeedDirMalformed(Exception): + pass + + +datasources = [ + (DataSourceMaaS, (DataSource.DEP_FILESYSTEM, DataSource.DEP_NETWORK)), +] + + +# return a list of data sources that match this set of dependencies +def get_datasource_list(depends): + return(DataSource.list_from_depends(depends, datasources)) diff --git a/tests/unittests/test_datasource/test_maas.py b/tests/unittests/test_datasource/test_maas.py new file mode 100644 index 00000000..ad169b97 --- /dev/null +++ b/tests/unittests/test_datasource/test_maas.py @@ -0,0 +1,112 @@ +from unittest import TestCase +from tempfile import mkdtemp +from shutil import rmtree +import os +from copy import copy +from cloudinit.DataSourceMaaS import ( + MaasSeedDirNone, + MaasSeedDirMalformed, + read_maas_seed_dir, +) + + +class TestMaasDataSource(TestCase): + + def setUp(self): + super(TestMaasDataSource, self).setUp() + # Make a temp directoy for tests to use. + self.tmp = mkdtemp(prefix="unittest_") + + def tearDown(self): + super(TestMaasDataSource, self).tearDown() + # Clean up temp directory + rmtree(self.tmp) + + def test_seed_dir_valid(self): + """Verify a valid seeddir is read as such""" + + data = {'instance-id': 'i-valid01', 'hostname': 'valid01-hostname', + 'userdata': 'valid01-userdata'} + + my_d = os.path.join(self.tmp, "valid") + populate_dir(my_d, data) + + (userdata, metadata) = read_maas_seed_dir(my_d) + + self.assertEqual(userdata, data['userdata']) + for key in ('instance-id', 'hostname'): + self.assertEqual(data[key], metadata[key]) + + def test_seed_dir_valid_extra(self): + """Verify extra files do not affect seed_dir validity """ + + data = {'instance-id': 'i-valid-extra', + 'hostname': 'valid-extra-hostname', + 'userdata': 'valid-extra-userdata', 'foo': 'bar'} + + my_d = os.path.join(self.tmp, "valid_extra") + populate_dir(my_d, data) + + (userdata, metadata) = read_maas_seed_dir(my_d) + + self.assertEqual(userdata, data['userdata']) + for key in ('instance-id', 'hostname'): + self.assertEqual(data[key], metadata[key]) + + # additional files should not just appear as keys in metadata atm + self.assertFalse(('foo' in metadata)) + + def test_seed_dir_invalid(self): + """Verify that invalid seed_dir raises MaasSeedDirMalformed""" + + valid = {'instance-id': 'i-instanceid', + 'hostname': 'test-hostname', 'userdata': ''} + + my_based = os.path.join(self.tmp, "valid_extra") + + # missing 'userdata' file + my_d = "%s-01" % my_based + invalid_data = copy(valid) + del invalid_data['userdata'] + populate_dir(my_d, invalid_data) + self.assertRaises(MaasSeedDirMalformed, read_maas_seed_dir, my_d) + + # missing 'instance-id' + my_d = "%s-02" % my_based + invalid_data = copy(valid) + del invalid_data['instance-id'] + populate_dir(my_d, invalid_data) + self.assertRaises(MaasSeedDirMalformed, read_maas_seed_dir, my_d) + + def test_seed_dir_none(self): + """Verify that empty seed_dir raises MaasSeedDirNone""" + + my_d = os.path.join(self.tmp, "valid_empty") + self.assertRaises(MaasSeedDirNone, read_maas_seed_dir, my_d) + + def test_seed_dir_missing(self): + """Verify that missing seed_dir raises MaasSeedDirNone""" + self.assertRaises(MaasSeedDirNone, read_maas_seed_dir, + os.path.join(self.tmp, "nonexistantdirectory")) + + def test_seed_url_valid(self): + """Verify that valid seed_url is read as such""" + pass + + def test_seed_url_invalid(self): + """Verify that invalid seed_url raises MaasSeedDirMalformed""" + pass + + def test_seed_url_missing(self): + """Verify seed_url with no found entries raises MaasSeedDirNone""" + pass + + +def populate_dir(seed_dir, files): + os.mkdir(seed_dir) + for (name, content) in files.iteritems(): + with open(os.path.join(seed_dir, name), "w") as fp: + fp.write(content) + fp.close() + +# vi: ts=4 expandtab -- cgit v1.2.3 From aacbeeb6dad8d987dfbc1a70f79214b72d85e67a Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 6 Mar 2012 17:05:43 -0500 Subject: assert that userdata is not returned as part of metadata --- tests/unittests/test_datasource/test_maas.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tests') diff --git a/tests/unittests/test_datasource/test_maas.py b/tests/unittests/test_datasource/test_maas.py index ad169b97..22374415 100644 --- a/tests/unittests/test_datasource/test_maas.py +++ b/tests/unittests/test_datasource/test_maas.py @@ -36,6 +36,9 @@ class TestMaasDataSource(TestCase): self.assertEqual(userdata, data['userdata']) for key in ('instance-id', 'hostname'): self.assertEqual(data[key], metadata[key]) + + # verify that 'userdata' is not returned as part of the metadata + self.assertFalse(('userdata' in metadata)) def test_seed_dir_valid_extra(self): """Verify extra files do not affect seed_dir validity """ -- cgit v1.2.3 From 27ad683638a30e202a0def71485fade430976856 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 6 Mar 2012 17:10:52 -0500 Subject: file for user-data should be 'user-data' (including the '-') --- cloudinit/DataSourceMaaS.py | 14 +++++++------- tests/unittests/test_datasource/test_maas.py | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'tests') diff --git a/cloudinit/DataSourceMaaS.py b/cloudinit/DataSourceMaaS.py index c25652b1..88686b13 100644 --- a/cloudinit/DataSourceMaaS.py +++ b/cloudinit/DataSourceMaaS.py @@ -137,7 +137,7 @@ def read_maas_seed_dir(seed_d): * hostname * user-data """ - files = ('hostname', 'instance-id', 'userdata') + files = ('hostname', 'instance-id', 'user-data') md = {} if not os.path.isdir(seed_d): @@ -166,7 +166,7 @@ def read_maas_seed_url(seed_url, header_cb=None, timeout=None): * /hostname * /user-data """ - files = ('hostname', 'instance-id', 'userdata') + files = ('hostname', 'instance-id', 'user-data') md = {} for fname in files: @@ -190,23 +190,23 @@ def check_seed_contents(content, seed): Either return a (userdata, metadata) tuple or Raise MaasSeedDirMalformed or MaasSeedDirNone """ - md_required = ('userdata', 'instance-id', 'hostname') + md_required = ('user-data', 'instance-id', 'hostname') found = content.keys() if len(content) == 0: raise MaasSeedDirNone("%s: no data files found" % seed) - if 'userdata' not in content: - raise MaasSeedDirMalformed("%s: missing userdata" % seed) + if 'user-data' not in content: + raise MaasSeedDirMalformed("%s: missing user-data" % seed) missing = [k for k in md_required if k not in found] if len(missing): raise MaasSeedDirMalformed("%s: missing files %s" % (seed, missing)) - userdata = content['userdata'] + userdata = content['user-data'] md = { } for (key, val) in content.iteritems(): - if key == 'userdata': + if key == 'user-data': continue md[key] = val diff --git a/tests/unittests/test_datasource/test_maas.py b/tests/unittests/test_datasource/test_maas.py index 22374415..dc8964d3 100644 --- a/tests/unittests/test_datasource/test_maas.py +++ b/tests/unittests/test_datasource/test_maas.py @@ -26,33 +26,33 @@ class TestMaasDataSource(TestCase): """Verify a valid seeddir is read as such""" data = {'instance-id': 'i-valid01', 'hostname': 'valid01-hostname', - 'userdata': 'valid01-userdata'} + 'user-data': 'valid01-userdata'} my_d = os.path.join(self.tmp, "valid") populate_dir(my_d, data) (userdata, metadata) = read_maas_seed_dir(my_d) - self.assertEqual(userdata, data['userdata']) + self.assertEqual(userdata, data['user-data']) for key in ('instance-id', 'hostname'): self.assertEqual(data[key], metadata[key]) # verify that 'userdata' is not returned as part of the metadata - self.assertFalse(('userdata' in metadata)) + self.assertFalse(('user-data' in metadata)) def test_seed_dir_valid_extra(self): """Verify extra files do not affect seed_dir validity """ data = {'instance-id': 'i-valid-extra', 'hostname': 'valid-extra-hostname', - 'userdata': 'valid-extra-userdata', 'foo': 'bar'} + 'user-data': 'valid-extra-userdata', 'foo': 'bar'} my_d = os.path.join(self.tmp, "valid_extra") populate_dir(my_d, data) (userdata, metadata) = read_maas_seed_dir(my_d) - self.assertEqual(userdata, data['userdata']) + self.assertEqual(userdata, data['user-data']) for key in ('instance-id', 'hostname'): self.assertEqual(data[key], metadata[key]) @@ -63,14 +63,14 @@ class TestMaasDataSource(TestCase): """Verify that invalid seed_dir raises MaasSeedDirMalformed""" valid = {'instance-id': 'i-instanceid', - 'hostname': 'test-hostname', 'userdata': ''} + 'hostname': 'test-hostname', 'user-data': ''} my_based = os.path.join(self.tmp, "valid_extra") # missing 'userdata' file my_d = "%s-01" % my_based invalid_data = copy(valid) - del invalid_data['userdata'] + del invalid_data['user-data'] populate_dir(my_d, invalid_data) self.assertRaises(MaasSeedDirMalformed, read_maas_seed_dir, my_d) -- cgit v1.2.3 From 3703ed74cea613e96f3d882e90af1cadae30a092 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 7 Mar 2012 09:54:04 -0500 Subject: fix pylint and pep8 warnings --- cloudinit/DataSourceEc2.py | 1 - cloudinit/DataSourceMaaS.py | 8 +++----- cloudinit/util.py | 10 ++++------ tests/unittests/test_datasource/test_maas.py | 2 +- 4 files changed, 8 insertions(+), 13 deletions(-) (limited to 'tests') diff --git a/cloudinit/DataSourceEc2.py b/cloudinit/DataSourceEc2.py index 4e06803d..7051ecda 100644 --- a/cloudinit/DataSourceEc2.py +++ b/cloudinit/DataSourceEc2.py @@ -24,7 +24,6 @@ from cloudinit import seeddir as base_seeddir from cloudinit import log import cloudinit.util as util import socket -import urllib2 import time import boto.utils as boto_utils import os.path diff --git a/cloudinit/DataSourceMaaS.py b/cloudinit/DataSourceMaaS.py index fc4e890d..08a48443 100644 --- a/cloudinit/DataSourceMaaS.py +++ b/cloudinit/DataSourceMaaS.py @@ -26,7 +26,6 @@ import cloudinit.util as util import errno import oauth.oauth as oauth import os.path -import socket import urllib2 import time @@ -185,7 +184,7 @@ def read_maas_seed_url(seed_url, header_cb=None, timeout=None): def check_seed_contents(content, seed): - """Validate if content is Is the content a dict that is valid as a + """Validate if content is Is the content a dict that is valid as a return for a datasource. Either return a (userdata, metadata) tuple or Raise MaasSeedDirMalformed or MaasSeedDirNone @@ -201,12 +200,12 @@ def check_seed_contents(content, seed): raise MaasSeedDirMalformed("%s: missing files %s" % (seed, missing)) userdata = content['user-data'] - md = { } + md = {} for (key, val) in content.iteritems(): if key == 'user-data': continue md[key] = val - + return(userdata, md) @@ -260,4 +259,3 @@ if __name__ == "__main__": pprint.pprint(metadata) main() - diff --git a/cloudinit/util.py b/cloudinit/util.py index 897f0a0d..35d194ba 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -752,6 +752,7 @@ def mount_callback_umount(device, callback, data=None): return(ret) + def wait_for_url(urls, max_wait=None, timeout=None, status_cb=None, headers_cb=None): """ @@ -826,10 +827,9 @@ def wait_for_url(urls, max_wait=None, timeout=None, except Exception as e: reason = "unexpected error [%s]" % e - if log: - status_cb("'%s' failed [%s/%ss]: %s" % - (url, int(time.time() - starttime), max_wait, - reason)) + status_cb("'%s' failed [%s/%ss]: %s" % + (url, int(time.time() - starttime), max_wait, + reason)) if timeup(max_wait, starttime): break @@ -838,5 +838,3 @@ def wait_for_url(urls, max_wait=None, timeout=None, time.sleep(sleeptime) return False - - diff --git a/tests/unittests/test_datasource/test_maas.py b/tests/unittests/test_datasource/test_maas.py index dc8964d3..4f896add 100644 --- a/tests/unittests/test_datasource/test_maas.py +++ b/tests/unittests/test_datasource/test_maas.py @@ -39,7 +39,7 @@ class TestMaasDataSource(TestCase): # verify that 'userdata' is not returned as part of the metadata self.assertFalse(('user-data' in metadata)) - + def test_seed_dir_valid_extra(self): """Verify extra files do not affect seed_dir validity """ -- cgit v1.2.3 From 996182c615548e56787551b294279158011b6bf2 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 8 Mar 2012 12:10:02 -0500 Subject: fix tests for 'hostname' to 'local-hostname' and user-data not required --- tests/unittests/test_datasource/test_maas.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/unittests/test_datasource/test_maas.py b/tests/unittests/test_datasource/test_maas.py index 4f896add..a090f873 100644 --- a/tests/unittests/test_datasource/test_maas.py +++ b/tests/unittests/test_datasource/test_maas.py @@ -25,7 +25,7 @@ class TestMaasDataSource(TestCase): def test_seed_dir_valid(self): """Verify a valid seeddir is read as such""" - data = {'instance-id': 'i-valid01', 'hostname': 'valid01-hostname', + data = {'instance-id': 'i-valid01', 'local-hostname': 'valid01-hostname', 'user-data': 'valid01-userdata'} my_d = os.path.join(self.tmp, "valid") @@ -34,7 +34,7 @@ class TestMaasDataSource(TestCase): (userdata, metadata) = read_maas_seed_dir(my_d) self.assertEqual(userdata, data['user-data']) - for key in ('instance-id', 'hostname'): + for key in ('instance-id', 'local-hostname'): self.assertEqual(data[key], metadata[key]) # verify that 'userdata' is not returned as part of the metadata @@ -44,7 +44,7 @@ class TestMaasDataSource(TestCase): """Verify extra files do not affect seed_dir validity """ data = {'instance-id': 'i-valid-extra', - 'hostname': 'valid-extra-hostname', + 'local-hostname': 'valid-extra-hostname', 'user-data': 'valid-extra-userdata', 'foo': 'bar'} my_d = os.path.join(self.tmp, "valid_extra") @@ -53,7 +53,7 @@ class TestMaasDataSource(TestCase): (userdata, metadata) = read_maas_seed_dir(my_d) self.assertEqual(userdata, data['user-data']) - for key in ('instance-id', 'hostname'): + for key in ('instance-id', 'local-hostname'): self.assertEqual(data[key], metadata[key]) # additional files should not just appear as keys in metadata atm @@ -63,14 +63,14 @@ class TestMaasDataSource(TestCase): """Verify that invalid seed_dir raises MaasSeedDirMalformed""" valid = {'instance-id': 'i-instanceid', - 'hostname': 'test-hostname', 'user-data': ''} + 'local-hostname': 'test-hostname', 'user-data': ''} my_based = os.path.join(self.tmp, "valid_extra") # missing 'userdata' file my_d = "%s-01" % my_based invalid_data = copy(valid) - del invalid_data['user-data'] + del invalid_data['local-hostname'] populate_dir(my_d, invalid_data) self.assertRaises(MaasSeedDirMalformed, read_maas_seed_dir, my_d) -- cgit v1.2.3 From 61011d088ca011c2bc3a9f519519a833064cc922 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 8 Mar 2012 13:35:55 -0500 Subject: add a test for read_maas_seed_url --- tests/unittests/test_datasource/test_maas.py | 38 ++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/unittests/test_datasource/test_maas.py b/tests/unittests/test_datasource/test_maas.py index a090f873..3da2b0b3 100644 --- a/tests/unittests/test_datasource/test_maas.py +++ b/tests/unittests/test_datasource/test_maas.py @@ -2,15 +2,19 @@ from unittest import TestCase from tempfile import mkdtemp from shutil import rmtree import os +import urllib2 +from StringIO import StringIO from copy import copy from cloudinit.DataSourceMaaS import ( MaasSeedDirNone, MaasSeedDirMalformed, read_maas_seed_dir, + read_maas_seed_url, ) +from mocker import MockerTestCase -class TestMaasDataSource(TestCase): +class TestMaasDataSource(MockerTestCase): def setUp(self): super(TestMaasDataSource, self).setUp() @@ -94,7 +98,37 @@ class TestMaasDataSource(TestCase): def test_seed_url_valid(self): """Verify that valid seed_url is read as such""" - pass + valid = {'meta-data/instance-id': 'i-instanceid', + 'meta-data/local-hostname': 'test-hostname', 'user-data': 'foodata'} + + my_seed = "http://example.com/xmeta" + my_ver = "1999-99-99" + my_headers = {'header1': 'value1', 'header2': 'value2'} + + def my_headers_cb(url): + return(my_headers) + + mock_request = self.mocker.replace("urllib2.Request", passthrough=False) + mock_urlopen = self.mocker.replace("urllib2.urlopen", passthrough=False) + + for (key, val) in valid.iteritems(): + mock_request("%s/%s/%s" % (my_seed, my_ver, key), + data=None, headers=my_headers) + self.mocker.nospec() + self.mocker.result("fake-request-%s" % key) + mock_urlopen("fake-request-%s" % key, timeout=None) + self.mocker.result(StringIO(val)) + + self.mocker.replay() + + (userdata, metadata) = read_maas_seed_url(my_seed, + header_cb=my_headers_cb, version=my_ver) + + self.assertEqual("foodata", userdata) + self.assertEqual(metadata['instance-id'], + valid['meta-data/instance-id']) + self.assertEqual(metadata['local-hostname'], + valid['meta-data/local-hostname']) def test_seed_url_invalid(self): """Verify that invalid seed_url raises MaasSeedDirMalformed""" -- cgit v1.2.3 From 82a92493a08cf311ec6df6170ed7e31f2b1ce1ea Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 8 Mar 2012 14:21:48 -0500 Subject: pep8 and pylint --- tests/unittests/test_datasource/test_maas.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/unittests/test_datasource/test_maas.py b/tests/unittests/test_datasource/test_maas.py index 3da2b0b3..d0e121d6 100644 --- a/tests/unittests/test_datasource/test_maas.py +++ b/tests/unittests/test_datasource/test_maas.py @@ -1,8 +1,6 @@ -from unittest import TestCase from tempfile import mkdtemp from shutil import rmtree import os -import urllib2 from StringIO import StringIO from copy import copy from cloudinit.DataSourceMaaS import ( @@ -29,7 +27,8 @@ class TestMaasDataSource(MockerTestCase): def test_seed_dir_valid(self): """Verify a valid seeddir is read as such""" - data = {'instance-id': 'i-valid01', 'local-hostname': 'valid01-hostname', + data = {'instance-id': 'i-valid01', + 'local-hostname': 'valid01-hostname', 'user-data': 'valid01-userdata'} my_d = os.path.join(self.tmp, "valid") @@ -99,7 +98,8 @@ class TestMaasDataSource(MockerTestCase): def test_seed_url_valid(self): """Verify that valid seed_url is read as such""" valid = {'meta-data/instance-id': 'i-instanceid', - 'meta-data/local-hostname': 'test-hostname', 'user-data': 'foodata'} + 'meta-data/local-hostname': 'test-hostname', + 'user-data': 'foodata'} my_seed = "http://example.com/xmeta" my_ver = "1999-99-99" @@ -108,8 +108,10 @@ class TestMaasDataSource(MockerTestCase): def my_headers_cb(url): return(my_headers) - mock_request = self.mocker.replace("urllib2.Request", passthrough=False) - mock_urlopen = self.mocker.replace("urllib2.urlopen", passthrough=False) + mock_request = self.mocker.replace("urllib2.Request", + passthrough=False) + mock_urlopen = self.mocker.replace("urllib2.urlopen", + passthrough=False) for (key, val) in valid.iteritems(): mock_request("%s/%s/%s" % (my_seed, my_ver, key), -- cgit v1.2.3