Merge "Create API to get SUT information"

2 files changed, 35 insertions, 1 deletions

diff --git a/api/resources/v2/environments.py b/api/resources/v2/environments.py
index 158e98be7..7e587be85 100644
--- a/api/resources/v2/environments.py
+++ b/api/resources/v2/environments.py
@@ -11,6 +11,7 @@ import logging
 
 from oslo_serialization import jsonutils
 from docker import Client
+from docker.errors import APIError
 
 from api import ApiResource
 from api.database.v2.handlers import V2EnvironmentHandler
@@ -20,6 +21,7 @@ from api.database.v2.handlers import V2ContainerHandler
 from yardstick.common.utils import result_handler
 from yardstick.common.utils import change_obj_to_dict
 from yardstick.common import constants as consts
+from yardstick.service.environment import Environment
 
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.DEBUG)
@@ -124,10 +126,41 @@ class V2Environment(ApiResource):
                 LOG.debug('container name: %s', container.name)
                 try:
                     client.remove_container(container.name, force=True)
-                except Exception:
+                except APIError:
                     LOG.exception('remove container failed')
                 container_handler.delete_by_uuid(v)
 
         environment_handler.delete_by_uuid(environment_id)
 
         return result_handler(consts.API_SUCCESS, {'environment': environment_id})
+
+
+class V2SUT(ApiResource):
+
+    def get(self, environment_id):
+        try:
+            uuid.UUID(environment_id)
+        except ValueError:
+            return result_handler(consts.API_ERROR, 'invalid environment id')
+
+        environment_handler = V2EnvironmentHandler()
+        try:
+            environment = environment_handler.get_by_uuid(environment_id)
+        except ValueError:
+            return result_handler(consts.API_ERROR, 'no such environment id')
+
+        if not environment.pod_id:
+            return result_handler(consts.API_SUCCESS, {'sut': {}})
+
+        pod_handler = V2PodHandler()
+        try:
+            pod = pod_handler.get_by_uuid(environment.pod_id)
+        except ValueError:
+            return result_handler(consts.API_ERROR, 'no such pod id')
+        else:
+            pod_content = pod.content
+
+        env = Environment(pod=pod_content)
+        sut_info = env.get_sut_info()
+
+        return result_handler(consts.API_SUCCESS, {'sut': sut_info})
diff --git a/api/urls.py b/api/urls.py
index 4b8e39e8f..9f0abcade 100644
--- a/api/urls.py
+++ b/api/urls.py
@@ -26,6 +26,7 @@ urlpatterns = [
     Url('/api/v2/yardstick/environments', 'v2_environments'),
     Url('/api/v2/yardstick/environments/action', 'v2_environments'),
     Url('/api/v2/yardstick/environments/<environment_id>', 'v2_environment'),
+    Url('/api/v2/yardstick/environments/<environment_id>/sut', 'v2_sut'),
 
     Url('/api/v2/yardstick/openrcs', 'v2_openrcs'),
     Url('/api/v2/yardstick/openrcs/action', 'v2_openrcs'),