X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=bottlenecks.git;a=blobdiff_plain;f=test-scheduler%2Fserver%2Fconductorclient%2Frun_new_workflow.py;fp=testing-scheduler%2Fserver%2Fconductorclient%2Frun_new_workflow.py;h=4d38b4ba73fd31de3fa97bf9fb060287f49a6018;hp=0acb96a0b51e1fc0cb3f38ed02768b8714da08e9;hb=e32043f58a2450b6a5986dc2a01f64f8b22c3992;hpb=a09bbea983aca3e437e254566da98196177748d9

diff --git a/testing-scheduler/server/conductorclient/run_new_workflow.py b/test-scheduler/server/conductorclient/run_new_workflow.py
similarity index 97%
rename from testing-scheduler/server/conductorclient/run_new_workflow.py
rename to test-scheduler/server/conductorclient/run_new_workflow.py
index 0acb96a0..4d38b4ba 100644
--- a/testing-scheduler/server/conductorclient/run_new_workflow.py
+++ b/test-scheduler/server/conductorclient/run_new_workflow.py
@@ -1,71 +1,71 @@
-##############################################################################
-# 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()
+##############################################################################
+# 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()