Merge "Add CONFIG_SCHEMA to DummyEngine"

rally/deploy/engines/dummy_engine.py

@@ -26,12 +26,38 @@ class DummyEngine(engine.EngineFactory):
        cloud_config: {
            'identity': {
                'url': 'http://localhost/',
-               'admin_user': 'amdin'
+               'admin_username': 'admin'
                ....
            }
        }
     """
 
+    IDENTITY_SCHEMA = {
+        'type': 'object',
+        'properties': {
+            'uri': {'type': 'string'},
+            'admin_username': {'type': 'string'},
+            'admin_password': {'type': 'string'},
+            'admin_tenant_name': {'type': 'string'},
+        },
+        'required': ['uri', 'admin_username', 'admin_password',
+                     'admin_tenant_name'],
+    }
+
+    CONFIG_SCHEMA = {
+        'type': 'object',
+        'properties': {
+            'cloud_config': {
+                'type': 'object',
+                'properties': {
+                    'identity': IDENTITY_SCHEMA,
+                },
+                'required': ['identity'],
+            },
+        },
+        'required': ['cloud_config'],
+    }
+
     def deploy(self):
         return self.deployment['config'].get('cloud_config', {})
 

tests/deploy/test_dummy_engine.py

@@ -15,6 +15,8 @@
 
 """Test dummy deploy engines."""
 
+import jsonschema
+
 from rally import deploy
 from rally.deploy.engines import dummy_engine
 from rally import test
@@ -31,8 +33,8 @@ class TestDummyDeployEngine(test.TestCase):
                         'uri': 'http://example.net:5000/v2.0/',
                         'admin_username': 'admin',
                         'admin_password': 'myadminpass',
-                        'admin_tenant_name': 'demo'
+                        'admin_tenant_name': 'demo',
-                    }
+                    },
                 },
             },
         }
@@ -54,3 +56,13 @@ class TestDummyDeployEngine(test.TestCase):
         engine = deploy.EngineFactory.get_engine(name,
                                                  self.deployment)
         self.assertIsInstance(engine, dummy_engine.DummyEngine)
+
+    def test_init_invalid_config(self):
+        self.deployment['config']['cloud_config']['identity'] = 42
+        self.assertRaises(jsonschema.ValidationError,
+                          dummy_engine.DummyEngine, self.deployment)
+
+    def test_deploy(self):
+        engine = dummy_engine.DummyEngine(self.deployment)
+        self.assertEqual(self.deployment['config']['cloud_config'],
+                         engine.deploy())