Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[docker] Use image IDs instead of tags"
[releng.git]
/
utils
/
test
/
testapi
/
opnfv_testapi
/
resources
/
scenario_handlers.py
diff --git
a/utils/test/testapi/opnfv_testapi/resources/scenario_handlers.py
b/utils/test/testapi/opnfv_testapi/resources/scenario_handlers.py
index
a8c1a94
..
083bf59
100644
(file)
--- a/
utils/test/testapi/opnfv_testapi/resources/scenario_handlers.py
+++ b/
utils/test/testapi/opnfv_testapi/resources/scenario_handlers.py
@@
-1,17
+1,16
@@
-from opnfv_testapi.common.constants import HTTP_FORBIDDEN
-from opnfv_testapi.resources.handlers import GenericApiHandler
-from opnfv_testapi.resources.scenario_models import Scenario
+from opnfv_testapi.common import constants
+from opnfv_testapi.resources import handlers
import opnfv_testapi.resources.scenario_models as models
from opnfv_testapi.tornado_swagger import swagger
import opnfv_testapi.resources.scenario_models as models
from opnfv_testapi.tornado_swagger import swagger
-class GenericScenarioHandler(GenericApiHandler):
+class GenericScenarioHandler(
handlers.
GenericApiHandler):
def __init__(self, application, request, **kwargs):
super(GenericScenarioHandler, self).__init__(application,
request,
**kwargs)
self.table = self.db_scenarios
def __init__(self, application, request, **kwargs):
super(GenericScenarioHandler, self).__init__(application,
request,
**kwargs)
self.table = self.db_scenarios
- self.table_cls = Scenario
+ self.table_cls =
models.
Scenario
class ScenariosCLHandler(GenericScenarioHandler):
class ScenariosCLHandler(GenericScenarioHandler):
@@
-81,7
+80,7
@@
class ScenariosCLHandler(GenericScenarioHandler):
def error(data):
message = '{} already exists as a scenario'.format(data.name)
def error(data):
message = '{} already exists as a scenario'.format(data.name)
- return HTTP_FORBIDDEN, message
+ return
constants.
HTTP_FORBIDDEN, message
miss_checks = ['name']
db_checks = [(self.table, False, query, error)]
miss_checks = ['name']
db_checks = [(self.table, False, query, error)]
@@
-116,6
+115,17
@@
class ScenarioGURHandler(GenericScenarioHandler):
db_keys = ['name']
self._update(query, db_keys)
db_keys = ['name']
self._update(query, db_keys)
+ @swagger.operation(nickname="deleteScenarioByName")
+ def delete(self, name):
+ """
+ @description: delete a scenario by name
+ @return 200: delete success
+ @raise 404: scenario not exist:
+ """
+
+ query = {'name': name}
+ self._delete(query)
+
def _update_query(self, keys, data):
query = dict()
equal = True
def _update_query(self, keys, data):
query = dict()
equal = True