Align code with docs for validation entries

Documentation and some of the code indicated that the pattern
...validations/{validation_name}/entries/{id} would be used
Code had some artifacts using: ...validations/{validation_name}/{id}
This change addresses this and aligns on the documented version.

Change-Id: I71f4f2273464e60968eb026ee4f5db96ff3302c7

deckhand/service.py

@@ -53,7 +53,8 @@ def configure_app(app, version=''):
             validations.ValidationsResource()),
         ('revisions/{revision_id}/validations/{validation_name}',
             validations.ValidationsResource()),
-        ('revisions/{revision_id}/validations/{validation_name}/{entry_id}',
+        ('revisions/{revision_id}/validations/{validation_name}'
+         '/entries/{entry_id}',
             validations.ValidationsResource()),
         ('rollback/{revision_id}', rollback.RollbackResource())
     ]

deckhand/tests/unit/control/test_api_initialization.py

@@ -99,7 +99,7 @@ class TestApi(test_base.DeckhandTestCase):
                       '{validation_name}',
                       self.validations_resource()),
             mock.call('/api/v1.0/revisions/{revision_id}/validations/'
-                      '{validation_name}/{entry_id}',
+                      '{validation_name}/entries/{entry_id}',
                       self.validations_resource()),
             mock.call('/versions', self.versions_resource())
         ], any_order=True)

deckhand/tests/unit/control/test_validations_controller.py

@@ -283,7 +283,7 @@ class TestValidationsController(test_base.BaseControllerTest):
                                        VALIDATION_RESULT)
 
         resp = self.app.simulate_get(
-            '/api/v1.0/revisions/%s/validations/%s/0' % (revision_id,
+            '/api/v1.0/revisions/%s/validations/%s/entries/0' % (revision_id,
                                                          validation_name),
             headers={'Content-Type': 'application/x-yaml'})
         self.assertEqual(200, resp.status_code)
@@ -328,7 +328,7 @@ class TestValidationsController(test_base.BaseControllerTest):
                               validation_name, revision_id))
 
         resp = self.app.simulate_get(
-            '/api/v1.0/revisions/%s/validations/%s/5' % (revision_id,
+            '/api/v1.0/revisions/%s/validations/%s/entries/5' % (revision_id,
                                                          validation_name),
             headers={'Content-Type': 'application/x-yaml'})
         self.assertEqual(404, resp.status_code)
@@ -543,7 +543,7 @@ class TestValidationsController(test_base.BaseControllerTest):
 
         # Validate that fail_doc validation failed for the expected reason.
         resp = self.app.simulate_get(
-            '/api/v1.0/revisions/%s/validations/%s/0' % (
+            '/api/v1.0/revisions/%s/validations/%s/entries/0' % (
                 revision_id, types.DECKHAND_SCHEMA_VALIDATION),
             headers={'Content-Type': 'application/x-yaml'})
         self.assertEqual(200, resp.status_code)

doc/source/api_ref.rst

@@ -171,15 +171,15 @@ Sample response:
       status: failure
       validations:
         - name: deckhand-schema-validation
-          url: https://deckhand/api/v1.0/revisions/1/validations/deckhand-schema-validation/0
+          url: https://deckhand/api/v1.0/revisions/1/validations/deckhand-schema-validation/entries/0
           status: success
         - name: drydock-site-validation
           status: missing
         - name: promenade-site-validation
-          url: https://deckhand/api/v1.0/revisions/1/validations/promenade-site-validation/0
+          url: https://deckhand/api/v1.0/revisions/1/validations/promenade-site-validation/entries/0
           status: expired
         - name: armada-deployability-validation
-          url: https://deckhand/api/v1.0/revisions/1/validations/armada-deployability-validation/0
+          url: https://deckhand/api/v1.0/revisions/1/validations/armada-deployability-validation/entries/0
           status: failure
 
 Validation status is always for the most recent entry for a given validation.
@@ -331,7 +331,7 @@ Sample response:
   prev: null
   results:
     - id: 0
-      url: https://deckhand/api/v1.0/revisions/4/validations/promenade-site-validation/0/entries/0
+      url: https://deckhand/api/v1.0/revisions/4/validations/promenade-site-validation/entries/0
       status: failure
 
 GET ``/revisions/{{revision_id}}/validations/{{name}}/entries/{{entry_id}}``