Merge 7264aa1 into deaf600

mesosphere · Dec 6, 2018 · 77ada92 · 77ada92
2 parents deaf600 + 7264aa1
commit 77ada92
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 11 deletions.
diff --git a/src/js/components/AppConfigEditFormComponent.jsx b/src/js/components/AppConfigEditFormComponent.jsx
@@ -251,6 +251,7 @@ var AppConfigEditFormComponent = React.createClass({
         cpus: "cpus",
         mem: "mem",
         disk: "disk",
+        gpus: "gpus",
         instances: "instances",
         cmd: "cmd"
       })
@@ -358,6 +359,15 @@ var AppConfigEditFormComponent = React.createClass({
                   <input min="0" step="any" type="number"/>
                 </FormGroupComponent>
               </div>
+              <div className="col-sm-3">
+                <FormGroupComponent fieldId="gpus"
+                                    label="GPUs (Device)"
+                                    errorMessage={this.getErrorMessage("gpus")}
+                                    value={state.fields.gpus}
+                                    onChange={this.handleFieldUpdate}>
+                  <input min="0" step="1" type="number"/>
+                </FormGroupComponent>
+              </div>
               <div className="col-sm-3">
                 <FormGroupComponent fieldId="instances" label="Instances"
                   errorMessage={this.getErrorMessage("instances")}

diff --git a/src/js/components/AppVersionComponent.jsx b/src/js/components/AppVersionComponent.jsx
@@ -281,6 +281,8 @@ var AppVersionComponent = React.createClass({
           {invalidateValue(appVersion.mem, "MiB")}
           <dt>Disk Space</dt>
           {invalidateValue(appVersion.disk, "MiB")}
+          <dt>GPUs</dt>
+          {invalidateValue(appVersion.gpus, "Device")}
           <dt>Networks</dt>
           {networksNode}
           <dt>Port Definitions</dt>

diff --git a/src/js/constants/AppConfigDefaults.js b/src/js/constants/AppConfigDefaults.js
@@ -7,6 +7,7 @@ export const AppConfigFormDefaultValues = Util.deepFreeze({
   cpus: 1,
   mem: 128,
   disk: 0,
+  gpus: 0,
   instances: 1
 });
 
@@ -17,6 +18,7 @@ export const AppConfigDefaultValues = Util.deepFreeze({
   cpus: 1,
   mem: 128,
   disk: 0,
+  gpus: 0,
   instances: 1
 });
 

diff --git a/src/js/constants/AppFormErrorMessages.js b/src/js/constants/AppFormErrorMessages.js
@@ -52,6 +52,7 @@ const applicationFieldValidationErrors = Util.deepFreeze({
   instances: ["Instances must be a non-negative number"],
   labels: ["Key cannot be blank"],
   mem: ["Memory must be a number greater than or equal to 32"],
+  gpus: ["GPUs must be a non-negative integer"],
   portDefinitions: [
     "Port must be a valid port",
     "Protocol must be either 'tcp' or 'udp'"

diff --git a/src/js/stores/AppFormStore.js b/src/js/stores/AppFormStore.js
@@ -83,6 +83,7 @@ const validationRules = {
   "instances": [AppFormValidators.instances],
   "labels": [AppFormValidators.labels],
   "mem": [AppFormValidators.mem],
+  "gpus": [AppFormValidators.gpus],
   "portDefinitions": [
     AppFormValidators.portDefinitionsPortIsValid,
     AppFormValidators.portDefinitionsProtocolValidType
@@ -116,6 +117,7 @@ const resolveFieldIdToAppKeyMap = {
   executor: "executor",
   labels: "labels",
   mem: "mem",
+  gpus: "gpus",
   portDefinitions: "portDefinitions",
   uris: "uris",
   user: "user"
@@ -170,6 +172,7 @@ const responseAttributePathToFieldIdMap = {
     "healthChecks/{INDEX}/maxConsecutiveFailures",
   "/instances": "instances",
   "/mem": "mem",
+  "/gpus": "gpus",
   "/portDefinitions": "portDefinitions",
   "/portDefinitions({INDEX})/name": "portDefinitions/{INDEX}/name",
   "/portDefinitions({INDEX})/port": "portDefinitions/{INDEX}/port",

diff --git a/src/js/stores/schemes/appScheme.js b/src/js/stores/schemes/appScheme.js
@@ -23,6 +23,7 @@ const appScheme = {
   mem: null,
   networks: [],
   disk: null,
+  gpus: null,
   portDefinitions: [],
   fetch: [],
   user: null,

diff --git a/src/js/stores/transforms/AppFormFieldToModelTransforms.js b/src/js/stores/transforms/AppFormFieldToModelTransforms.js
@@ -58,6 +58,7 @@ const AppFormFieldToModelTransforms = {
   },
   cpus: (value) => parseFloat(value),
   disk: (value) => parseFloat(value),
+  gpus: (value) => parseInt(value),
   constraints: (constraints) => constraints
     .split(",")
     .filter((constraint) => constraint != null && constraint !== "")

diff --git a/src/js/stores/validators/AppFormValidators.js b/src/js/stores/validators/AppFormValidators.js
@@ -151,6 +151,9 @@ const AppFormValidators = {
   mem: (value) => !Util.isStringAndEmpty(value) &&
     !!value.toString().match(/^[0-9\.]+$/) && parseInt(value) >= 32,
 
+  gpus: (value) => !Util.isStringAndEmpty(value) &&
+    !!value.toString().match(/^[0-9]+$/),
+
   ports: (ports) => Util.isStringAndEmpty(ports) ||
     ports.split(",")
       .every((port) => port.toString().trim().match(/^[0-9]+$/)),

diff --git a/src/test/fixtures/minimalAppFullConfig.json b/src/test/fixtures/minimalAppFullConfig.json
@@ -8,6 +8,7 @@
   "cpus": 1,
   "mem": 128,
   "disk": 0,
+  "gpus": 0,
   "executor": "",
   "constraints": [],
   "uris": [],

diff --git a/src/test/units/AppVersionComponent.test.js b/src/test/units/AppVersionComponent.test.js
@@ -29,6 +29,7 @@ describe("AppVersionComponent", function () {
       "cpus": 0.1,
       "mem": 16.0,
       "disk": 0.0,
+      "gpus": 0,
       "executor": "",
       "constraints": [],
       "uris": [],
@@ -139,37 +140,37 @@ describe("AppVersionComponent", function () {
   });
 
   it("has correct backoff factor", function () {
-    var children = this.rows.at(35).props().children;
+    var children = this.rows.at(37).props().children;
     expect(children[0]).to.equal(1.15);
   });
 
   it("has correct backoff", function () {
-    var children = this.rows.at(37).props().children;
+    var children = this.rows.at(39).props().children;
     expect(children[0]).to.equal(1);
     expect(children[2]).to.equal("seconds");
   });
 
   it("has correct max launch delay", function () {
-    var children = this.rows.at(39).props().children;
+    var children = this.rows.at(41).props().children;
     expect(children[0]).to.equal(3600);
     expect(children[2]).to.equal("seconds");
   });
 
   it("has correct URIs", function () {
-    expect(this.rows.at(41).text().trim()).to.equal("Unspecified");
+    expect(this.rows.at(43).text().trim()).to.equal("Unspecified");
   });
 
   it("has correct User", function () {
-    expect(this.rows.at(43).props().children[0]).to.equal("testuser");
+    expect(this.rows.at(45).props().children[0]).to.equal("testuser");
   });
 
   it("has correct args", function () {
-    expect(this.rows.at(45).text()).to.equal("arg1");
-    expect(this.rows.at(46).text()).to.equal("arg2");
+    expect(this.rows.at(47).text()).to.equal("arg1");
+    expect(this.rows.at(48).text()).to.equal("arg2");
   });
 
   it("has correct version", function () {
-    expect(this.rows.at(48).props().children[0])
+    expect(this.rows.at(50).props().children[0])
       .to.equal("2015-06-29T12:57:02.269Z");
   });
 
@@ -200,7 +201,7 @@ describe("AppVersionComponent", function () {
     this.component = mount(<AppVersionComponent appVersion={this.model} />);
     this.table = this.component.find("dl.dl-horizontal");
     this.rows = this.table.children();
-    expect(this.rows.at(41).text().trim()).to.equal("http://localhost/test");
+    expect(this.rows.at(43).text().trim()).to.equal("http://localhost/test");
   });
 
   it("has multiple uris", function () {
@@ -218,7 +219,7 @@ describe("AppVersionComponent", function () {
     this.component = mount(<AppVersionComponent appVersion={this.model} />);
     this.table = this.component.find("dl.dl-horizontal");
     this.rows = this.table.children();
-    expect(this.rows.at(41).text().trim()).to.equal("http://localhost/test");
-    expect(this.rows.at(42).text().trim()).to.equal("http://localhost/test2");
+    expect(this.rows.at(43).text().trim()).to.equal("http://localhost/test");
+    expect(this.rows.at(44).text().trim()).to.equal("http://localhost/test2");
   });
 });