make new UI works

Signed-off-by: SamYuan1990 <yy19902439@126.com>
SamYuan1990 · Jan 24, 2021 · 97debce · 97debce
1 parent 3f29315
commit 97debce
Show file tree

Hide file tree

Showing 14 changed files with 401 additions and 149 deletions.
diff --git a/e2e/app.test.js b/e2e/app.test.js
@@ -74,4 +74,16 @@ describe('# test app.js', function () {
                 ShutDownCLI: './network.sh'
             }).expect(200, done);
     });
+
+    it('Post /api/run/new 200', function (done) {
+        request.post('/api/run/new').set('Content-Type', 'application/x-www-form-urlencoded').send(
+            {'todos':
+            {'path':'./fabric-samples',
+                'BatchTimeout':'1,2',
+                'MaxMessageCount':'10',
+                'AbsoluteMaxBytes':'2',
+                'PreferredMaxBytes':'512',
+                'cmd':[{'order':0, 'cmdType':'PrePare', 'args':['./prepareConfig.sh']}, {'order':1, 'cmdType':'Shell', 'args':['./network.sh', 'up', 'createChannel', '-i', '2.2']}, {'order':2, 'cmdType':'Shell', 'args':['./network.sh', 'deployCC', '-d', '5', '-ccn', 'basic', '-ccp', '../asset-transfer-basic/chaincode-go/', '-ccl', 'go']}, {'order':3, 'cmdType':'Shell', 'args':['sleep', '10']}, {'order':4, 'cmdType':'Tape', 'args':['docker', 'run', '--name', 'tape', '-e', 'TAPE_LOGLEVEL=debug', '--network', 'host', '-v', './:/config', 'guoger/tape', 'tape', '-c', '/config/config.yaml', '-n', '500']}, {'order':5, 'cmdType':'Shell', 'args':['docker', 'rm', 'tape']}, {'order':6, 'cmdType':'Shell', 'args':['./network.sh', 'down']}, {'order':7, 'cmdType':'Shell', 'args':['sleep', '10']}]
+            }}).expect(200, done);
+    });
 });
diff --git a/lib/commands.js b/lib/commands.js
@@ -137,3 +137,44 @@ exports.PrepareMonitorDown = function PrepareMonitorDown(CmdInfo, TurnInfo) {
     command.info = 'monitor down';
     return command;
 };
+
+exports.newVersionCommand = function newVersionCommand(cmd, thePath, dryRun,
+    BatchTimeout, MaxMessageCountElement, AbsoluteMaxBytes, PreferredMaxBytes) {
+    const command = {
+        DryRun: false,
+        tps: false,
+    };
+    if (dryRun) {
+        command.DryRun = true;
+    }
+    command.config = {
+        cwd : path.resolve(thePath)
+    };
+    command.args = [];
+    command.command = cmd.args[0];
+    if (cmd.cmdType === 'Shell') {
+        for (let i = 1; i < cmd.args.length; i++) {
+            command.args[i - 1] = cmd.args[i];
+        }
+    }
+    if (cmd.cmdType === 'Tape') {
+        command.tps = true;
+        let vmount = false;
+        for (let i = 1; i < cmd.args.length; i++) {
+            command.args[i - 1] = cmd.args[i];
+            if (vmount) {
+                const arr = cmd.args[i].split(':');
+                command.args[i - 1] = path.resolve(arr[0]) + ':' + arr[1];
+                vmount = false;
+            }
+            if (cmd.args[i] === '-v') {
+                vmount = true;
+            }
+        }
+    }
+    if (cmd.cmdType === 'PrePare') {
+        command.args = [BatchTimeout, MaxMessageCountElement, AbsoluteMaxBytes, PreferredMaxBytes];
+    }
+    // console.log(JSON.stringify(command));
+    return command;
+};
diff --git a/lib/libs.js b/lib/libs.js
@@ -89,9 +89,11 @@ exports.handleStatus = function handleStatus(rs) {
     if (rs.status !== 0) {
         if (rs.stderr) {
             logger.error(rs.stderr.toString('utf-8'));
+            console.log(rs.stderr.toString('utf-8'));
         }
         if (rs.output) {
             logger.error(rs.output.toString('utf-8'));
+            console.log(rs.output.toString('utf-8'));
         }
         if (!rs.stderr && !rs.output) {
             logger.error(JSON.stringify(rs));
@@ -124,4 +126,48 @@ exports.TapeTpsFilter = function TapeTpsFilter(rs) {
     str = str.substring(0, str.indexOf('\n'));
     str = str.substring(4);
     return str;
+};
+
+exports.RunNew = function RunNew(BatchTimeout, MaxMessageCount, AbsoluteMaxBytes, PreferredMaxBytes, dryRun, cmdPath, cmds) {
+    let status = 0;
+    logger.info(dryRun);
+    logger.info(cmdPath);
+    BatchTimeout.forEach(BatchTimeoutElement => {
+        MaxMessageCount.forEach(MaxMessageCountElement => {
+            AbsoluteMaxBytes.forEach(AbsoluteMaxBytesElement => {
+                PreferredMaxBytes.forEach(PreferredMaxBytesElement => {
+                    cmds.forEach(cmd => {
+                        logger.info(cmd);
+                        logger.info(BatchTimeoutElement);
+                        logger.info(MaxMessageCountElement);
+                        logger.info(AbsoluteMaxBytesElement);
+                        logger.info(PreferredMaxBytesElement);
+                        const command = libcommands.newVersionCommand(cmd, cmdPath, dryRun,
+                            BatchTimeoutElement, MaxMessageCountElement, AbsoluteMaxBytesElement, PreferredMaxBytesElement);
+                        console.log(command);
+                        if (!command.tps) {
+                            status = this.executeCommand(command);
+                            if (status !== 0) {
+                                return status;
+                            }
+                        } else {
+                            const TPS = this.executeCommand(command);
+                            if (TPS < 0) {
+                                logger.error('error in tps testing');
+                                return TPS;
+                            } else {
+                                fileIO.appendRS('sample' + ',' +
+                                BatchTimeoutElement + ',' +
+                                MaxMessageCountElement + ',' +
+                                AbsoluteMaxBytesElement + ',' +
+                                PreferredMaxBytesElement + ',' +
+                TPS + ',');
+                            }
+                        }
+                    });
+                });
+            });
+        });
+    });
+    return status;
 };