Temporarily remove network_limit_per_host

This commit can be reverted later, once the backend support is in.
ManageIQ · Apr 18, 2019 · 929d236 · 929d236
1 parent a7343ca
commit 929d236
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 30 deletions.
diff --git a/...avascript/react/screens/App/Settings/__tests__/__snapshots__/SettingsActions.test.js.snap b/...avascript/react/screens/App/Settings/__tests__/__snapshots__/SettingsActions.test.js.snap
@@ -80,7 +80,6 @@ Array [
             "cpu_limit_per_host": 10,
             "max_concurrent_tasks_per_ems": 10,
             "max_concurrent_tasks_per_host": 10,
-            "network_limit_per_host": 10,
           },
         },
       },
@@ -119,7 +118,6 @@ Array [
             "cpu_limit_per_host": 10,
             "max_concurrent_tasks_per_ems": 10,
             "max_concurrent_tasks_per_host": 10,
-            "network_limit_per_host": 10,
           },
         },
       },

diff --git a/...avascript/react/screens/App/Settings/__tests__/__snapshots__/SettingsReducer.test.js.snap b/...avascript/react/screens/App/Settings/__tests__/__snapshots__/SettingsReducer.test.js.snap
@@ -314,7 +314,6 @@ Object {
     "cpu_limit_per_host": 10,
     "max_concurrent_tasks_per_ems": 10,
     "max_concurrent_tasks_per_host": 10,
-    "network_limit_per_host": 10,
   },
   "savingSettingsRejected": false,
   "servers": Array [],
@@ -436,7 +435,6 @@ Object {
     "cpu_limit_per_host": 10,
     "max_concurrent_tasks_per_ems": 10,
     "max_concurrent_tasks_per_host": 10,
-    "network_limit_per_host": 10,
   },
   "savingSettingsRejected": false,
   "servers": Array [],

diff --git a/app/javascript/react/screens/App/Settings/helpers.js b/app/javascript/react/screens/App/Settings/helpers.js
@@ -4,17 +4,15 @@ import { RHV, OPENSTACK } from '../../../../common/constants';
 export const getFormValuesFromApiSettings = payload => ({
   max_concurrent_tasks_per_host: payload.transformation.limits.max_concurrent_tasks_per_host,
   max_concurrent_tasks_per_ems: payload.transformation.limits.max_concurrent_tasks_per_ems,
-  cpu_limit_per_host: payload.transformation.limits.cpu_limit_per_host,
-  network_limit_per_host: payload.transformation.limits.network_limit_per_host
+  cpu_limit_per_host: payload.transformation.limits.cpu_limit_per_host
 });
 
 export const getApiSettingsFromFormValues = values => ({
   transformation: {
     limits: {
       max_concurrent_tasks_per_host: values.max_concurrent_tasks_per_host,
       max_concurrent_tasks_per_ems: values.max_concurrent_tasks_per_ems,
-      cpu_limit_per_host: values.cpu_limit_per_host,
-      network_limit_per_host: values.network_limit_per_host
+      cpu_limit_per_host: values.cpu_limit_per_host
     }
   }
 });

diff --git a/app/javascript/react/screens/App/Settings/screens/GeneralSettings/GeneralSettings.js b/app/javascript/react/screens/App/Settings/screens/GeneralSettings/GeneralSettings.js
@@ -126,16 +126,6 @@ export class GeneralSettings extends React.Component {
               inputEnabledFunction={inputEnabledFunction}
               initialUncheckedValue="unlimited"
             />
-            <Field
-              id="network_limit_per_host"
-              name="network_limit_per_host"
-              component={TextInputWithCheckbox}
-              validate={validatePercentInput}
-              label={__('Total network throughput')}
-              postfix={__('MB/s')}
-              inputEnabledFunction={inputEnabledFunction}
-              initialUncheckedValue="unlimited"
-            />
             <Form.FormGroup className="col-md-1 pull-left" style={{ marginTop: '40px' }}>
               <Button
                 bsStyle="primary"

diff --git a/...App/Settings/screens/GeneralSettings/__tests__/__snapshots__/GeneralSettings.test.js.snap b/...App/Settings/screens/GeneralSettings/__tests__/__snapshots__/GeneralSettings.test.js.snap
@@ -133,16 +133,6 @@ exports[`GeneralSettings component renders the general settings page 1`] = `
         postfix="％"
         validate={[Function]}
       />
-      <Field
-        component={[Function]}
-        id="network_limit_per_host"
-        initialUncheckedValue="unlimited"
-        inputEnabledFunction={[Function]}
-        label="Total network throughput"
-        name="network_limit_per_host"
-        postfix="MB/s"
-        validate={[Function]}
-      />
       <FormGroup
         bsClass="form-group"
         className="col-md-1 pull-left"

diff --git a/app/javascript/react/screens/App/Settings/settings.fixures.js b/app/javascript/react/screens/App/Settings/settings.fixures.js
@@ -20,8 +20,7 @@ export const settings = Immutable({
     limits: {
       max_concurrent_tasks_per_host: 10,
       max_concurrent_tasks_per_ems: 10,
-      cpu_limit_per_host: 10,
-      network_limit_per_host: 10
+      cpu_limit_per_host: 10
     }
   },
   otherSettings: {