Merge pull request #492 from Microsoft/xiongyf/rest-server-port-fix0

[Rest Server] Add default http and ssh port
microsoft · Apr 18, 2018 · 2e69367 · 2e69367
2 parents 080d232 + 290446f
commit 2e69367
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/rest-server/src/config/job.js b/rest-server/src/config/job.js
@@ -67,18 +67,7 @@ const jobConfigSchema = Joi.object().keys({
              .default(1),
           }))
           .optional()
-          .default([
-            {
-              label: 'http',
-              beginAt: 0,
-              portNumber: 1,
-            },
-            {
-              label: 'ssh',
-              beginAt: 0,
-              portNumber: 1,
-            },
-          ]),
+          .default([]),
         command: Joi.string()
           .required(),
       }))

diff --git a/rest-server/src/models/job.js b/rest-server/src/models/job.js
@@ -450,6 +450,14 @@ class Job {
           'count': data.taskRoles[i].portList[j].portNumber,
         };
       }
+      for (let defaultPortLabel of ['http', 'ssh']) {
+        if (!(defaultPortLabel in portList)) {
+          portList[defaultPortLabel] = {
+            'start': 0,
+            'count': 1,
+          };
+        }
+      }
       const taskRole = {
         'taskNumber': data.taskRoles[i].taskNumber,
         'taskService': {