Merge "Fix : Update labels , filters , keypairs at Magnum Service"

src/pages/container-infra/containers/ClusterTemplates/actions/StepCreate/StepLabel/index.jsx

@@ -13,7 +13,6 @@
 import Base from 'components/Form';
 import { inject, observer } from 'mobx-react';
 import KeyValueInput from 'components/FormItem/KeyValueInput';
-import { admission_control_list } from 'resources/magnum/template';
 
 export class StepLabel extends Base {
   get title() {
@@ -33,16 +32,7 @@ export class StepLabel extends Base {
   }
 
   get defaultValue() {
-    const values = {
-      additionalLabels: [
-        {
-          value: {
-            key: 'admission_control_list',
-            value: admission_control_list,
-          },
-        },
-      ],
-    };
+    const values = {};
     if (this.isEdit) {
       const {
         extra: { labels },
@@ -70,4 +60,4 @@ export class StepLabel extends Base {
   }
 }
 
-export default inject('rootStore')(observer(StepLabel));
+export default inject('rootStore')(observer(StepLabel));

src/pages/container-infra/containers/ClusterTemplates/actions/StepCreate/StepNetwork/index.jsx

@@ -170,7 +170,6 @@ export class StepNetwork extends Base {
         backendPageStore: this.externalNetworkStore,
         extraParams: {
           'router:external': true,
-          project_id: this.currentProjectId,
         },
         required: true,
         loading: this.externalNetworkStore.list.isLoading,
@@ -279,4 +278,4 @@ export class StepNetwork extends Base {
   }
 }
 
-export default inject('rootStore')(observer(StepNetwork));
+export default inject('rootStore')(observer(StepNetwork));

src/pages/container-infra/containers/ClusterTemplates/actions/StepCreate/StepNodeSpec/index.jsx

@@ -27,6 +27,7 @@ import {
 export class StepNodeSpec extends Base {
   init() {
     this.getImageList();
+    this.getKeypairs();
   }
 
   get title() {
@@ -50,11 +51,19 @@ export class StepNodeSpec extends Base {
     this.updateDefaultValue();
   }
 
+  async getKeypairs() {
+    await globalKeypairStore.fetchList();
+  }
+
+  get keypairs() {
+    return globalKeypairStore.list.data || [];
+  }
+
   get acceptedImageOs() {
     const { context: { coe = '' } = {} } = this.props;
     let acceptedOs = [];
     if (coe === 'kubernetes') {
-      acceptedOs = ['fedora', 'coreos'];
+      acceptedOs = ['fedora', 'coreos', 'others'];
     } else if (['swarm', 'swarm-mode'].includes(coe)) {
       acceptedOs = ['fedora'];
     } else if (['mesos', 'dcos'].includes(coe)) {
@@ -83,7 +92,6 @@ export class StepNodeSpec extends Base {
     return (globalImageStore.list.data || [])
       .filter(
         (it) =>
-          it.owner === this.currentProjectId &&
           this.acceptedImageOs.includes(it.os_distro)
       )
       .filter((it) => getImageOS(it) === imageTab);
@@ -176,7 +184,7 @@ export class StepNodeSpec extends Base {
         name: 'keypairs',
         label: t('Keypair'),
         type: 'select-table',
-        data: this.keypairsList,
+        data: this.keypairs,
         isLoading: globalKeypairStore.list.isLoading,
         tip: t(
           'The SSH key is a way to remotely log in to the instance. The cloud platform only helps to keep the public key. Please keep your private key properly.'
@@ -263,4 +271,4 @@ export class StepNodeSpec extends Base {
   }
 }
 
-export default inject('rootStore')(observer(StepNodeSpec));
+export default inject('rootStore')(observer(StepNodeSpec));

src/pages/container-infra/containers/Clusters/actions/StepCreate/StepLabel/index.jsx

@@ -15,7 +15,6 @@
 import Base from 'components/Form';
 import { inject, observer } from 'mobx-react';
 import KeyValueInput from 'components/FormItem/KeyValueInput';
-import { admission_control_list } from 'resources/magnum/template';
 
 export class StepLabel extends Base {
   get title() {
@@ -26,20 +25,6 @@ export class StepLabel extends Base {
     return t('Labels');
   }
 
-  get defaultValue() {
-    const values = {
-      additionalLabels: [
-        {
-          value: {
-            key: 'admission_control_list',
-            value: admission_control_list,
-          },
-        },
-      ],
-    };
-    return values;
-  }
-
   get formItems() {
     return [
       {
@@ -53,4 +38,4 @@ export class StepLabel extends Base {
   }
 }
 
-export default inject('rootStore')(observer(StepLabel));
+export default inject('rootStore')(observer(StepLabel));

src/pages/container-infra/containers/Clusters/actions/StepCreate/index.jsx

@@ -100,8 +100,8 @@ export class StepCreate extends StepAction {
       name: values.name,
       labels: {
         ...requestLabels,
-        auto_healing_enabled: `${auto_healing_enabled}`,
-        auto_scaling_enabled: `${auto_scaling_enabled}`,
+        auto_healing_enabled: `${auto_healing_enabled ? true : false}`,
+        auto_scaling_enabled: `${auto_scaling_enabled ? true : false}`,
       },
       master_flavor_id: masterFlavor.selectedRowKeys[0],
       flavor_id: flavor.selectedRowKeys[0],
@@ -119,4 +119,4 @@ export class StepCreate extends StepAction {
   };
 }
 
-export default inject('rootStore')(observer(StepCreate));
+export default inject('rootStore')(observer(StepCreate));

src/resources/magnum/template.js

@@ -12,9 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-export const admission_control_list =
-  'NodeRestriction,NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota,TaintNodesByCondition,Priority,DefaultTolerationSeconds,DefaultStorageClass,StorageObjectInUseProtection,PersistentVolumeClaimResize,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,RuntimeClass';
-
 export const getBaseTemplateColumns = (self) => [
   {
     title: t('ID/Name'),