DataSource: set ds_cfg to be a dictionary

smoser · smoser · commit 3b69f410718f · 2016-04-04T12:31:28.000-04:00
if the Datasource does not have an entry in config, then
set it to be a empty dictionary rather than None.
Also remove places that did this elsewhere.
diff --git a/cloudinit/sources/DataSourceCloudStack.py b/cloudinit/sources/DataSourceCloudStack.py
@@ -89,8 +89,6 @@ def __init__(self, sys_cfg, distro, paths):
 
     def _get_url_settings(self):
         mcfg = self.ds_cfg
-        if not mcfg:
-            mcfg = {}
         max_wait = 120
         try:
             max_wait = int(mcfg.get("max_wait", max_wait))
@@ -109,10 +107,6 @@ def _get_url_settings(self):
         return (max_wait, timeout)
 
     def wait_for_metadata_service(self):
-        mcfg = self.ds_cfg
-        if not mcfg:
-            mcfg = {}
-
         (max_wait, timeout) = self._get_url_settings()
 
         urls = [uhelp.combine_url(self.metadata_address,
diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
@@ -84,8 +84,6 @@ def get_instance_id(self):
 
     def _get_url_settings(self):
         mcfg = self.ds_cfg
-        if not mcfg:
-            mcfg = {}
         max_wait = 120
         try:
             max_wait = int(mcfg.get("max_wait", max_wait))
@@ -102,8 +100,6 @@ def _get_url_settings(self):
 
     def wait_for_metadata_service(self):
         mcfg = self.ds_cfg
-        if not mcfg:
-            mcfg = {}
 
         (max_wait, timeout) = self._get_url_settings()
         if max_wait <= 0:
diff --git a/cloudinit/sources/DataSourceOpenStack.py b/cloudinit/sources/DataSourceOpenStack.py
@@ -45,8 +45,6 @@ def __init__(self, sys_cfg, distro, paths):
         self.version = None
         self.files = {}
         self.ec2_metadata = None
-        if not self.ds_cfg:
-            self.ds_cfg = {}
 
     def __str__(self):
         root = sources.DataSource.__str__(self)
diff --git a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py
@@ -70,6 +70,9 @@ def __init__(self, sys_cfg, distro, paths, ud_proc=None):
 
         self.ds_cfg = util.get_cfg_by_path(self.sys_cfg,
                                            ("datasource", name), {})
+        if not self.ds_cfg:
+            self.ds_cfg = {}
+
         if not ud_proc:
             self.ud_proc = ud.UserDataProcessor(self.paths)
         else:
