diff options
author | Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com> | 2018-09-04 21:02:27 +0800 |
---|---|---|
committer | Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com> | 2018-09-06 14:58:45 +0800 |
commit | e32043f58a2450b6a5986dc2a01f64f8b22c3992 (patch) | |
tree | 650f6ce0381e53c3ca935025e9121f06725efd5d /testing-scheduler/server/conductorclient | |
parent | a09bbea983aca3e437e254566da98196177748d9 (diff) |
Change naming and veriy test-scheduler function
Changes:
1. Testing-scheduler -> Test-scheduler
2. lots of windows breaks '\r' and '^M' in files,
batch changes to unix breaks '$'
3. Add ui/build
Change-Id: I1f2c98ab9348460d4e68bfbfab664dae82b761ba
Signed-off-by: Yang (Gabriel) Yu <Gabriel.yuyang@huawei.com>
Diffstat (limited to 'testing-scheduler/server/conductorclient')
4 files changed, 0 insertions, 116 deletions
diff --git a/testing-scheduler/server/conductorclient/__init__.py b/testing-scheduler/server/conductorclient/__init__.py deleted file mode 100644 index bb02be17..00000000 --- a/testing-scheduler/server/conductorclient/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -##############################################################################
-# Copyright (c) 2018 Huawei Technologies Co.,Ltd. and others
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
diff --git a/testing-scheduler/server/conductorclient/mock_tasks.json b/testing-scheduler/server/conductorclient/mock_tasks.json deleted file mode 100644 index 4fea48bf..00000000 --- a/testing-scheduler/server/conductorclient/mock_tasks.json +++ /dev/null @@ -1,13 +0,0 @@ -{
- "task_group_1":[
- {
- "name": "http_yardstick_test",
- "retryCount": 3,
- "timeOutSeconds": 1200,
- "timeOutPolicy": "TIME_OUT_WF",
- "retryLogic": "FIXED",
- "retryDelaySeconds": 600,
- "responseTimeOutSeconds": 3600
- }
- ]
-}
\ No newline at end of file diff --git a/testing-scheduler/server/conductorclient/mock_workflow.json b/testing-scheduler/server/conductorclient/mock_workflow.json deleted file mode 100644 index 8f6251c0..00000000 --- a/testing-scheduler/server/conductorclient/mock_workflow.json +++ /dev/null @@ -1,24 +0,0 @@ -{
- "name": "workflow_demo_05",
- "description": "run a workflow of yardstick test service",
- "version": 1,
- "tasks": [
- {
- "name": "http_yardstick_test",
- "taskReferenceName": "ping_test",
- "inputParameters": {
- "http_request": {
- "uri": "http://192.168.199.105:8080/greet",
- "method": "GET"
- }
- },
- "type": "HTTP"
- }
- ],
- "outputParameters": {
- "header": "${ping_test.output.response.headers}",
- "response": "${ping_test.output.response.body}",
- "status": "${ping_test.output.response.statusCode}"
- },
- "schemaVersion": 2
-}
\ No newline at end of file diff --git a/testing-scheduler/server/conductorclient/run_new_workflow.py b/testing-scheduler/server/conductorclient/run_new_workflow.py deleted file mode 100644 index 0acb96a0..00000000 --- a/testing-scheduler/server/conductorclient/run_new_workflow.py +++ /dev/null @@ -1,71 +0,0 @@ -##############################################################################
-# Copyright (c) 2018 Huawei Technologies Co.,Ltd. and others
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-from conductor import conductor
-import json
-
-
-class WorkflowMgr(object):
- def __init__(self, serverAddr):
- self._serverAddr = serverAddr + '/api'
- self._metaDataClient = conductor.MetadataClient(self._serverAddr)
- self._workflowClient = conductor.WorkflowClient(self._serverAddr)
- self._tasksDefined = False
- self._workflowDefined = False
- self._workflowName = ""
-
- def setTaskDef(self, taskJson):
- jsonObj = json.loads(taskJson)
- print "define tasks:\n", taskJson
- for (k, v) in jsonObj.items():
- self._metaDataClient.registerTaskDefs(v)
- self._tasksDefined = True
-
- def setWorkflowDef(self, workflowJson):
- jsonObj = json.loads(workflowJson)
- print "define workflow:\n", workflowJson
- try:
- self._metaDataClient.createWorkflowDef(jsonObj)
- except Exception as e:
- print e
- self._workflowName = jsonObj['name']
- self._workflowDefined = True
-
- def startWorkflow(self, param={}):
- workflowId = ''
- if not self._tasksDefined:
- print "error: please define the task at first\n"
- elif not self._workflowDefined:
- print "error: please define the workflow at first\n"
- else:
- workflowId = self._workflowClient.startWorkflow(
- self._workflowName, param)
- return workflowId
-
- def setTaskDefFromFile(self, taskFilePath):
- with open(taskFilePath, 'r') as f:
- self.setTaskDef(f.read())
-
- def setWorkflowFromFile(self, workflowFilePath):
- with open(workflowFilePath, 'r') as f:
- self.setWorkflowDef(f.read())
-
-
-# test demo
-def main():
- serverAddr = "http://192.168.199.131:8080"
- wfMgr = WorkflowMgr(serverAddr)
- wfMgr.setTaskDefFromFile('mock_tasks.json')
- wfMgr.setWorkflowFromFile('mock_workflow.json')
- inputParam = {'input': 'fake'}
- wfMgr.startWorkflow(inputParam)
-
-
-if __name__ == "__main__":
- main()
|