Merge pull request Yelp#28 from kentwills/validate_model

add validation for model name and id

Author: prat0318

swagger_spec_validator/__about__.py

@@ -7,7 +7,7 @@
 __summary__ = "Validation of Swagger specifications"
 __uri__ = "http://github.com/Yelp/swagger_spec_validator"
 
-__version__ = "1.0.10"
+__version__ = "1.0.11"
 
 __author__ = "John Billings"
 __email__ = "[email protected]"

swagger_spec_validator/validator12.py

@@ -159,6 +159,10 @@ def validate_model(model, model_name, model_ids):
                 'Model "%s": required property "%s" not found' %
                 (model_name, required))
 
+    if model_name != model['id']:
+        error = 'model name: {0} does not match model id: {1}'.format(model_name, model['id'])
+        raise SwaggerValidationError(error)
+
     for prop_name, prop in six.iteritems(model.get('properties', {})):
         try:
             validate_data_type(prop, model_ids, allow_refs=True)

tests/validator12/validate_spec_test.py

@@ -9,6 +9,7 @@
     validate_data_type,
     validate_spec,
     validate_parameter,
+    validate_model,
 )
 
 
@@ -67,3 +68,13 @@ def test_validate_data_type_is_model():
     obj = {'type': model_id}
     # lack of error is success
     validate_data_type(obj, model_ids, allow_refs=False)
+
+
+def test_validate_model_matches_id():
+    model = {"id": "mysupermodel"}
+    model_name = "mymodel"
+    model_ids = ""
+
+    with pytest.raises(SwaggerValidationError) as exc:
+        validate_model(model, model_name, model_ids)
+    assert 'model name: mymodel does not match model id: mysupermodel' in str(exc)