2 files changed, 58 insertions, 0 deletions
diff --git a/os_client_config/cloud_config.py b/os_client_config/cloud_config.py
index d0c932f..c17bfc2 100644
--- a/os_client_config/cloud_config.py
+++ b/os_client_config/cloud_config.py
@@ -18,3 +18,17 @@ class CloudConfig(object):
         self.name = name
         self.region = region
         self.config = config
+
+    def __getattr__(self, key):
+        """Return arbitrary attributes."""
+
+        if key.startswith('os_'):
+            key = key[3:]
+
+        if key in [attr.replace('-', '_') for attr in self.config]:
+            return self.config[key]
+        else:
+            return None
+
+    def __iter__(self):
+        return self.config.__iter__()
diff --git a/os_client_config/tests/test_cloud_config.py b/os_client_config/tests/test_cloud_config.py
new file mode 100644
index 0000000..36386e5
--- /dev/null
+++ b/os_client_config/tests/test_cloud_config.py
@@ -0,0 +1,44 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+
+from os_client_config import cloud_config
+from os_client_config.tests import base
+
+
+fake_config_dict = {'a': 1, 'os_b': 2, 'c': 3, 'os_c': 4}
+
+
+class TestCloudConfig(base.TestCase):
+
+    def test_arbitrary_attributes(self):
+        cc = cloud_config.CloudConfig("test1", "region-al", fake_config_dict)
+        self.assertEqual("test1", cc.name)
+        self.assertEqual("region-al", cc.region)
+
+        # Look up straight value
+        self.assertEqual(1, cc.a)
+
+        # Look up prefixed attribute, fail - returns None
+        self.assertEqual(None, cc.os_b)
+
+        # Look up straight value, then prefixed value
+        self.assertEqual(3, cc.c)
+        self.assertEqual(3, cc.os_c)
+
+        # Lookup mystery attribute
+        self.assertIsNone(cc.x)
+
+    def test_iteration(self):
+        cc = cloud_config.CloudConfig("test1", "region-al", fake_config_dict)
+        self.assertTrue('a' in cc)
+        self.assertFalse('x' in cc)